ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #16666 from snipe/print_view_tweaks

Browse Source 
Added signature to licenses in print view, misc other fixes
This commit is contained in:
snipe
2025-04-08 19:34:02 +01:00
committed by GitHub
parent e0c6483b43 10b8055b29
commit 9f04254963
7 changed files with 55 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/css/build/app.css
View File

@@ -1435,4 +1435,8 @@ code.single-line {
overflow: hidden;
max-width: 400px;
}
p.monospace,
span.monospace {
font-family: monospace, monospace;
}

4
public/css/build/overrides.css
View File

@@ -1066,4 +1066,8 @@ code.single-line {
overflow: hidden;
max-width: 400px;
}
p.monospace,
span.monospace {
font-family: monospace, monospace;
}

8
public/css/dist/all.css vendored
View File

@@ -22770,6 +22770,10 @@ code.single-line {
overflow: hidden;
max-width: 400px;
}
p.monospace,
span.monospace {
font-family: monospace, monospace;
}
.select2-container {
@@ -24322,4 +24326,8 @@ code.single-line {
overflow: hidden;
max-width: 400px;
}
p.monospace,
span.monospace {
font-family: monospace, monospace;
}

6
public/mix-manifest.json
View File

@@ -2,8 +2,8 @@
"/js/build/app.js": "/js/build/app.js?id=607de09b70b83ef82a427e4b36341682",
"/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=06c13e817cc022028b3f4a33c0ca303a",
"/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=79aa889a1a6691013be6c342ca7391cd",
"/css/build/overrides.css": "/css/build/overrides.css?id=4d62149a0ee9dc139bdf03ff2f83930d",
"/css/build/app.css": "/css/build/app.css?id=d47ce0dc14671bb4e462e111001488e5",
"/css/build/overrides.css": "/css/build/overrides.css?id=f13e3ea204d73f94d3a448bef8e42fdc",
"/css/build/app.css": "/css/build/app.css?id=4ad0f7a9e40f2dc2f191454b0c5fa697",
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=4ea0068716c1bb2434d87a16d51b98c9",
"/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=7b315b9612b8fde8f9c5b0ddb6bba690",
"/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=ea22079836a432d7f46a5d390c445e13",
@@ -19,7 +19,7 @@
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=a82b065847bf3cd5d713c04ee8dc86c6",
"/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=6ea836d8126de101081c49abbdb89417",
"/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=76482123f6c70e866d6b971ba91de7bb",
"/css/dist/all.css": "/css/dist/all.css?id=7c861c2086473c513fe26c21e3c4d433",
"/css/dist/all.css": "/css/dist/all.css?id=e3039439091c414e7ce77471bcad921c",
"/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
"/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7",
"/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde",

4
resources/assets/less/overrides.less
View File

@@ -1183,3 +1183,7 @@ code.single-line {
overflow: hidden;
max-width: 400px;
}
p.monospace, span.monospace {
font-family: monospace, monospace;
}

9
resources/views/consumables/checkout.blade.php
View File

@@ -36,6 +36,15 @@
</div>
</div>
@endif
@if ($consumable->category)
<!-- consumable name -->
<div class="form-group">
<label class="col-sm-3 control-label">{{ trans('general.category') }}</label>
<div class="col-md-6">
<p class="form-control-static">{{ $consumable->category->name }}</p>
</div>
</div>
@endif
<!-- total -->
<div class="form-group">

33
resources/views/users/print.blade.php
View File

@@ -123,7 +123,7 @@
<th data-field="asset_location" data-sortable="true" data-visible="false">{{ trans('general.location') }}</th>
<th data-field="asset_serial" data-sortable="true" data-visible="true">{{ trans('admin/hardware/form.serial') }}</th>
<th data-field="asset_checkout_date" data-sortable="true" data-visible="true">{{ trans('admin/hardware/table.checkout_date') }}</th>
<th data-field="signature" data-sortable="true" data-visible="true">{{ trans('general.signature') }}</th>
<th data-field="signature" data-sortable="false" data-visible="true">{{ trans('general.signature') }}</th>
</thead>
<tbody>
@foreach ($show_user->assets as $asset)
@@ -172,7 +172,8 @@
<td>{{ ($asset->location) ? $asset->location->name : '' }}</td>
<td>{{ $asset->serial }}</td>
<td>
{{ Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}</td>
{{ Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}
</td>
<td>
@if (($asset->assetlog->firstWhere('action_type', 'accepted')) && ($asset->assetlog->firstWhere('action_type', 'accepted')->accept_signature!=''))
<img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $asset->assetlog->firstWhere('action_type', 'accepted')->accept_signature }}">
@@ -213,10 +214,11 @@
data-cookie-id-table="licensessAssigned">
<thead>
<tr>
<th style="width: 20px;" data-sortable="false" data-switchable="false">#</th>
<th style="width: 40%;" data-sortable="true" data-switchable="false">{{ trans('general.name') }}</th>
<th style="width: 50%;" data-sortable="true">{{ trans('admin/licenses/form.license_key') }}</th>
<th style="width: 10%;" data-sortable="true">{{ trans('admin/hardware/table.checkout_date') }}</th>
<th data-sortable="false" data-switchable="false">#</th>
<th data-sortable="true" data-switchable="false">{{ trans('general.name') }}</th>
<th data-sortable="true">{{ trans('admin/licenses/form.license_key') }}</th>
<th data-sortable="true">{{ trans('admin/hardware/table.checkout_date') }}</th>
<th data-field="signature" data-sortable="false" data-visible="true">{{ trans('general.signature') }}</th>
</tr>
</thead>
@php
@@ -232,12 +234,19 @@
<td>{{ $license->name }}</td>
<td>
@can('viewKeys', $license)
{{ $license->serial }}
<p class="monospace">{{ $license->serial }}</p>
@else
<i class="fa-lock" aria-hidden="true"></i> {{ str_repeat('x', 15) }}
@endcan
</td>
<td>{{ $license->pivot->updated_at }}</td>
<td>
{{ Helper::getFormattedDateObject($license->pivot->updated_at, 'datetime', false) }}
</td>
<td>
@if (($license->assetlog->firstWhere('action_type', 'accepted')) && ($license->assetlog->firstWhere('action_type', 'accepted')->accept_signature!=''))
<img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $license->assetlog->firstWhere('action_type', 'accepted')->accept_signature }}">
@endif
</td>
</tr>
@php
$lcounter++
@@ -294,7 +303,9 @@
</td>
<td>{{ ($accessory->manufacturer) ? $accessory->manufacturer->name : '' }} {{ $accessory->name }} {{ $accessory->model_number }}</td>
<td>{{ $accessory->category->name }}</td>
<td>{{ $accessory->pivot->created_at }}</td>
<td>
{{ Helper::getFormattedDateObject($accessory->pivot->created_at, 'datetime', false) }}
</td>
<td>
@if (($accessory->assetlog->first()) && ($accessory->assetlog->first()->accept_signature!=''))
@@ -358,7 +369,9 @@
@endif
</td>
<td>{{ ($consumable->category) ? $consumable->category->name : ' invalid/deleted category' }} </td>
<td>{{ $consumable->pivot->created_at }}</td>
<td>
{{ Helper::getFormattedDateObject($consumable->pivot->created_at, 'datetime', false) }}
</td>
<td>
@if (($consumable->assetlog->first()) && ($consumable->assetlog->first()->accept_signature!=''))
<img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $consumable->assetlog->first()->accept_signature }}">