A free open source IT asset/license management system
Added modal - derp
snipe00c92ffcfdf8
diff --git a/resources/views/account/requestable-assets.blade.php b/resources/views/account/requestable-assets.blade.phpindex f65ae6ba50..e9b3cf4b27 100644--- a/resources/views/account/requestable-assets.blade.php+++ b/resources/views/account/requestable-assets.blade.php@@ -15,8 +15,10 @@<div class="row"><div class="col-md-12">+ @php ($totalCount = array_sum($counts))+ @php ($firstVisible = collect(['assets', 'models', 'accessories', 'consumables', 'components', 'licenses'])->first(fn ($k) => ($counts[$k] ?? 0) > 0))- @if (($assets->count() < 1) && ($models->count() < 1) && ($accessories->count() < 1))+ @if ($totalCount < 1)<div class="col-md-12"><x-alert type="info" icon="info" :title="trans('general.notification_info')">@@ -27,31 +29,52 @@@else<div class="nav-tabs-custom"><ul class="nav nav-tabs">- @if ($assets->count() > 0)- <li class="active">+ @if ($counts['assets'] > 0)+ <li><a href="#assets" data-toggle="tab" title="{{ trans('general.assets') }}">{{ trans('general.assets') }}- <span class="badge badge-secondary"> {{ $assets->count()}}</span>- </a>+ <span class="badge badge-secondary"> {{ $counts['assets'] }}</span>+ </a></li>@endif- @if ($models->count() > 0)+ @if ($counts['models'] > 0)<li><a href="#models" data-toggle="tab" title="{{ trans('general.asset_models') }}">{{ trans('general.asset_models') }}- <span class="badge badge-secondary"> {{ $models->count()}}</span>+ <span class="badge badge-secondary"> {{ $counts['models'] }}</span></a></li>@endif- @if ($accessories->count() > 0)+ @if ($counts['accessories'] > 0)<li><a href="#accessories" data-toggle="tab" title="{{ trans('general.accessories') }}">{{ trans('general.accessories') }}- <span class="badge badge-secondary"> {{ $accessories->count()}}</span>+ <span class="badge badge-secondary"> {{ $counts['accessories'] }}</span>+ </a>+ </li>+ @endif+ @if ($counts['consumables'] > 0)+ <li>+ <a href="#consumables" data-toggle="tab" title="{{ trans('general.consumables') }}">{{ trans('general.consumables') }}+ <span class="badge badge-secondary"> {{ $counts['consumables'] }}</span>+ </a>+ </li>+ @endif+ @if ($counts['components'] > 0)+ <li>+ <a href="#components" data-toggle="tab" title="{{ trans('general.components') }}">{{ trans('general.components') }}+ <span class="badge badge-secondary"> {{ $counts['components'] }}</span>+ </a>+ </li>+ @endif+ @if ($counts['licenses'] > 0)+ <li>+ <a href="#licenses" data-toggle="tab" title="{{ trans('general.licenses') }}">{{ trans('general.licenses') }}+ <span class="badge badge-secondary"> {{ $counts['licenses'] }}</span></a></li>@endif</ul><div class="tab-content">- @if ($assets->count() > 0)- <div class="tab-pane fade in active" id="assets">+ @if ($counts['assets'] > 0)+ <div class="tab-pane fade" id="assets"><div class="row"><div class="col-md-12"><table@@ -95,127 +118,148 @@</div>@endif- @if ($models->count() > 0)- <div class="tab-pane fade in {{ ($assets->count() == 0) ? 'active' : '' }}" id="models">+ @if ($counts['models'] > 0)+ <div class="tab-pane fade" id="models"><div class="row"><div class="col-md-12">- <table- data-toolbar="#toolbar"- class="table table-striped snipe-table"- id="table"- data-id-table="advancedTable"- data-cookie-id-table="requestableAssets">+ <table+ data-cookie-id-table="requestableAssetModelsListingTable"+ data-id-table="requestableAssetModelsListingTable"+ data-side-pagination="server"+ data-show-export="false"+ data-show-footer="false"+ data-sort-order="asc"+ data-sort-name="name"+ id="assetModelsListingTable"+ class="table table-striped snipe-table"+ data-url="{{ route('api.assetmodels.requestable') }}"><thead>- <tr role="row">- <th scope="col" class="col-md-1" data-sortable="true">{{ trans('general.image') }}</th>- <th scope="col" class="col-md-6" data-sortable="true">{{ trans('admin/hardware/table.asset_model') }}</th>- <th scope="col" class="col-md-3" data-sortable="true">{{ trans('admin/accessories/general.remaining') }}</th>-- <th scope="col" class="col-md-2 actions" data-sortable="false">{{ trans('table.actions') }}</th>+ <tr>+ <th scope="col" class="col-md-1" data-field="image" data-formatter="imageFormatter" data-sortable="false">{{ trans('general.image') }}</th>+ <th scope="col" class="col-md-6" data-field="name" data-formatter="assetmodelRequestableNameFormatter" data-sortable="true">{{ trans('admin/hardware/table.asset_model') }}</th>+ <th scope="col" class="col-md-3" data-field="remaining" data-sortable="true">{{ trans('admin/accessories/general.remaining') }}</th>+ <th scope="col" class="col-md-2 actions" data-field="actions" data-formatter="assetmodelRequestableActionsFormatter" data-sortable="false">{{ trans('table.actions') }}</th></tr></thead>+ </table>+ </div>+ </div>+ </div>+ @endif- <tbody>- @foreach($models as $requestableModel)- <tr>-- <td>-- @if (($requestableModel->image) && ($requestableModel->getImageUrl()))- <a href="{{ $requestableModel->getImageUrl() }}" data-toggle="lightbox" data-type="image">- <img src="{{ $requestableModel->getImageUrl() }}" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive" alt="">- </a>- @endif-- </td>-- <td>- @can('view', \App\Models\AssetModel::class)- <a href="{{ route('models.show', ['model' => $requestableModel->id]) }}">{{ $requestableModel->name }}</a>- @else- {{ $requestableModel->name }}- @endcan- </td>-- <td>{{$requestableModel->assets->where('requestable', '1')->count()}}</td>-- <td>- <form action="{{ route('account/request-item', ['itemType' => 'asset_model', 'itemId' => $requestableModel->id])}}" method="POST" accept-charset="utf-8">- {{ csrf_field() }}- <input type="text" style="width: 70px; margin-right: 10px;" class="form-control pull-left" name="request-quantity" value="" placeholder="{{ trans('general.qty') }}">- @if ($requestableModel->isRequestedBy(Auth::user()))- <input class="btn btn-danger btn-sm" type="submit" value="{{ trans('button.cancel') }}">- @else- <input class="btn btn-primary btn-sm" type="submit" value="{{ trans('button.request') }}">- @endif- </form>- </td>- </tr>-- @endforeach- </tbody>+ @if ($counts['accessories'] > 0)+ <div class="tab-pane fade" id="accessories">+ <div class="row">+ <div class="col-md-12">+ <table+ data-cookie-id-table="requestableAccessoriesListingTable"+ data-id-table="requestableAccessoriesListingTable"+ data-side-pagination="server"+ data-show-export="false"+ data-show-footer="false"+ data-sort-order="asc"+ data-sort-name="name"+ id="accessoriesListingTable"+ class="table table-striped snipe-table"+ data-url="{{ route('api.accessories.requestable') }}">+ <thead>+ <tr>+ <th scope="col" class="col-md-1" data-field="image" data-formatter="imageFormatter" data-sortable="false">{{ trans('general.image') }}</th>+ <th scope="col" class="col-md-5" data-field="name" data-formatter="accessoryRequestableNameFormatter" data-sortable="true">{{ trans('admin/accessories/general.accessory_name') }}</th>+ <th scope="col" class="col-md-2" data-field="location" data-formatter="locationsLinkObjFormatter" data-sortable="true">{{ trans('admin/hardware/table.location') }}</th>+ <th scope="col" class="col-md-2" data-field="remaining_qty" data-sortable="true">{{ trans('admin/accessories/general.remaining') }}</th>+ <th scope="col" class="col-md-2 actions" data-field="actions" data-formatter="accessoryRequestableActionsFormatter" data-sortable="false">{{ trans('table.actions') }}</th>+ </tr>+ </thead></table>+ </div>+ </div>+ </div>+ @endif+ @if ($counts['consumables'] > 0)+ <div class="tab-pane fade" id="consumables">+ <div class="row">+ <div class="col-md-12">+ <table+ data-cookie-id-table="requestableConsumablesListingTable"+ data-id-table="requestableConsumablesListingTable"+ data-side-pagination="server"+ data-show-export="false"+ data-show-footer="false"+ data-sort-order="asc"+ data-sort-name="name"+ id="consumablesListingTable"+ class="table table-striped snipe-table"+ data-url="{{ route('api.consumables.requestable') }}">+ <thead>+ <tr>+ <th scope="col" class="col-md-1" data-field="image" data-formatter="imageFormatter" data-sortable="false">{{ trans('general.image') }}</th>+ <th scope="col" class="col-md-5" data-field="name" data-formatter="consumableRequestableNameFormatter" data-sortable="true">{{ trans('general.name') }}</th>+ <th scope="col" class="col-md-2" data-field="location" data-formatter="locationsLinkObjFormatter" data-sortable="true">{{ trans('admin/hardware/table.location') }}</th>+ <th scope="col" class="col-md-2" data-field="remaining" data-sortable="true">{{ trans('admin/accessories/general.remaining') }}</th>+ <th scope="col" class="col-md-2 actions" data-field="actions" data-formatter="consumableRequestableActionsFormatter" data-sortable="false">{{ trans('table.actions') }}</th>+ </tr>+ </thead>+ </table></div></div></div>@endif- @if ($accessories->count() > 0)- <div class="tab-pane fade in {{ (($assets->count() == 0) && ($models->count() == 0)) ? 'active' : '' }}" id="accessories">+ @if ($counts['components'] > 0)+ <div class="tab-pane fade" id="components"><div class="row"><div class="col-md-12"><table- class="table table-striped snipe-table"- id="requestableAccessoriesTable"- data-cookie-id-table="requestableAccessories">+ data-cookie-id-table="requestableComponentsListingTable"+ data-id-table="requestableComponentsListingTable"+ data-side-pagination="server"+ data-show-export="false"+ data-show-footer="false"+ data-sort-order="asc"+ data-sort-name="name"+ id="componentsListingTable"+ class="table table-striped snipe-table"+ data-url="{{ route('api.components.requestable') }}"><thead>- <tr role="row">- <th class="col-md-1" data-sortable="true">{{ trans('general.image') }}</th>- <th class="col-md-5" data-sortable="true">{{ trans('admin/accessories/general.accessory_name') }}</th>- <th class="col-md-2" data-sortable="true">{{ trans('admin/hardware/table.location') }}</th>- <th class="col-md-2" data-sortable="true">{{ trans('admin/accessories/general.remaining') }}</th>- <th class="col-md-2 actions" data-sortable="false">{{ trans('table.actions') }}</th>+ <tr>+ <th scope="col" class="col-md-1" data-field="image" data-formatter="imageFormatter" data-sortable="false">{{ trans('general.image') }}</th>+ <th scope="col" class="col-md-5" data-field="name" data-formatter="componentRequestableNameFormatter" data-sortable="true">{{ trans('general.name') }}</th>+ <th scope="col" class="col-md-2" data-field="location" data-formatter="locationsLinkObjFormatter" data-sortable="true">{{ trans('admin/hardware/table.location') }}</th>+ <th scope="col" class="col-md-2" data-field="remaining" data-sortable="true">{{ trans('admin/accessories/general.remaining') }}</th>+ <th scope="col" class="col-md-2 actions" data-field="actions" data-formatter="componentRequestableActionsFormatter" data-sortable="false">{{ trans('table.actions') }}</th></tr></thead>+ </table>+ </div>+ </div>+ </div>+ @endif- <tbody>- @foreach($accessories as $requestableAccessory)- <tr>- <td>- @if (($requestableAccessory->image) && ($requestableAccessory->getImageUrl()))- <a href="{{ $requestableAccessory->getImageUrl() }}" data-toggle="lightbox" data-type="image">- <img src="{{ $requestableAccessory->getImageUrl() }}" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive">- </a>- @endif- </td>-- <td>- @can('view', \App\Models\Accessory::class)- <a href="{{ route('accessories.show', ['accessory' => $requestableAccessory->id]) }}">{{ $requestableAccessory->name }}</a>- @else- {{ $requestableAccessory->name }}- @endcan- </td>-- <td>{{ $requestableAccessory->location->name ?? '' }}</td>-- <td>{{ $requestableAccessory->numRemaining() }}</td>-- <td>- <form action="{{ route('account/request-item', ['itemType' => 'accessory', 'itemId' => $requestableAccessory->id]) }}" method="POST" accept-charset="utf-8">- {{ csrf_field() }}- <input type="text" style="width: 70px; margin-right: 10px;" class="form-control pull-left" name="request-quantity" value="1" placeholder="{{ trans('general.qty') }}">- @if ($requestableAccessory->isRequestedBy(Auth::user()))- <input class="btn btn-danger btn-sm" type="submit" value="{{ trans('button.cancel') }}">- @else- <input class="btn btn-primary btn-sm" type="submit" value="{{ trans('button.request') }}">- @endif- </form>- </td>- </tr>- @endforeach- </tbody>+ @if ($counts['licenses'] > 0)+ <div class="tab-pane fade" id="licenses">+ <div class="row">+ <div class="col-md-12">+ <table+ data-cookie-id-table="requestableLicensesListingTable"+ data-id-table="requestableLicensesListingTable"+ data-side-pagination="server"+ data-show-export="false"+ data-show-footer="false"+ data-sort-order="asc"+ data-sort-name="name"+ id="licensesListingTable"+ class="table table-striped snipe-table"+ data-url="{{ route('api.licenses.requestable') }}">+ <thead>+ <tr>+ <th scope="col" class="col-md-6" data-field="name" data-formatter="licenseRequestableNameFormatter" data-sortable="true">{{ trans('general.name') }}</th>+ <th scope="col" class="col-md-2" data-field="category" data-formatter="categoriesLinkObjFormatter" data-sortable="true">{{ trans('general.category') }}</th>+ <th scope="col" class="col-md-2" data-field="free_seats_count" data-sortable="true">{{ trans('admin/accessories/general.remaining') }}</th>+ <th scope="col" class="col-md-2 actions" data-field="actions" data-formatter="licenseRequestableActionsFormatter" data-sortable="false">{{ trans('table.actions') }}</th>+ </tr>+ </thead></table></div></div>@@ -228,6 +272,8 @@@endif</div> <!-- .col-md-12> --></div> <!-- .row -->++<x-modals.request-item />@stop@@ -238,17 +284,20 @@'clientSearch' => true,])-<script nonce="{{ csrf_token() }}">-- $( "a[name='Request']").click(function(event) {- // event.preventDefault();- quantity = $(this).closest('td').siblings().find('input').val();- currentUrl = $(this).attr('href');- // $(this).attr('href', currentUrl + '?quantity=' + quantity);- // alert($(this).attr('href'));- });-</script>+ $(function () {+ // Restore active tab from URL hash if present, otherwise+ // open the first tab that has content. Prevents landing on+ // a hidden tab when the requester was redirected back with+ // #accessories (or similar) after a request/cancel POST.+ var initial = window.location.hash && window.location.hash.length > 1+ ? window.location.hash.substring(1)+ : @json($firstVisible);+ var $trigger = $('.nav-tabs a[href="#' + initial + '"]');+ if ($trigger.length === 0) {+ $trigger = $('.nav-tabs a').first();+ }+ $trigger.tab('show');+ });+ </script>@stop--