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 cd82289863..324fda1b0f 100644
--- a/resources/views/users/print.blade.php
+++ b/resources/views/users/print.blade.php
@@ -3,31 +3,55 @@
{{ trans('general.assigned_to', ['name' => $show_user->present()->fullName()]) }} - {{ date('Y-m-d H:i', time()) }}
+
+
+
+ {{-- stylesheets --}}
+
+
+
+
+
+
+
@@ -49,49 +73,73 @@
@endif
@endif
-{{ trans('general.assigned_to', ['name' => $show_user->present()->fullName()]) }} {{ ($show_user->jobtitle!='' ? ' - '.$show_user->jobtitle : '') }}
+
+ {{ trans('general.assigned_to', ['name' => $show_user->present()->fullName()]) }}
+ {{ ($show_user->employee_num!='') ? ' (#'.$show_user->employee_num.') ' : '' }}
+ {{ ($show_user->jobtitle!='' ? ' - '.$show_user->jobtitle : '') }}
+
{{ trans('admin/users/general.all_assigned_list_generation')}} {{ Helper::getFormattedDateObject(now(), 'datetime', false) }}
@if ($assets->count() > 0)
@php
$counter = 1;
@endphp
-
-
-
- {{ trans('general.assets') }} |
-
-
-
-
- |
- {{ trans('admin/hardware/table.asset_tag') }} |
- {{ trans('general.name') }} |
- {{ trans('general.category') }} |
- {{ trans('admin/hardware/form.model') }} |
- {{ trans('admin/hardware/form.serial') }} |
- {{ trans('admin/hardware/table.checkout_date') }} |
- {{ trans('general.signature') }} |
-
-
+
+
{{ trans_choice('general.countable.assets', $assets->count(), ['count' => $assets->count()]) }}
+
+
+
+
+
+ # |
+ {{ trans('general.image') }} |
+ {{ trans('admin/hardware/table.asset_tag') }} |
+ {{ trans('general.name') }} |
+ {{ trans('general.category') }} |
+ {{ trans('admin/hardware/form.model') }} |
+ {{ trans('general.location') }} |
+ {{ trans('admin/hardware/form.serial') }} |
+ {{ trans('admin/hardware/table.checkout_date') }} |
+ {{ trans('general.signature') }} |
+
+
@foreach ($assets as $asset)
{{ $counter }} |
+
+ @if ($asset->getImageUrl())
+
+ @endif
+ |
{{ $asset->asset_tag }} |
{{ $asset->name }} |
{{ (($asset->model) && ($asset->model->category)) ? $asset->model->category->name : trans('general.invalid_category') }} |
{{ ($asset->model) ? $asset->model->name : trans('general.invalid_model') }} |
+ {{ ($asset->location) ? $asset->location->name : '' }} |
{{ $asset->serial }} |
- {{ $asset->last_checkout }} |
+ {{ Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}
@if (($asset->assetlog->first()) && ($asset->assetlog->first()->accept_signature!=''))
@endif
|
- @if($settings->show_assigned_assets)
+ @if ($settings->show_assigned_assets)
@php
$assignedCounter = 1;
@endphp
@@ -99,9 +147,15 @@
{{ $counter }}.{{ $assignedCounter }} |
+
+ @if ($asset->getImageUrl())
+
+ @endif
+ |
{{ $asset->asset_tag }} |
{{ $asset->name }} |
{{ $asset->model->category->name }} |
+ {{ ($asset->location) ? $asset->location->name : '' }} |
{{ $asset->model->name }} |
{{ $asset->serial }} |
{{ $asset->last_checkout }} |
@@ -116,23 +170,35 @@
$counter++
@endphp
@endforeach
+
@endif
@if ($licenses->count() > 0)
-
-
+
+
{{ trans_choice('general.countable.licenses', $licenses->count(), ['count' => $licenses->count()]) }}
+
+
+
- {{ trans('general.licenses') }} |
-
-
-
-
- |
- {{ trans('general.name') }} |
- {{ trans('admin/licenses/form.license_key') }} |
- {{ trans('admin/hardware/table.checkout_date') }} |
+ # |
+ {{ trans('general.name') }} |
+ {{ trans('admin/licenses/form.license_key') }} |
+ {{ trans('admin/hardware/table.checkout_date') }} |
@php
@@ -162,19 +228,31 @@
@if ($accessories->count() > 0)
-
-
+
+
{{ trans_choice('general.countable.accessories', $accessories->count(), ['count' => $accessories->count()]) }}
+
+
+
- {{ trans('general.accessories') }} |
-
-
-
-
- |
- {{ trans('general.name') }} |
- {{ trans('general.category') }} |
- {{ trans('admin/hardware/table.checkout_date') }} |
+ # |
+ {{ trans('general.image') }} |
+ {{ trans('general.name') }} |
+ {{ trans('general.category') }} |
+ {{ trans('admin/hardware/table.checkout_date') }} |
@php
@@ -185,6 +263,11 @@
@if ($accessory)
{{ $acounter }} |
+
+ @if ($accessory->getImageUrl())
+
+ @endif
+ |
{{ ($accessory->manufacturer) ? $accessory->manufacturer->name : '' }} {{ $accessory->name }} {{ $accessory->model_number }} |
{{ $accessory->category->name }} |
{{ $accessory->pivot->created_at }} |
@@ -198,19 +281,30 @@
@endif
@if ($consumables->count() > 0)
-
-
+
+
{{ trans_choice('general.countable.consumables', $consumables->count(), ['count' => $consumables->count()]) }}
+
+
+
- {{ trans('general.consumables') }} |
-
-
-
-
- |
- {{ trans('general.name') }} |
- {{ trans('general.category') }} |
- {{ trans('admin/hardware/table.checkout_date') }} |
+ |
+ {{ trans('general.name') }} |
+ {{ trans('general.category') }} |
+ {{ trans('admin/hardware/table.checkout_date') }} |
@php
@@ -241,21 +335,126 @@
@endif
-
-
- {{ trans('admin/users/general.all_assigned_list_generation')}} {{ Helper::getFormattedDateObject(now(), 'datetime', false) }}
-
-
-
+
- {{ trans('general.signed_off_by') }}: |
- ________________________________________________________ |
- |
- {{ trans('general.date') }}: |
- ________________________________________________________ |
+ {{ trans('general.signed_off_by') }}: |
+ ________________________________________________________ |
+ ________________________________________________________ |
+ _____________________ |
+
+ |
+ Name |
+ Signature |
+ {{ trans('general.date') }} |
+
+
+
+ {{ trans('admin/users/table.manager') }}: |
+ ________________________________________________________ |
+ ________________________________________________________ |
+ _____________________ |
+
+
+ |
+ Name |
+ Signature |
+ {{ trans('general.date') }} |
+ |
+
+
+{{-- Javascript files --}}
+
+
+
+
+@push('css')
+
+@endpush
+
+@push('js')
+
+
+
+
+
+