diff --git a/app/Helpers/IconHelper.php b/app/Helpers/IconHelper.php
index 21132845dd12..2ffe3c523222 100644
--- 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
index 2d232df752b2..d1d7f4623b8d 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -277,26 +277,40 @@
{{ trans('admin/hardware/form.checkedout_to') }}
+
-
+
+
+
@if (($asset->checkedOutToUser()) && ($asset->assignedTo->present()->gravatar()))
-
+ -
+
+ {!! $asset->assignedTo->present()->nameUrl() !!}
+
+ @else
+ -
+
+ {!! $asset->assignedTo->present()->nameUrl() !!}
+
@endif
-
- {!! $asset->assignedTo->present()->glyph() . ' ' .$asset->assignedTo->present()->nameUrl() !!}
-
+ @if ((isset($asset->assignedTo->employee_num)) && ($asset->assignedTo->employee_num!=''))
+ -
+
+ {{ $asset->assignedTo->employee_num }}
+
+ @endif
@if ((isset($asset->assignedTo->email)) && ($asset->assignedTo->email!=''))
-
-
+
{{ $asset->assignedTo->email }}
@endif
@if ((isset($asset->assignedTo)) && ($asset->assignedTo->phone!=''))
-
-
+
{{ $asset->assignedTo->phone }}
@endif
@@ -307,7 +321,7 @@
@if (isset($asset->location))
-
-
+
{{ $asset->location->name }}
- {{ $asset->location->address }}
@if ($asset->location->address2!='')
@@ -323,12 +337,12 @@
@endif
-
-
+
{{ trans('admin/hardware/form.checkout_date') }}: {{ Helper::getFormattedDateObject($asset->last_checkout, 'date', false) }}
@if (isset($asset->expected_checkin))
-
-
+
{{ trans('admin/hardware/form.expected_checkin') }}: {{ Helper::getFormattedDateObject($asset->expected_checkin, 'date', false) }}
@endif
@@ -397,7 +411,7 @@
- {!! $asset->assignedTo->present()->glyph() !!}
+
{!! $asset->assignedTo->present()->nameUrl() !!}
@else
@if (($asset->assetstatus) && ($asset->assetstatus->deployable=='1'))