73acf6e5e8
commitd55c176199Merge:93ff9524dc0451fe17Author: snipe <snipe@snipe.net> Date: Wed Mar 16 18:35:42 2022 +0000 Merge pull request #10831 from snipe/merges/master_down_to_develop_march_16 v6.0.0-RC-5 - Merges master down to develop commitc0451fe17aAuthor: snipe <snipe@snipe.net> Date: Wed Mar 16 18:10:17 2022 +0000 Bumped version to v6.0.0-RC-5 Signed-off-by: snipe <snipe@snipe.net> commit0f95802699Author: snipe <snipe@snipe.net> Date: Wed Mar 16 18:05:47 2022 +0000 Fixed mis-automerge Signed-off-by: snipe <snipe@snipe.net> commit9db8bd782dAuthor: snipe <snipe@snipe.net> Date: Wed Mar 16 18:02:07 2022 +0000 Merging master down into develop Signed-off-by: snipe <snipe@snipe.net> commit93ff9524d6Merge:40a94707789ddbddadAuthor: snipe <snipe@snipe.net> Date: Wed Mar 16 10:04:58 2022 -0700 Merge pull request #10829 from snipe/features/add_statuslabel_filter_by_type_in_api Added filter by status_type in StatusLabels API index endpoint commit89ddbddadaAuthor: snipe <snipe@snipe.net> Date: Wed Mar 16 16:53:18 2022 +0000 Fixed comment Signed-off-by: snipe <snipe@snipe.net> commit7498fe36e9Author: snipe <snipe@snipe.net> Date: Wed Mar 16 16:45:03 2022 +0000 Removed extra space because pedantry Signed-off-by: snipe <snipe@snipe.net> commitbabf7c064bAuthor: snipe <snipe@snipe.net> Date: Wed Mar 16 16:38:45 2022 +0000 Added ability to filter status label index endpoint by status type Signed-off-by: snipe <snipe@snipe.net> commit40a9470770Merge:f499dcf7c781b42601Author: snipe <snipe@snipe.net> Date: Wed Mar 16 08:54:10 2022 -0700 Merge pull request #10828 from snipe/fixes/10826_parse_error_on_print_all Fixed #10826 - parse error on translation string for print all assets commit781b426018Author: snipe <snipe@snipe.net> Date: Wed Mar 16 08:50:47 2022 -0700 Fixed #10826 - parse error on translation string for print all assets Signed-off-by: snipe <snipe@snipe.net> commitf499dcf7c3Merge:84aa26dd554d6a4d97Author: snipe <snipe@snipe.net> Date: Wed Mar 16 08:25:29 2022 -0700 Merge pull request #10827 from snipe/fixes/modal_dropdowns_broken Fixed #10825 - selectlists in modals b0rked commit54d6a4d978Author: snipe <snipe@snipe.net> Date: Wed Mar 16 08:23:50 2022 -0700 Fixed #10825 - selectlists in modals b0rked Signed-off-by: snipe <snipe@snipe.net> commit84aa26dd50Merge:8984b3a5914bd07e97Author: snipe <snipe@snipe.net> Date: Thu Mar 10 13:02:45 2022 -0800 Merge pull request #10728 from Godmartinz/gh10191-css-dropdownmenu Fixed #10191 - font color contrast on mobile menu commit8984b3a59dMerge:d06ef4bdecdc0805fcAuthor: snipe <snipe@snipe.net> Date: Thu Mar 10 10:40:33 2022 -0800 Merge pull request #10812 from inietov/fixes/CarbonExceptions_InvalidFormatException_DateTime_develop Fixes Carbon\Exceptions\InvalidFormatException: DateTime::__construct(): Failed to parse time string develop commitcdc0805fc4Author: Ivan Nieto Vivanco <inietov@gmail.com> Date: Thu Mar 10 12:07:07 2022 -0600 Sanitize dates input in the importer before saving commit14bd07e97dMerge:4435ea95f16fd10954Author: Godfrey M <godmartinz@gmail.com> Date: Thu Mar 3 10:14:30 2022 -0800 gerge branchevelop' into gh10191-css-dropdownmenu commit4435ea95fdAuthor: Godfrey M <godmartinz@gmail.com> Date: Thu Mar 3 09:47:11 2022 -0800 removes changes to mix-manifest commitf115385243Author: Godfrey M <godmartinz@gmail.com> Date: Thu Mar 3 09:32:05 2022 -0800 C&P mix-manifest to be tracked commit708dc08b4fAuthor: Godfrey M <godmartinz@gmail.com> Date: Wed Feb 23 11:17:44 2022 -0800 mixes color contrast on dropdown menu from navbar on file Signed-off-by: snipe <snipe@snipe.net>
260 lines
8.2 KiB
PHP
260 lines
8.2 KiB
PHP
<!doctype html>
|
|
<html lang="en">
|
|
<head>
|
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
|
<title>Assigned to {{ $show_user->present()->fullName() }}</title>
|
|
<style>
|
|
body {
|
|
font-family: "Arial, Helvetica", sans-serif;
|
|
}
|
|
table.inventory {
|
|
border: solid #000;
|
|
border-width: 1px 1px 1px 1px;
|
|
width: 100%;
|
|
}
|
|
|
|
@page {
|
|
size: A4;
|
|
}
|
|
table.inventory th, table.inventory td {
|
|
border: solid #000;
|
|
border-width: 0 1px 1px 0;
|
|
padding: 3px;
|
|
font-size: 12px;
|
|
}
|
|
|
|
.print-logo {
|
|
max-height: 40px;
|
|
}
|
|
|
|
</style>
|
|
</head>
|
|
<body>
|
|
@if ($snipeSettings->logo_print_assets=='1')
|
|
@if ($snipeSettings->brand == '3')
|
|
|
|
<h2>
|
|
@if ($snipeSettings->logo!='')
|
|
<img class="print-logo" src="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}">
|
|
@endif
|
|
{{ $snipeSettings->site_name }}
|
|
</h2>
|
|
@elseif ($snipeSettings->brand == '2')
|
|
@if ($snipeSettings->logo!='')
|
|
<img class="print-logo" src="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}">
|
|
@endif
|
|
@else
|
|
<h2>{{ $snipeSettings->site_name }}</h2>
|
|
@endif
|
|
@endif
|
|
|
|
<h2>Assigned to {{ $show_user->present()->fullName() }}</h4>
|
|
|
|
@if ($assets->count() > 0)
|
|
@php
|
|
$counter = 1;
|
|
@endphp
|
|
<table class="inventory">
|
|
<thead>
|
|
<tr>
|
|
<th colspan="8">{{ trans('general.assets') }}</th>
|
|
</tr>
|
|
</thead>
|
|
<thead>
|
|
<tr>
|
|
<th style="width: 20px;"></th>
|
|
<th style="width: 20%;">{{ trans('general.asset_tag') }}</th>
|
|
<th style="width: 20%;">{{ trans('general.name') }}</th>
|
|
<th style="width: 10%;">{{ trans('general.category') }}</th>
|
|
<th style="width: 20%;">{{ trans('general.asset_model') }}</th>
|
|
<th style="width: 20%;">{{ trans('general.asset_serial') }}</th>
|
|
<th style="width: 10%;">{{ trans('general.checked_out') }}</th>
|
|
<th data-formatter="imageFormatter" style="width: 20%;">{{ trans('general.signature') }}</th>
|
|
</tr>
|
|
</thead>
|
|
|
|
@foreach ($assets as $asset)
|
|
|
|
<tr>
|
|
<td>{{ $counter }}</td>
|
|
<td>{{ $asset->asset_tag }}</td>
|
|
<td>{{ $asset->name }}</td>
|
|
<td>{{ $asset->model->category->name }}</td>
|
|
<td>{{ $asset->model->name }}</td>
|
|
<td>{{ $asset->serial }}</td>
|
|
<td>
|
|
{{ $asset->last_checkout }}</td>
|
|
<td>
|
|
@if ($asset->assetlog->first())
|
|
<img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $asset->assetlog->first()->accept_signature }}">
|
|
@endif
|
|
</td>
|
|
</tr>
|
|
@if($settings->show_assigned_assets)
|
|
@php
|
|
$assignedCounter = 1;
|
|
@endphp
|
|
@foreach ($asset->assignedAssets as $asset)
|
|
|
|
<tr>
|
|
<td>{{ $counter }}.{{ $assignedCounter }}</td>
|
|
<td>{{ $asset->asset_tag }}</td>
|
|
<td>{{ $asset->name }}</td>
|
|
<td>{{ $asset->model->category->name }}</td>
|
|
<td>{{ $asset->model->name }}</td>
|
|
<td>{{ $asset->serial }}</td>
|
|
<td>
|
|
{{ $asset->last_checkout }}</td>
|
|
<td><img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $asset->assetlog->first()->accept_signature }}"></td>
|
|
</tr>
|
|
@php
|
|
$assignedCounter++
|
|
@endphp
|
|
@endforeach
|
|
@endif
|
|
@php
|
|
$counter++
|
|
@endphp
|
|
@endforeach
|
|
</table>
|
|
@endif
|
|
|
|
@if ($licenses->count() > 0)
|
|
<br><br>
|
|
<table class="inventory">
|
|
<thead>
|
|
<tr>
|
|
<th colspan="4">{{ trans('general.licenses') }}</th>
|
|
</tr>
|
|
</thead>
|
|
<thead>
|
|
<tr>
|
|
<th style="width: 20px;"></th>
|
|
<th style="width: 40%;">{{ trans('general.name') }}</th>
|
|
<th style="width: 50%;">{{ trans('general.license_serial') }}</th>
|
|
<th style="width: 10%;">{{ trans('general.checked_out') }}</th>
|
|
</tr>
|
|
</thead>
|
|
@php
|
|
$lcounter = 1;
|
|
@endphp
|
|
|
|
@foreach ($licenses as $license)
|
|
|
|
<tr>
|
|
<td>{{ $lcounter }}</td>
|
|
<td>{{ $license->name }}</td>
|
|
<td>
|
|
@can('viewKeys', $license)
|
|
{{ $license->serial }}
|
|
@else
|
|
<i class="fa-lock" aria-hidden="true"></i> {{ str_repeat('x', 15) }}
|
|
@endcan
|
|
</td>
|
|
<td>{{ $license->assetlog->first()->created_at }}</td>
|
|
</tr>
|
|
@php
|
|
$lcounter++
|
|
@endphp
|
|
@endforeach
|
|
</table>
|
|
@endif
|
|
|
|
|
|
@if ($accessories->count() > 0)
|
|
<br><br>
|
|
<table class="inventory">
|
|
<thead>
|
|
<tr>
|
|
<th colspan="4">{{ trans('general.accessories') }}</th>
|
|
</tr>
|
|
</thead>
|
|
<thead>
|
|
<tr>
|
|
<th style="width: 20px;"></th>
|
|
<th style="width: 40%;">{{ trans('general.name') }}</th>
|
|
<th style="width: 50%;">{{ trans('general.category') }}</th>
|
|
<th style="width: 10%;">{{ trans('general.checked_out') }}</th>
|
|
</tr>
|
|
</thead>
|
|
@php
|
|
$acounter = 1;
|
|
@endphp
|
|
|
|
@foreach ($accessories as $accessory)
|
|
@if ($accessory)
|
|
<tr>
|
|
<td>{{ $acounter }}</td>
|
|
<td>{{ ($accessory->manufacturer) ? $accessory->manufacturer->name : '' }} {{ $accessory->name }} {{ $accessory->model_number }}</td>
|
|
<td>{{ $accessory->category->name }}</td>
|
|
<td>{{ $accessory->assetlog->first()->created_at }}</td>
|
|
</tr>
|
|
@php
|
|
$acounter++
|
|
@endphp
|
|
@endif
|
|
@endforeach
|
|
</table>
|
|
@endif
|
|
|
|
@if ($consumables->count() > 0)
|
|
<br><br>
|
|
<table class="inventory">
|
|
<thead>
|
|
<tr>
|
|
<th colspan="4">{{ trans('general.consumables') }}</th>
|
|
</tr>
|
|
</thead>
|
|
<thead>
|
|
<tr>
|
|
<th style="width: 20px;"></th>
|
|
<th style="width: 40%;">{{ trans('general.name') }}</th>
|
|
<th style="width: 50%;">{{ trans('general.category') }}</th>
|
|
<th style="width: 10%;">{{ trans('general.checked_out') }}</th>
|
|
</tr>
|
|
</thead>
|
|
@php
|
|
$ccounter = 1;
|
|
@endphp
|
|
|
|
@foreach ($consumables as $consumable)
|
|
@if ($consumable)
|
|
<tr>
|
|
<td>{{ $ccounter }}</td>
|
|
|
|
|
|
<td>
|
|
@if ($consumable->deleted_at!='')
|
|
<td>{{ ($consumable->manufacturer) ? $consumable->manufacturer->name : '' }} {{ $consumable->name }} {{ $consumable->model_number }}</td>
|
|
@else
|
|
{{ ($consumable->manufacturer) ? $consumable->manufacturer->name : '' }} {{ $consumable->name }} {{ $consumable->model_number }}
|
|
@endif
|
|
</td>
|
|
<td>{{ ($consumable->category) ? $consumable->category->name : trans('general.invalid_category') }} </td>
|
|
<td>{{ $consumable->assetlog->first()->created_at }}</td>
|
|
</tr>
|
|
@php
|
|
$ccounter++
|
|
@endphp
|
|
@endif
|
|
@endforeach
|
|
</table>
|
|
@endif
|
|
|
|
<br>
|
|
<br>
|
|
<br>
|
|
<table>
|
|
<tr>
|
|
<td>{{ trans('admin/locations/table.signed_by') }}</td>
|
|
<td>________________________________________________________</td>
|
|
<td></td>
|
|
<td>{{ trans('general.date') }}</td>
|
|
<td>________________________________________________________</td>
|
|
</tr>
|
|
</table>
|
|
|
|
|
|
</body>
|
|
</html>
|