DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'
Some checks failed
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Has been cancelled
Details
Codacy Security Scan / Codacy Security Scan (push) Has been cancelled
Details
Docker images (Alpine) / docker (push) Has been cancelled
Details
Docker images / docker (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
Details

Browse source
This commit is contained in:
snipe 2024-08-31 13:48:59 +01:00
parent 9fef27a448 13dbf9ee74
commit a8813cca94
2 changed files with 39 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/Helpers/IconHelper.php
View file

@ -64,14 +64,19 @@ class IconHelper
case 'kits': case 'kits':
return 'fas fa-object-group'; return 'fas fa-object-group';
case 'assets': case 'assets':
case 'asset':
return 'fas fa-barcode'; return 'fas fa-barcode';
case 'accessories': case 'accessories':
case 'accessory':
return 'far fa-keyboard'; return 'far fa-keyboard';
case 'components': case 'components':
case 'component':
return 'far fa-hdd'; return 'far fa-hdd';
case 'consumables': case 'consumables':
case 'consumable':
return 'fas fa-tint'; return 'fas fa-tint';
case 'licenses': case 'licenses':
case 'license':
return 'far fa-save'; return 'far fa-save';
case 'requestable': case 'requestable':
return 'fas fa-laptop'; return 'fas fa-laptop';
@ -141,6 +146,8 @@ class IconHelper
return 'fas fa-lock'; return 'fas fa-lock';
case 'locations': case 'locations':
return 'fas fa-map-marker-alt'; return 'fas fa-map-marker-alt';
case 'location':
return 'fas fa-map-marker-alt';
case 'superadmin': case 'superadmin':
return 'fas fa-crown'; return 'fas fa-crown';
case 'print': case 'print':
@ -173,6 +180,10 @@ class IconHelper
return 'fas fa-crosshairs'; return 'fas fa-crosshairs';
case 'oauth': case 'oauth':
return 'fas fa-user-secret'; return 'fas fa-user-secret';
case 'employee_num' :
return 'fa-regular fa-id-card';
case 'department' :
return 'fa-solid fa-building-user';
} }
} }

40
resources/views/hardware/view.blade.php
View file

@ -277,37 +277,53 @@
<div class="col-md-12" style="text-align: left"> <div class="col-md-12" style="text-align: left">
<h2> <h2>
{{ trans('admin/hardware/form.checkedout_to') }} {{ trans('admin/hardware/form.checkedout_to') }}
<x-icon type="long-arrow-right" />
</h2> </h2>
<p>
<ul class="list-unstyled" style="line-height: 25px; font-size: 14px">
@if (($asset->checkedOutToUser()) && ($asset->assignedTo->present()->gravatar())) @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 @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!='')) @if ((isset($asset->assignedTo->email)) && ($asset->assignedTo->email!=''))
<li> <li>
<x-icon type="email" /> <x-icon type="email" class="fa-fw" />
<a href="mailto:{{ $asset->assignedTo->email }}">{{ $asset->assignedTo->email }}</a> <a href="mailto:{{ $asset->assignedTo->email }}">{{ $asset->assignedTo->email }}</a>
</li> </li>
@endif @endif
@if ((isset($asset->assignedTo)) && ($asset->assignedTo->phone!='')) @if ((isset($asset->assignedTo)) && ($asset->assignedTo->phone!=''))
<li> <li>
<x-icon type="phone" /> <x-icon type="phone" class="fa-fw" />
<a href="tel:{{ $asset->assignedTo->phone }}">{{ $asset->assignedTo->phone }}</a> <a href="tel:{{ $asset->assignedTo->phone }}">{{ $asset->assignedTo->phone }}</a>
</li> </li>
@endif @endif
@if((isset($asset->assignedTo)) && ($asset->assignedTo->department)) @if((isset($asset->assignedTo)) && ($asset->assignedTo->department))
<li>{{ trans('admin/hardware/general.user_department') }}: {{ $asset->assignedTo->department->name}}</li> <li>
<x-icon type="department" class="fa-fw" />
{{ $asset->assignedTo->department->name}}</li>
@endif @endif
@if (isset($asset->location)) @if (isset($asset->location))
<li> <li>
<x-icon type="locations" /> <x-icon type="locations" class="fa-fw" />
{{ $asset->location->name }}</li> {{ $asset->location->name }}</li>
<li>{{ $asset->location->address }} <li>{{ $asset->location->address }}
@if ($asset->location->address2!='') @if ($asset->location->address2!='')
@ -323,12 +339,12 @@
</li> </li>
@endif @endif
<li> <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) }} {{ trans('admin/hardware/form.checkout_date') }}: {{ Helper::getFormattedDateObject($asset->last_checkout, 'date', false) }}
</li> </li>
@if (isset($asset->expected_checkin)) @if (isset($asset->expected_checkin))
<li> <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) }} {{ trans('admin/hardware/form.expected_checkin') }}: {{ Helper::getFormattedDateObject($asset->expected_checkin, 'date', false) }}
</li> </li>
@endif @endif
@ -397,7 +413,7 @@
<x-icon type="long-arrow-right" /> <x-icon type="long-arrow-right" />
{!! $asset->assignedTo->present()->glyph() !!} <x-icon type="{{ $asset->assignedType() }}" class="fa-fw" />
{!! $asset->assignedTo->present()->nameUrl() !!} {!! $asset->assignedTo->present()->nameUrl() !!}
@else @else
@if (($asset->assetstatus) && ($asset->assetstatus->deployable=='1')) @if (($asset->assetstatus) && ($asset->assetstatus->deployable=='1'))