Merge pull request #15431 from snipe/add_employee_num_to_asset_overview

Added employee number to asset view
snipe · Aug 31, 2024 · f8bbb7a · f8bbb7a
2 parents 12fa505 + 3c7d455
commit f8bbb7a
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 11 deletions.
diff --git a/app/Helpers/IconHelper.php b/app/Helpers/IconHelper.php
@@ -64,14 +64,19 @@ public static function icon($type) {
             case 'kits':
                 return 'fas fa-object-group';
             case 'assets':
+            case 'asset':
                 return 'fas fa-barcode';
             case 'accessories':
+            case 'accessory':
                 return 'far fa-keyboard';
             case 'components':
+            case 'component':
                 return 'far fa-hdd';
             case 'consumables':
+            case 'consumable':
                 return 'fas fa-tint';
             case 'licenses':
+            case 'license':
                 return 'far fa-save';
             case 'requestable':
                 return 'fas fa-laptop';
@@ -141,6 +146,8 @@ public static function icon($type) {
                 return 'fas fa-lock';
             case 'locations':
                 return 'fas fa-map-marker-alt';
+            case 'location':
+                return 'fas fa-map-marker-alt';
             case 'superadmin':
                 return 'fas fa-crown';
             case 'print':
@@ -173,6 +180,8 @@ public static function icon($type) {
                 return 'fas fa-crosshairs';
             case 'oauth':
                 return 'fas fa-user-secret';
+            case 'employee_num' :
+                return 'fa-regular fa-id-card';
 
         }
     }

diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
@@ -277,26 +277,40 @@
                                     <div class="col-md-12" style="text-align: left">
                                         <h2>
                                             {{ trans('admin/hardware/form.checkedout_to') }}
+                                            <x-icon type="long-arrow-right" />
                                         </h2>
-                                        <p>
+
+                                        <ul class="list-unstyled" style="line-height: 25px; font-size: 14px">
+
                                             @if (($asset->checkedOutToUser()) && ($asset->assignedTo->present()->gravatar()))
-                                                <img src="{{ $asset->assignedTo->present()->gravatar() }}" class="user-image-inline hidden-print" alt="{{ $asset->assignedTo->present()->fullName() }}">
+                                                <li>
+                                                    <img src="{{ $asset->assignedTo->present()->gravatar() }}" class="user-image-inline hidden-print" alt="{{ $asset->assignedTo->present()->fullName() }}">
+                                                    {!! $asset->assignedTo->present()->nameUrl() !!}
+                                                </li>
+                                            @else
+                                                <li>
+                                                    <x-icon type="{{ $asset->assignedType() }}" class="fa-fw" />
+                                                    {!! $asset->assignedTo->present()->nameUrl() !!}
+                                                </li>
                                             @endif
-                                        </p>
-                                        {!! $asset->assignedTo->present()->glyph() . ' ' .$asset->assignedTo->present()->nameUrl() !!}
 
 
-                                        <ul class="list-unstyled" style="line-height: 25px;">
+                                            @if ((isset($asset->assignedTo->employee_num)) && ($asset->assignedTo->employee_num!=''))
+                                                <li>
+                                                    <x-icon type="employee_num" class="fa-fw"/>
+                                                    {{ $asset->assignedTo->employee_num }}
+                                                </li>
+                                            @endif
                                             @if ((isset($asset->assignedTo->email)) && ($asset->assignedTo->email!=''))
                                                 <li>
-                                                    <x-icon type="email" />
+                                                    <x-icon type="email" class="fa-fw" />
                                                     <a href="mailto:{{ $asset->assignedTo->email }}">{{ $asset->assignedTo->email }}</a>
                                                 </li>
                                             @endif
 
                                             @if ((isset($asset->assignedTo)) && ($asset->assignedTo->phone!=''))
                                                 <li>
-                                                    <x-icon type="phone" />
+                                                    <x-icon type="phone" class="fa-fw" />
                                                     <a href="tel:{{ $asset->assignedTo->phone }}">{{ $asset->assignedTo->phone }}</a>
                                                 </li>
                                             @endif
@@ -307,7 +321,7 @@
 
                                             @if (isset($asset->location))
                                                 <li>
-                                                    <x-icon type="locations" />
+                                                    <x-icon type="locations" class="fa-fw" />
                                                      {{ $asset->location->name }}</li>
                                                 <li>{{ $asset->location->address }}
                                                     @if ($asset->location->address2!='')
@@ -323,12 +337,12 @@
                                                 </li>
                                             @endif
                                             <li>
-                                                <x-icon type="calendar" />
+                                                <x-icon type="calendar" class="fa-fw" />
                                                 {{ trans('admin/hardware/form.checkout_date') }}: {{ Helper::getFormattedDateObject($asset->last_checkout, 'date', false) }}
                                             </li>
                                             @if (isset($asset->expected_checkin))
                                                 <li>
-                                                    <x-icon type="calendar" />
+                                                    <x-icon type="calendar" class="fa-fw" />
                                                     {{ trans('admin/hardware/form.expected_checkin') }}: {{ Helper::getFormattedDateObject($asset->expected_checkin, 'date', false) }}
                                                 </li>
                                             @endif
@@ -397,7 +411,7 @@
 
 
                                                     <x-icon type="long-arrow-right" />
-                                                    {!!  $asset->assignedTo->present()->glyph()  !!}
+                                                    <x-icon type="{{ $asset->assignedType() }}" class="fa-fw" />
                                                     {!!  $asset->assignedTo->present()->nameUrl() !!}
                                                 @else
                                                     @if (($asset->assetstatus) && ($asset->assetstatus->deployable=='1'))