diff --git a/resources/views/accessories/index.blade.php b/resources/views/accessories/index.blade.php index a6ba61f616..90ccc1a84f 100755 --- a/resources/views/accessories/index.blade.php +++ b/resources/views/accessories/index.blade.php @@ -24,16 +24,16 @@
diff --git a/resources/views/account/requested.blade.php b/resources/views/account/requested.blade.php index 9d03a7bcfb..17c81f1822 100644 --- a/resources/views/account/requested.blade.php +++ b/resources/views/account/requested.blade.php @@ -15,14 +15,14 @@
@@ -160,17 +160,17 @@
id }}-history", "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"] diff --git a/resources/views/custom_fields/index.blade.php b/resources/views/custom_fields/index.blade.php index 108fe25000..ce09beb9c6 100644 --- a/resources/views/custom_fields/index.blade.php +++ b/resources/views/custom_fields/index.blade.php @@ -30,13 +30,13 @@
- diff --git a/resources/views/departments/index.blade.php b/resources/views/departments/index.blade.php index 2dbeaa7bbc..03e93ccf64 100644 --- a/resources/views/departments/index.blade.php +++ b/resources/views/departments/index.blade.php @@ -18,16 +18,16 @@
{{ trans('general.name') }}
$depreciation->id]) }}" data-export-options='{ diff --git a/resources/views/groups/index.blade.php b/resources/views/groups/index.blade.php index dd78b4dbb5..b59b1086ad 100755 --- a/resources/views/groups/index.blade.php +++ b/resources/views/groups/index.blade.php @@ -22,15 +22,15 @@
Request::get('status')])
$asset]) }}" @@ -1361,17 +1361,17 @@ data-columns="{{ \App\Presenters\AssetMaintenancesPresenter::dataTableLayout() }}" class="table table-striped snipe-table" id="assetMaintenancesTable" - data-pagination="true" + data-id-table="assetMaintenancesTable" - data-search="true" - data-search-highlight="true" - data-show-print="true" + + + data-side-pagination="server" data-toolbar="#maintenance-toolbar" - data-show-columns="true" - data-show-fullscreen="true" - data-show-refresh="true" - data-show-export="true" + + + + data-export-options='{ "fileName": "export-{{ $asset->asset_tag }}-maintenances", "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"] @@ -1392,19 +1392,19 @@
id }}-history", "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"] diff --git a/resources/views/kits/edit.blade.php b/resources/views/kits/edit.blade.php index 1961005f43..eb53365786 100644 --- a/resources/views/kits/edit.blade.php +++ b/resources/views/kits/edit.blade.php @@ -25,12 +25,12 @@
-
diff --git a/resources/views/livewire/oauth-clients.blade.php b/resources/views/livewire/oauth-clients.blade.php index 121c29c3cb..2300012acb 100644 --- a/resources/views/livewire/oauth-clients.blade.php +++ b/resources/views/livewire/oauth-clients.blade.php @@ -34,7 +34,7 @@ @if ($clients->count() > 0)
$model->id]) }}" diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 74704a00e0..482724894d 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -49,12 +49,13 @@ return htmlData } $(this).bootstrapTable({ - classes: 'table table-responsive table-no-bordered', + ajaxOptions: { headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') } }, + classes: 'table table-responsive table-striped snipe-table table-no-bordered', // reorderableColumns: true, stickyHeader: true, stickyHeaderOffsetLeft: parseInt($('body').css('padding-left'), 10), @@ -64,7 +65,18 @@ cookieStorage: '{{ config('session.bs_table_storage') }}', cookie: true, cookieExpire: '2y', + search: true, + advancedSearch: true, + searchHighlight: true, + clickToSelect: true, + showPrint: true, + showFullscreen: true, + showColumns: true, + showExport: true, showColumnsToggleAll: true, + showRefresh: true, + pagination: true, + sortOrder: 'asc', minimumCountColumns: 2, mobileResponsive: true, maintainSelected: true, diff --git a/resources/views/reports/accessories.blade.php b/resources/views/reports/accessories.blade.php index 9f6fd0e1a4..c4a46824ad 100644 --- a/resources/views/reports/accessories.blade.php +++ b/resources/views/reports/accessories.blade.php @@ -15,15 +15,15 @@
diff --git a/resources/views/reports/asset_maintenances.blade.php b/resources/views/reports/asset_maintenances.blade.php index a51c21bc89..fab64570f5 100644 --- a/resources/views/reports/asset_maintenances.blade.php +++ b/resources/views/reports/asset_maintenances.blade.php @@ -14,16 +14,9 @@
count() > 0))
@if ($consumable->deleted_at!='') - @else - {{ ($consumable->manufacturer) ? $consumable->manufacturer->name : '' }} {{ $consumable->name }} {{ $consumable->model_number }} + @else + {{ ($consumable->manufacturer) ? $consumable->manufacturer->name : '' }} {{ $consumable->name }} {{ $consumable->model_number }} + @endif + + + + - - - + @php $ccounter++ diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index 58b0cd3402..c48dcaaca6 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -808,21 +808,11 @@
{{ ($consumable->manufacturer) ? $consumable->manufacturer->name : '' }} {{ $consumable->name }} {{ $consumable->model_number }}{{ ($consumable->category) ? $consumable->category->name : ' invalid/deleted category' }} + {{ Helper::getFormattedDateObject($consumable->pivot->created_at, 'datetime', false) }} + + @if ($consumable->getLatestSignedAcceptance($show_user)) + @endif - {{ ($consumable->category) ? $consumable->category->name : ' invalid/deleted category' }} - {{ Helper::getFormattedDateObject($consumable->pivot->created_at, 'datetime', false) }} - - @if ($consumable->getLatestSignedAcceptance($show_user)) - - @endif -
$user->id]) }}" @@ -1112,21 +1055,11 @@