From 7b4ecb275f18e34012a8f16844d51520b659178d Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 18 Mar 2024 13:29:01 +0000
Subject: [PATCH] Use trans choice for language

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/lang/en-US/general.php      |  9 ++++++
 resources/views/users/print.blade.php | 40 +++++++++++++++++----------
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php
index d879ef7db3..bf17024844 100644
--- a/resources/lang/en-US/general.php
+++ b/resources/lang/en-US/general.php
@@ -519,4 +519,13 @@ return [
     ],
     'no_requestable' => 'There are no requestable assets or asset models.',
 
+    'countable' => [
+        'accessories'  => ':count Accessory|:count Accessories',
+        'assets'  => ':count Asset|:count Assets',
+        'licenses'  => ':count License|:count Licenses',
+        'license_seats'  => ':count License Seat|:count License Seats',
+        'consumables'  => ':count Consumable|:count Consumables',
+        'components'  => ':count Component|:count Components',
+    ]
+
 ];
diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php
index 9d6b39dda2..11e50e2e87 100644
--- a/resources/views/users/print.blade.php
+++ b/resources/views/users/print.blade.php
@@ -73,15 +73,19 @@
     @endif
 @endif
 
-<h3>{{ trans('general.assigned_to', ['name' => $show_user->present()->fullName()]) }} {{ ($show_user->jobtitle!='' ? ' - '.$show_user->jobtitle : '') }}
+<h3>
+    {{ trans('general.assigned_to', ['name' => $show_user->present()->fullName()]) }}
+    {{ ($show_user->employee_num!='') ? ' (#'.$show_user->employee_num.') ' : '' }}
+    {{ ($show_user->jobtitle!='' ? ' - '.$show_user->jobtitle : '') }}
 </h3>
+<p></p>{{ trans('admin/users/general.all_assigned_list_generation')}} {{ Helper::getFormattedDateObject(now(), 'datetime', false) }}</body>
     @if ($assets->count() > 0)
         @php
             $counter = 1;
         @endphp
 
         <div id="assets-toolbar">
-            <h4>{{ trans('general.assets') }}</h4>
+            <h4>{{ trans_choice('general.countable.assets', $assets->count(), ['count' => $assets->count()]) }}</h4>
         </div>
 
         <table
@@ -171,7 +175,7 @@
 
     @if ($licenses->count() > 0)
         <div id="licenses-toolbar">
-            <h4>{{ trans('general.licenses') }}</h4>
+            <h4>{{ trans_choice('general.countable.licenses', $licenses->count(), ['count' => $licenses->count()]) }}</h4>
         </div>
 
         <table
@@ -224,7 +228,7 @@
 
     @if ($accessories->count() > 0)
         <div id="accessories-toolbar">
-            <h4>{{ $accessories->count() }} {{ trans('general.accessories') }}</h4>
+            <h4>{{ trans_choice('general.countable.accessories', $accessories->count(), ['count' => $accessories->count()]) }}</h4>
         </div>
 
         <table
@@ -244,6 +248,7 @@
             <thead>
             <tr>
                 <th style="width: 20px;"></th>
+                <th data-field="accessory_image" data-sortable="true" data-searchable="false" data-visible="true">{{ trans('general.image') }}</th>
                 <th style="width: 40%;">{{ trans('general.name') }}</th>
                 <th style="width: 50%;">{{ trans('general.category') }}</th>
                 <th style="width: 10%;">{{ trans('admin/hardware/table.checkout_date') }}</th>
@@ -257,6 +262,11 @@
                 @if ($accessory)
                     <tr>
                         <td>{{ $acounter }}</td>
+                        <td>
+                            @if ($accessory->getImageUrl())
+                                <img src="{{ $accessory->getImageUrl() }}" class="thumbnail" style="max-height: 50px;">
+                            @endif
+                        </td>
                         <td>{{ ($accessory->manufacturer) ? $accessory->manufacturer->name : '' }} {{ $accessory->name }} {{ $accessory->model_number }}</td>
                         <td>{{ $accessory->category->name }}</td>
                         <td>{{ $accessory->pivot->created_at }}</td>
@@ -271,7 +281,7 @@
 
     @if ($consumables->count() > 0)
         <div id="consumables-toolbar">
-            <h4>{{ $consumables->count() }} {{ trans('general.consumables') }}</h4>
+            <h4>{{ trans_choice('general.countable.consumables', $consumables->count(), ['count' => $consumables->count()]) }}</h4>
         </div>
 
         <table
@@ -324,17 +334,17 @@
         </table>
     @endif
 
-    <br>
-    <br>
-    {{ trans('admin/users/general.all_assigned_list_generation')}} {{ Helper::getFormattedDateObject(now(), 'datetime', false) }}
-    <br>
-    <br>
-    <table>
-        <tr>
-            <td>{{ trans('general.signed_off_by') }}:</td>
+    <table style="margin-top: 20px;">
+        <tr style="height: 100px;">
+            <td style="padding-right: 10px;">{{ trans('general.signed_off_by') }}:</td>
+            <td style="padding-right: 10px;">________________________________________________________</td>
+            <td style="padding-right: 10px;">{{ trans('general.date') }}:</td>
             <td>________________________________________________________</td>
-            <td></td>
-            <td>{{ trans('general.date') }}:</td>
+        </tr>
+        <tr>
+            <td style="padding-right: 10px;">{{ trans('admin/users/table.manager') }}:</td>
+            <td style="padding-right: 10px;">________________________________________________________</td>
+            <td style="padding-right: 10px;">{{ trans('general.date') }}:</td>
             <td>________________________________________________________</td>
         </tr>
     </table>