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

Merge pull request #15185 from arne-kroeger/feat/accesspories-checkout-to-location-or-asset

Browse Source 
Added #14979: add checkout to location and assets functionality to accessories
This commit is contained in:
snipe
2024-07-29 18:50:48 +01:00
committed by GitHub
parent 33b86057d1 3c3b922eae
commit 4eccb5ffc6
21 changed files with 411 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/accessories/checkout.blade.php
+8 -1
View File
@@ -66,7 +66,14 @@
</div>
<!-- User -->
@include ('partials.forms.edit.user-select', ['translated_name' => trans('general.select_user'), 'fieldname' => 'assigned_to', 'required'=> 'true'])
@include ('partials.forms.checkout-selector', ['user_select' => 'true','asset_select' => 'true', 'location_select' => 'true'])
@include ('partials.forms.edit.user-select', ['translated_name' => trans('general.select_user'), 'fieldname' => 'assigned_user', 'required'=> 'true'])
<!-- We have to pass unselect here so that we don't default to the asset that's being checked out. We want that asset to be pre-selected everywhere else. -->
@include ('partials.forms.edit.asset-select', ['translated_name' => trans('general.asset'), 'fieldname' => 'assigned_asset', 'unselect' => 'true', 'style' => 'display:none;', 'required'=>'true'])
@include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'assigned_location', 'style' => 'display:none;', 'required'=>'true'])
<!-- Checkout QTY -->
<div class="form-group {{ $errors->has('checkout_qty') ? 'error' : '' }} ">
resources/views/accessories/view.blade.php
+7 -7
View File
@@ -68,9 +68,9 @@
<div class="row">
<div class="col-md-12">
<table
data-cookie-id-table="usersTable"
data-cookie-id-table="checkoutsTable"
data-pagination="true"
data-id-table="usersTable"
data-id-table="checkoutsTable"
data-search="true"
data-side-pagination="server"
data-show-columns="true"
@@ -78,16 +78,16 @@
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="usersTable"
id="checkoutsTable"
class="table table-striped snipe-table"
data-url="{{ route('api.accessories.checkedout', $accessory->id) }}"
data-export-options='{
"fileName": "export-accessories-{{ str_slug($accessory->name) }}-users-{{ date('Y-m-d') }}",
"fileName": "export-accessories-{{ str_slug($accessory->name) }}-checkouts-{{ date('Y-m-d') }}",
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
}'>
<thead>
<tr>
<th data-searchable="false" data-formatter="usersLinkFormatter" data-sortable="false" data-field="name">{{ trans('general.user') }}</th>
<th data-searchable="false" data-formatter="polymorphicItemFormatter" data-sortable="false" data-field="assigned_to">{{ trans('general.checked_out_to') }}</th>
<th data-searchable="false" data-sortable="false" data-field="checkout_notes">{{ trans('general.notes') }}</th>
<th data-searchable="false" data-formatter="dateDisplayFormatter" data-sortable="false" data-field="last_checkout">{{ trans('admin/hardware/table.checkout_date') }}</th>
<th data-searchable="false" data-sortable="false" data-field="actions" data-formatter="accessoriesInOutFormatter">{{ trans('table.actions') }}</th>
@@ -314,7 +314,7 @@
<strong>{{ trans('general.checked_out') }}</strong>
</div>
<div class="col-md-9">
{{ $accessory->users_count }}
{{ $accessory->checkouts_count }}
</div>
</div>
</div>
@@ -337,7 +337,7 @@
@endcan
@can('delete', $accessory)
@if ($accessory->users_count == 0)
@if ($accessory->checkouts_count == 0)
<div class="text-center" style="padding-top:5px;">
<button class="btn btn-block btn-danger delete-asset" style="padding-top:5px;" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.delete_confirm_no_undo', ['item' => $accessory->name]) }}" data-target="#dataConfirmModal">
{{ trans('general.delete') }}