Merge pull request #17222 from grokability/fixes-#17221-move-table-featueres-into-js

Fixed #17221 - Moved common table elements to partial
This commit is contained in:
snipe
2025-06-25 14:52:17 +01:00
committed by GitHub
61 changed files with 124 additions and 841 deletions

View File

@@ -24,16 +24,8 @@
<table
data-columns="{{ \App\Presenters\AccessoryPresenter::dataTableLayout() }}"
data-cookie-id-table="accessoriesTable"
data-pagination="true"
data-id-table="accessoriesTable"
data-search-highlight="true"
data-search="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-show-footer="true"
data-sort-order="asc"
data-footer-style="footerStyle"

View File

@@ -78,16 +78,8 @@
<table
data-columns="{{ \App\Presenters\AccessoryPresenter::assignedDataTableLayout() }}"
data-cookie-id-table="checkoutsTable"
data-pagination="true"
data-id-table="checkoutsTable"
data-search-highlight="true"
data-search="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="checkoutsTable"
class="table table-striped snipe-table"
@@ -113,15 +105,8 @@
data-cookie-id-table="AccessoryHistoryTable"
data-id-table="AccessoryHistoryTable"
id="AccessoryHistoryTable"
data-pagination="true"
data-show-columns="true"
data-side-pagination="server"
data-show-refresh="true"
data-show-export="true"
data-sort-order="desc"
data-search-highlight="true"
data-search="true"
data-show-print="true"
data-export-options='{
"fileName": "export-{{ str_slug($accessory->name) }}-history-{{ date('Y-m-d') }}",
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]

View File

@@ -18,12 +18,8 @@
<div class="table-responsive">
<table
data-cookie-id-table="pendingAcceptances"
data-pagination="true"
data-id-table="pendingAcceptances"
data-search="true"
data-side-pagination="client"
data-show-columns="true"
data-show-export="true"
data-show-refresh="false"
data-sort-order="asc"
id="pendingAcceptances"

View File

@@ -51,18 +51,11 @@
<div class="col-md-12">
<div class="table-responsive">
<table
data-click-to-select="true"
data-cookie-id-table="requestableAssetsListingTable"
data-pagination="true"
data-id-table="requestableAssetsListingTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="false"
data-show-footer="false"
data-show-refresh="true"
data-sort-order="asc"
data-sort-name="name"
data-toolbar="#assetsBulkEditToolbar"
@@ -108,10 +101,6 @@
data-toolbar="#toolbar"
class="table table-striped snipe-table"
id="table"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-advanced-search="true"
data-id-table="advancedTable"
data-cookie-id-table="requestableAssets">
<thead>

View File

@@ -15,14 +15,10 @@
<div class="box-body">
<table
data-show-print="true"
data-cookie-id-table="userRequests"
data-pagination="true"
data-id-table="userRequests"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="desc"
id="userRequests"
class="table table-striped snipe-table"

View File

@@ -416,19 +416,12 @@
<table
data-cookie-id-table="userAssignedAssets"
data-toolbar="#userAssetToolbar"
data-pagination="true"
data-id-table="userAssets"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="client"
data-show-columns="true"
data-show-export="true"
data-show-footer="true"
data-sort-order="asc"
id="userAssets"
class="table table-striped snipe-table"
data-show-fullscreen="true"
data-export-options='{
"fileName": "my-assets-{{ date('Y-m-d') }}",
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
@@ -569,18 +562,11 @@
<table
data-toolbar="#userLicensesToolbar"
data-cookie-id-table="userLicenses"
data-pagination="true"
data-id-table="userLicenses"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="client"
data-show-columns="true"
data-show-export="true"
data-show-refresh="false"
data-sort-order="asc"
id="userLicenses"
data-show-fullscreen="true"
class="table table-striped snipe-table"
data-export-options='{
"fileName": "my-licenses-{{ date('Y-m-d') }}",
@@ -640,14 +626,7 @@
data-cookie-id-table="userAccessoryTable"
data-id-table="userAccessoryTable"
id="userAccessoryTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-pagination="true"
data-side-pagination="client"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-footer="true"
data-show-refresh="false"
data-sort-order="asc"
@@ -698,14 +677,7 @@
data-cookie-id-table="userConsumableTable"
data-id-table="userConsumableTable"
id="userConsumableTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-pagination="true"
data-side-pagination="client"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-footer="true"
data-show-refresh="false"
data-sort-order="asc"
@@ -752,12 +724,7 @@
data-cookie-id-table="userEULATable"
data-id-table="userEULATable"
id="userEULATable"
data-search="true"
data-pagination="true"
data-side-pagination="client"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-footer="true"
data-show-refresh="false"
data-sort-order="asc"

View File

@@ -24,16 +24,16 @@
<table
data-columns="{{ \App\Presenters\AssetMaintenancesPresenter::dataTableLayout() }}"
data-cookie-id-table="maintenancesTable"
data-pagination="true"
data-search-highlight="true"
data-search="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-footer="true"
data-show-export="true"
data-show-refresh="true"
id="maintenancesTable"
class="table table-striped snipe-table"
data-url="{{route('api.maintenances.index') }}"

View File

@@ -12,17 +12,9 @@
data-cookie-id-table="{{ str_slug($object->name ?? $object->id) }}UploadsTable"
data-id-table="{{ str_slug($object->name ?? $object->id) }}UploadsTable"
id="{{ str_slug($object->name ?? $object->id) }}UploadsTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-pagination="true"
data-side-pagination="client"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-footer="true"
data-toolbar="#upload-toolbar"
data-show-refresh="true"
data-sort-order="asc"
data-sort-name="name"
class="table table-striped snipe-table"

View File

@@ -22,16 +22,8 @@
<table
data-columns="{{ \App\Presenters\CategoryPresenter::dataTableLayout() }}"
data-cookie-id-table="categoryTable"
data-pagination="true"
data-id-table="categoryTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="categoryTable"
class="table table-striped snipe-table"

View File

@@ -83,7 +83,6 @@
data-toolbar="#assetsBulkEditToolbar"
data-bulk-button-id="#bulkAssetEditButton"
data-bulk-form-id="#assetsBulkForm"
data-click-to-select="true"
data-export-options='{
"fileName": "export-{{ str_slug($category->name) }}-assets-{{ date('Y-m-d') }}",
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
@@ -126,15 +125,8 @@
}'
@endif
data-pagination="true"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-show-footer="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
class="table table-striped snipe-table"
data-url="{{ route('api.'.$category_type_route.'.index',['category_id'=> $category->id]) }}">
@@ -160,17 +152,12 @@
<table
data-columns="{{ \App\Presenters\AssetModelPresenter::dataTableLayout() }}"
data-cookie-id-table="asssetModelsTable"
data-pagination="true"
data-id-table="asssetModelsTable"
data-search="true"
data-show-footer="true"
data-side-pagination="server"
data-show-columns="true"
data-toolbar="#modelsBulkEditToolbar"
data-bulk-button-id="#bulkModelsEditButton"
data-bulk-form-id="#modelsBulkForm"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="asssetModelsTable"
class="table table-striped snipe-table"

View File

@@ -19,16 +19,8 @@
<table
data-columns="{{ \App\Presenters\CompanyPresenter::dataTableLayout() }}"
data-cookie-id-table="companiesTable"
data-pagination="true"
data-id-table="companiesTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-show-fullscreen="true"
data-sort-order="asc"
id="companiesTable"
class="table table-striped snipe-table"

View File

@@ -92,20 +92,12 @@
<table
data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
data-cookie-id-table="assetsListingTable"
data-pagination="true"
data-id-table="assetsListingTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
data-toolbar="#assetsBulkEditToolbar"
data-bulk-button-id="#bulkAssetEditButton"
data-bulk-form-id="#assetsBulkForm"
data-click-to-select="true"
id="assetsListingTable"
class="table table-striped snipe-table"
data-url="{{route('api.assets.index',['company_id' => $company->id]) }}"
@@ -123,14 +115,8 @@
<table
data-columns="{{ \App\Presenters\LicensePresenter::dataTableLayout() }}"
data-cookie-id-table="licensesTable"
data-pagination="true"
data-id-table="licensesTable"
data-search="true"
data-search-highlight="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="licensesTable"
class="table table-striped snipe-table"
@@ -150,14 +136,8 @@
<table
data-columns="{{ \App\Presenters\AccessoryPresenter::dataTableLayout() }}"
data-cookie-id-table="accessoriesTable"
data-pagination="true"
data-id-table="accessoriesTable"
data-search="true"
data-search-highlight="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="accessoriesTable"
class="table table-striped snipe-table"
@@ -177,14 +157,8 @@
<table
data-columns="{{ \App\Presenters\ConsumablePresenter::dataTableLayout() }}"
data-cookie-id-table="consumablesTable"
data-pagination="true"
data-id-table="consumablesTable"
data-search="true"
data-search-highlight="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="consumablesTable"
class="table table-striped snipe-table"
@@ -204,14 +178,8 @@
<table
data-columns="{{ \App\Presenters\ComponentPresenter::dataTableLayout() }}"
data-cookie-id-table="componentsTable"
data-pagination="true"
data-id-table="componentsTable"
data-search="true"
data-search-highlight="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="componentsTable"
class="table table-striped snipe-table"
@@ -231,14 +199,8 @@
<table
data-columns="{{ \App\Presenters\UserPresenter::dataTableLayout() }}"
data-cookie-id-table="usersTable"
data-pagination="true"
data-id-table="usersTable"
data-search="true"
data-search-highlight="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="usersTable"
class="table table-striped snipe-table"

View File

@@ -21,18 +21,10 @@
<table
data-columns="{{ \App\Presenters\ComponentPresenter::dataTableLayout() }}"
data-cookie-id-table="componentsTable"
data-pagination="true"
data-id-table="componentsTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-footer-style="footerStyle"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-footer="true"
data-show-refresh="true"
data-sort-order="asc"
data-sort-name="name"
id="componentsTable"

View File

@@ -106,16 +106,9 @@
<table
data-cookie-id-table="componentsCheckedoutTable"
data-pagination="true"
data-id-table="componentsCheckedoutTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-footer="true"
data-show-refresh="true"
data-sort-order="asc"
data-sort-name="name"
id="componentsCheckedoutTable"
@@ -156,21 +149,14 @@
data-columns="{{ \App\Presenters\HistoryPresenter::dataTableLayout() }}"
class="table table-striped snipe-table"
id="componentHistory"
data-pagination="true"
data-id-table="componentHistory"
data-search="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-refresh="true"
data-sort-order="desc"
data-sort-name="created_at"
data-show-export="true"
data-export-options='{
"fileName": "export-component-{{ $component->id }}-history",
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
}'
data-url="{{ route('api.activity.index', ['item_id' => $component->id, 'item_type' => 'component']) }}"
data-cookie-id-table="componentHistory"
data-cookie="true">

View File

@@ -23,18 +23,10 @@
<table
data-columns="{{ \App\Presenters\ConsumablePresenter::dataTableLayout() }}"
data-cookie-id-table="consumablesTable"
data-pagination="true"
data-id-table="consumablesTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-footer-style="footerStyle"
data-show-columns="true"
data-show-export="true"
data-show-fullscreen="true"
data-show-footer="true"
data-show-refresh="true"
data-sort-order="asc"
data-sort-name="name"
data-toolbar="#toolbar"

View File

@@ -407,15 +407,10 @@
<table
data-cookie-id-table="consumablesCheckedoutTable"
data-pagination="true"
data-id-table="consumablesCheckedoutTable"
data-search="false"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-footer="true"
data-show-refresh="true"
data-sort-order="asc"
data-sort-name="name"
id="consumablesCheckedoutTable"
@@ -428,7 +423,7 @@
<thead>
<tr>
<th data-searchable="false" data-sortable="false" data-field="avatar" data-formatter="imageFormatter">{{ trans('general.image') }}</th>
<th data-searchable="false" data-sortable="false" data-field="name" formatter="usersLinkFormatter">{{ trans('general.user') }}</th>
<th data-searchable="false" data-sortable="false" data-field="name" data-formatter="usersLinkFormatter">{{ trans('general.user') }}</th>
<th data-searchable="false" data-sortable="false" data-field="created_at" data-formatter="dateDisplayFormatter">
{{ trans('general.date') }}
</th>
@@ -463,18 +458,10 @@
data-columns="{{ \App\Presenters\HistoryPresenter::dataTableLayout() }}"
class="table table-striped snipe-table"
id="consumableHistory"
data-pagination="true"
data-id-table="consumableHistory"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-refresh="true"
data-sort-order="desc"
data-sort-name="created_at"
data-show-export="true"
data-export-options='{
"fileName": "export-consumable-{{ $consumable->id }}-history",
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]

View File

@@ -30,13 +30,7 @@
<table
data-cookie-id-table="customFieldsetsTable"
data-id-table="customFieldsetsTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="client"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
data-sort-name="name"
id="customFieldsTable"
@@ -132,13 +126,7 @@
<table
data-cookie-id-table="customFieldsTable"
data-id-table="customFieldsTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="client"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
data-sort-name="name"
id="customFieldsTable"

View File

@@ -230,10 +230,9 @@
<table
data-cookie-id-table="dashActivityReport"
data-height="350"
data-height="500"
data-pagination="false"
data-id-table="dashActivityReport"
data-side-pagination="server"
data-sort-order="desc"
data-sort-name="created_at"
id="dashActivityReport"
@@ -312,7 +311,7 @@
<table
data-cookie-id-table="dashCompanySummary"
data-height="400"
data-pagination="true"
data-pagination="false"
data-side-pagination="server"
data-sort-order="desc"
data-sort-field="assets_count"
@@ -380,14 +379,13 @@
<table
data-cookie-id-table="dashLocationSummary"
data-height="400"
data-pagination="true"
data-side-pagination="server"
data-pagination="false"
data-sort-order="desc"
data-sort-field="assets_count"
id="dashLocationSummary"
class="table table-striped snipe-table"
data-url="{{ route('api.locations.index', ['sort' => 'assets_count', 'order' => 'asc']) }}">
<thead>
<tr>
<th class="col-sm-3" data-visible="true" data-field="name" data-formatter="locationsLinkFormatter" data-sortable="true">{{ trans('general.name') }}</th>
@@ -443,14 +441,13 @@
<table
data-cookie-id-table="dashCategorySummary"
data-height="400"
data-pagination="true"
data-pagination="false"
data-side-pagination="server"
data-sort-order="desc"
data-sort-field="assets_count"
id="dashCategorySummary"
class="table table-striped snipe-table"
data-url="{{ route('api.categories.index', ['sort' => 'assets_count', 'order' => 'asc']) }}">
<thead>
<tr>
<th class="col-sm-3" data-visible="true" data-field="name" data-formatter="categoriesLinkFormatter" data-sortable="true">{{ trans('general.name') }}</th>

View File

@@ -18,16 +18,8 @@
<div class="box-body">
<table
data-cookie-id-table="departmentsTable"
data-pagination="true"
data-id-table="departmentsTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="departmentsTable"
class="table table-striped snipe-table"

View File

@@ -26,16 +26,9 @@
<table
data-columns="{{ \App\Presenters\UserPresenter::dataTableLayout() }}"
data-cookie-id-table="departmentsUsersTable"
data-pagination="true"
data-id-table="departmentsUsersTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-show-footer="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="departmentsUsersTable"
class="table table-striped snipe-table"

View File

@@ -22,15 +22,8 @@
<table
data-columns="{{ \App\Presenters\DepreciationPresenter::dataTableLayout() }}"
data-cookie-id-table="depreciationsTable"
data-pagination="true"
data-id-table="depreciationsTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="depreciationsTable"
class="table table-striped snipe-table"
@@ -47,7 +40,7 @@
<!-- side address column -->
<div class="col-md-3">
<h2>{{ trans('admin/depreciations/general.about_asset_depreciations') }}</h4>
<h2>{{ trans('admin/depreciations/general.about_asset_depreciations') }}</h2>
<p>{{ trans('admin/depreciations/general.about_depreciations') }} </p>
</div>

View File

@@ -68,20 +68,12 @@
data-cookie-id-table="depreciationsAssetTable"
data-id-table="depreciationsAssetTable"
id="depreciationsAssetTable"
data-pagination="true"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
data-sort-name="name"
data-toolbar="#assetsBulkEditToolbar"
data-bulk-button-id="#assetEditButton"
data-bulk-form-id="#assetsBulkForm"
data-click-to-select="true"
class="table table-striped snipe-table"
data-url="{{ route('api.assets.index',['depreciation_id'=> $depreciation->id]) }}"
data-export-options='{
@@ -104,14 +96,7 @@
data-cookie-id-table="depreciationsLicenseTable"
data-id-table="depreciationsLicenseTable"
id="depreciationsLicenseTable"
data-pagination="true"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
data-sort-name="name"
class="table table-striped snipe-table"
@@ -151,20 +136,12 @@
data-cookie-id-table="depreciationsModelsTable"
data-id-table="depreciationsModelsTable"
id="depreciationsModelsTable"
data-pagination="true"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-toolbar="#toolbar"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
data-sort-name="name"
data-bulk-button-id="#AssetModelsBulkEditButton"
data-bulk-form-id="#bulkForm"
data-click-to-select="true"
class="table table-striped snipe-table"
data-url="{{ route('api.models.index',['depreciation_id'=> $depreciation->id]) }}"
data-export-options='{

View File

@@ -22,15 +22,7 @@
<table
data-cookie-id-table="groupsTable"
data-pagination="true"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-show-fullscreen="true"
data-sort-order="asc"
data-sort-name="name"
id="groupsTable"

View File

@@ -27,14 +27,7 @@
<table
data-columns="{{ \App\Presenters\UserPresenter::dataTableLayout() }}"
data-cookie-id-table="groupsUsersTable"
data-pagination="true"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
id="groupsUsersTable"
class="table table-striped snipe-table"
data-url="{{ route('api.users.index',['group_id'=> $group->id]) }}"

View File

@@ -49,28 +49,20 @@
<div class="table table-responsive">
<div class="col-md-12">
<table
data-click-to-select="true"
data-columns="{{ \App\Presenters\AssetAuditPresenter::dataTableLayout() }}"
data-cookie-id-table="dueAssetAuditListing"
data-pagination="true"
data-id-table="dueAssetAuditListing"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-footer="true"
data-show-refresh="true"
data-sort-order="asc"
data-sort-name="name"
data-toolbar="#dueAssetEditToolbar"
data-bulk-button-id="#dueAssetEditButton"
data-bulk-form-id="#dueAssetEditForm"
id="#dueAssetAuditListing"
data-toolbar="#dueAssetEditToolbar"
data-bulk-button-id="#dueAssetEditButton"
data-bulk-form-id="#dueAssetEditForm"
id="#dueAssetAuditListing"
class="table table-striped snipe-table"
data-url="{{ route('api.assets.list-upcoming', ['action' => 'audits', 'upcoming_status' => 'due']) }}"
data-url="{{ route('api.assets.list-upcoming', ['action' => 'audits', 'upcoming_status' => 'due']) }}"
data-export-options='{
"fileName": "export-assets-due-audit-{{ date('Y-m-d') }}",
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
@@ -93,18 +85,11 @@
<div class="table table-responsive">
<div class="col-md-12">
<table
data-click-to-select="true"
data-columns="{{ \App\Presenters\AssetAuditPresenter::dataTableLayout() }}"
data-cookie-id-table="overdueAssetAuditListing"
data-pagination="true"
data-id-table="overdueAssetAuditListing"
data-search="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-footer="true"
data-show-refresh="true"
data-sort-order="asc"
data-sort-name="name"
data-toolbar="#overdueAssetEditToolbar"

View File

@@ -47,20 +47,12 @@
<div class="table table-responsive">
<div class="col-md-12">
<table
data-click-to-select="true"
data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
data-cookie-id-table="dueAssetcheckinListing"
data-pagination="true"
data-id-table="dueAssetcheckinListing"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-footer="true"
data-show-refresh="true"
data-sort-order="asc"
data-sort-name="name"
data-toolbar="#dueAssetEditToolbar"
@@ -91,18 +83,12 @@
<div class="table table-responsive">
<div class="col-md-12">
<table
data-click-to-select="true"
data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
data-cookie-id-table="overdueAssetcheckinListing"
data-pagination="true"
data-id-table="overdueAssetcheckinListing"
data-search="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-footer="true"
data-show-refresh="true"
data-sort-order="asc"
data-sort-name="name"
data-toolbar="#overdueAssetEditToolbar"

View File

@@ -66,24 +66,14 @@
@include('partials.asset-bulk-actions', ['status' => Request::get('status')])
<table
data-advanced-search="true"
data-click-to-select="true"
data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
data-cookie-id-table="assetsListingTable"
data-pagination="true"
data-id-table="assetsListingTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-search-text="{{ e(Session::get('search')) }}"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-footer="true"
data-show-refresh="true"
data-sort-order="asc"
data-sort-name="name"
data-show-fullscreen="true"
data-toolbar="#assetsBulkEditToolbar"
data-bulk-button-id="#bulkAssetEditButton"
data-bulk-form-id="#assetsBulkForm"

View File

@@ -26,13 +26,6 @@
data-toolbar="#toolbar"
class="table table-striped snipe-table"
id="requestedAssets"
data-advanced-search="true"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-show-columns="true"
data-show-export="true"
data-pagination="true"
data-id-table="requestedAssets"
data-cookie-id-table="requestedAssets"
data-export-options='{

View File

@@ -1257,23 +1257,7 @@
<div class="row{{($asset->assignedAssets->count() > 0 ) ? '' : ' hidden-print'}}">
<div class="col-md-12">
<form
method="POST"
action="{{ route('hardware/bulkedit') }}"
accept-charset="UTF-8"
class="form-inline"
id="bulkForm"
>
@csrf
<div id="toolbar">
<label for="bulk_actions"><span class="sr-only">{{ trans('general.bulk_actions')}}</span></label>
<select name="bulk_actions" class="form-control select2" style="width: 150px;" aria-label="bulk_actions">
<option value="edit">{{ trans('button.edit') }}</option>
<option value="delete">{{ trans('button.delete')}}</option>
<option value="labels">{{ trans_choice('button.generate_labels', 2) }}</option>
</select>
<button class="btn btn-primary" id="{{ (isset($id_button)) ? $id_button : 'bulkAssetEditButton' }}" disabled>{{ trans('button.go') }}</button>
</div>
@include('partials.asset-bulk-actions')
<!-- checked out assets table -->
<div class="table-responsive">
@@ -1281,18 +1265,12 @@
<table
data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
data-cookie-id-table="assetsTable"
data-pagination="true"
data-id-table="assetsTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
data-toolbar="#assetsBulkEditToolbar"
data-bulk-button-id="#bulkAssetEditButton"
data-bulk-form-id="#assetsBulkForm"
id="assetsListingTable"
class="table table-striped snipe-table"
data-url="{{route('api.assets.index',['assigned_to' => $asset->id, 'assigned_type' => 'App\Models\Asset']) }}"
@@ -1302,9 +1280,6 @@
}'>
</table>
</form>
</div>
@@ -1325,17 +1300,9 @@
<table
data-columns="{{ \App\Presenters\AssetPresenter::assignedAccessoriesDataTableLayout() }}"
data-cookie-id-table="accessoriesAssignedListingTable"
data-pagination="true"
data-id-table="accessoriesAssignedListingTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
data-click-to-select="true"
id="accessoriesAssignedListingTable"
class="table table-striped snipe-table"
data-url="{{ route('api.assets.assigned_accessories', ['asset' => $asset]) }}"
@@ -1363,17 +1330,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"]
@@ -1394,19 +1361,19 @@
<table
class="table table-striped snipe-table"
id="asseAuditHistory"
data-pagination="true"
data-id-table="asseAuditHistory"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-refresh="true"
data-sort-order="desc"
data-sort-name="created_at"
data-show-export="true"
data-export-options='{
"fileName": "export-asset-{{ $asset->id }}-audits",
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
@@ -1443,18 +1410,18 @@
data-columns="{{ \App\Presenters\HistoryPresenter::dataTableLayout() }}"
class="table table-striped snipe-table"
id="assetHistory"
data-pagination="true"
data-id-table="assetHistory"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-refresh="true"
data-sort-order="desc"
data-sort-name="created_at"
data-show-export="true"
data-export-options='{
"fileName": "export-asset-{{ $asset->id }}-history",
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]

View File

@@ -25,12 +25,12 @@
<table
data-cookie-id-table="kitModelsTable"
data-columns="{{ \App\Presenters\PredefinedKitPresenter::dataTableModels() }}"
data-pagination="true"
data-search="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
data-sort-name="name"
id="kitModelsTable"
@@ -59,12 +59,12 @@
{{-- <table--}}
{{-- data-cookie-id-table="kitLicensesTable"--}}
{{-- data-columns="{{ \App\Presenters\PredefinedKitPresenter::dataTableLicenses() }}"--}}
{{-- data-pagination="true"--}}
{{-- data-search="true"--}}
{{-- --}}
{{-- --}}
{{-- data-side-pagination="server"--}}
{{-- data-show-columns="true"--}}
{{-- data-show-export="true"--}}
{{-- data-show-refresh="true"--}}
{{-- --}}
{{-- --}}
{{-- --}}
{{-- data-sort-order="asc"--}}
{{-- data-sort-name="name"--}}
{{-- id="kitLicensesTable"--}}
@@ -93,12 +93,12 @@
{{-- <table--}}
{{-- data-cookie-id-table="kitConsumablesTable"--}}
{{-- data-columns="{{ \App\Presenters\PredefinedKitPresenter::dataTableConsumables() }}"--}}
{{-- data-pagination="true"--}}
{{-- data-search="true"--}}
{{-- --}}
{{-- --}}
{{-- data-side-pagination="server"--}}
{{-- data-show-columns="true"--}}
{{-- data-show-export="true"--}}
{{-- data-show-refresh="true"--}}
{{-- --}}
{{-- --}}
{{-- --}}
{{-- data-sort-order="asc"--}}
{{-- data-sort-name="name"--}}
{{-- id="kitConsumablesTable"--}}
@@ -127,12 +127,12 @@
{{-- <table--}}
{{-- data-cookie-id-table="kitAccessoriesTable"--}}
{{-- data-columns="{{ \App\Presenters\PredefinedKitPresenter::dataTableAccessories() }}"--}}
{{-- data-pagination="true"--}}
{{-- data-search="true"--}}
{{-- --}}
{{-- --}}
{{-- data-side-pagination="server"--}}
{{-- data-show-columns="true"--}}
{{-- data-show-export="true"--}}
{{-- data-show-refresh="true"--}}
{{-- --}}
{{-- --}}
{{-- --}}
{{-- data-sort-order="asc"--}}
{{-- data-sort-name="name"--}}
{{-- id="kitAccessoriesTable"--}}

View File

@@ -22,15 +22,7 @@
<table
data-cookie-id-table="kitsTable"
data-columns="{{ \App\Presenters\PredefinedKitPresenter::dataTableLayout() }}"
data-pagination="true"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
data-sort-name="name"
id="kitsTable"

View File

@@ -30,17 +30,9 @@
<table
data-columns="{{ \App\Presenters\LicensePresenter::dataTableLayout() }}"
data-cookie-id-table="licensesTable"
data-pagination="true"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-footer-style="footerStyle"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-footer="true"
data-show-refresh="true"
data-sort-order="asc"
data-sort-name="name"
id="licensesTable"

View File

@@ -438,14 +438,8 @@
data-cookie-id-table="seatsTable"
data-id-table="seatsTable"
id="seatsTable"
data-pagination="true"
data-search="false"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
data-sort-name="name"
class="table table-striped snipe-table"
@@ -485,15 +479,8 @@
data-cookie-id-table="licenseHistoryTable"
data-id-table="licenseHistoryTable"
id="licenseHistoryTable"
data-pagination="true"
data-show-columns="true"
data-side-pagination="server"
data-show-refresh="true"
data-show-export="true"
data-sort-order="desc"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-export-options='{
"fileName": "export-{{ str_slug($license->name) }}-history-{{ date('Y-m-d') }}",
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]

View File

@@ -97,9 +97,9 @@
</div>
<div class="row">
<div class="col-md-12 table-responsive" style="padding-top: 30px;">
<table data-pagination="true"
<table
data-id-table="upload-table"
data-search="true"
data-side-pagination="client"
id="upload-table"
class="col-md-12 table table-striped snipe-table">

View File

@@ -34,7 +34,6 @@
@if ($clients->count() > 0)
<table data-cookie-id-table="OAuthClientsTable"
data-pagination="true"
data-id-table="OAuthClientsTable"
data-side-pagination="client"
data-sort-order="desc"
@@ -131,7 +130,6 @@
<div class="box-body">
<!-- Authorized Tokens -->
<table data-cookie-id-table="AuthorizedAppsTable"
data-pagination="true"
data-id-table="AuthorizedAppsTable"
data-toolbar="#AuthorizedAppsToolbar"
data-side-pagination="client"

View File

@@ -23,20 +23,11 @@
<table
data-columns="{{ \App\Presenters\LocationPresenter::dataTableLayout() }}"
data-cookie-id-table="locationTable"
data-click-to-select="true"
data-pagination="true"
data-id-table="locationTable"
data-toolbar="#locationsBulkEditToolbar"
data-bulk-button-id="#bulkLocationsEditButton"
data-bulk-form-id="#locationsBulkForm"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="locationTable"
class="table table-striped snipe-table"

View File

@@ -189,21 +189,12 @@
<table
data-columns="{{ \App\Presenters\UserPresenter::dataTableLayout() }}"
data-cookie-id-table="usersTable"
data-pagination="true"
data-id-table="usersTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
data-show-fullscreen="true"
data-toolbar="#userBulkEditToolbar"
data-bulk-button-id="#bulkUserEditButton"
data-bulk-form-id="#usersBulkForm"
data-click-to-select="true"
id="usersTable"
class="table table-striped snipe-table"
data-url="{{route('api.users.index', ['location_id' => $location->id])}}"
@@ -221,21 +212,12 @@
<table
data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
data-cookie-id-table="assetsListingTable"
data-pagination="true"
data-id-table="assetsListingTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
data-show-fullscreen="true"
data-toolbar="#assetsBulkEditToolbar"
data-bulk-button-id="#bulkAssetEditButton"
data-bulk-form-id="#assetsBulkForm"
data-click-to-select="true"
id="assetsListingTable"
class="table table-striped snipe-table"
data-url="{{route('api.assets.index', ['location_id' => $location->id]) }}"
@@ -256,21 +238,12 @@
role="table"
data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
data-cookie-id-table="assetsAssignedListingTable"
data-pagination="true"
data-id-table="assetsAssignedListingTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
data-show-fullscreen="true"
data-toolbar="#AssignedAssetsBulkEditToolbar"
data-bulk-button-id="#AssignedbulkAssetEditButton"
data-bulk-form-id="#assignedAssetsBulkForm"
data-click-to-select="true"
id="assetsAssignedListingTable"
class="table table-striped snipe-table"
data-url="{{route('api.assets.index', ['assigned_to' => $location->id, 'assigned_type' => 'App\Models\Location']) }}"
@@ -289,21 +262,12 @@
role="table"
data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
data-cookie-id-table="RTDassetsListingTable"
data-pagination="true"
data-id-table="RTDassetsListingTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
data-show-fullscreen="true"
data-toolbar="#RTDassetsBulkEditToolbar"
data-bulk-button-id="#RTDbulkAssetEditButton"
data-bulk-form-id="#RTDassetsBulkEditToolbar"
data-click-to-select="true"
id="RTDassetsListingTable"
class="table table-striped snipe-table"
data-url="{{route('api.assets.index', ['rtd_location_id' => $location->id]) }}"
@@ -322,17 +286,9 @@
role="table"
data-columns="{{ \App\Presenters\AccessoryPresenter::dataTableLayout() }}"
data-cookie-id-table="accessoriesListingTable"
data-pagination="true"
data-id-table="accessoriesListingTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
data-show-fullscreen="true"
id="accessoriesListingTable"
class="table table-striped snipe-table"
data-url="{{route('api.accessories.index', ['location_id' => $location->id]) }}"
@@ -352,18 +308,9 @@
role="table"
data-columns="{{ \App\Presenters\LocationPresenter::assignedAccessoriesDataTableLayout() }}"
data-cookie-id-table="accessoriesAssignedListingTable"
data-pagination="true"
data-id-table="accessoriesAssignedListingTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
data-show-fullscreen="true"
data-click-to-select="true"
id="accessoriesAssignedListingTable"
class="table table-striped snipe-table"
data-url="{{ route('api.locations.assigned_accessories', ['location' => $location]) }}"
@@ -381,17 +328,9 @@
role="table"
data-columns="{{ \App\Presenters\ConsumablePresenter::dataTableLayout() }}"
data-cookie-id-table="consumablesListingTable"
data-pagination="true"
data-id-table="consumablesListingTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
data-show-fullscreen="true"
id="consumablesListingTable"
class="table table-striped snipe-table"
data-url="{{route('api.consumables.index', ['location_id' => $location->id]) }}"
@@ -408,17 +347,9 @@
role="table"
data-columns="{{ \App\Presenters\ComponentPresenter::dataTableLayout() }}"
data-cookie-id-table="componentsTable"
data-pagination="true"
data-id-table="componentsTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
data-show-fullscreen="true"
id="componentsTable"
class="table table-striped snipe-table"
data-url="{{route('api.components.index', ['location_id' => $location->id])}}"
@@ -453,18 +384,10 @@
<table
class="table table-striped snipe-table"
id="assetHistory"
data-pagination="true"
data-id-table="assetHistory"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-refresh="true"
data-sort-order="desc"
data-sort-name="created_at"
data-show-export="true"
data-export-options='{
"fileName": "export-location-asset-{{ $location->id }}-history",
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]

View File

@@ -51,16 +51,8 @@
<table
data-columns="{{ \App\Presenters\ManufacturerPresenter::dataTableLayout() }}"
data-cookie-id-table="manufacturersTable"
data-pagination="true"
data-id-table="manufacturersTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="manufacturersTable"
class="table table-striped snipe-table"

View File

@@ -105,19 +105,11 @@
<table
data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
data-cookie-id-table="assetsListingTable"
data-pagination="true"
data-id-table="assetsListingTable"
data-toolbar="#assetsBulkEditToolbar"
data-bulk-button-id="#bulkAssetEditButton"
data-bulk-form-id="#assetsBulkForm"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-show-fullscreen="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="assetsListingTable"
class="table table-striped snipe-table"
@@ -136,16 +128,9 @@
<table
data-columns="{{ \App\Presenters\LicensePresenter::dataTableLayout() }}"
data-cookie-id-table="licensesTable"
data-pagination="true"
data-id-table="licensesTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-show-footer="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="licensesTable"
class="table table-striped snipe-table"
@@ -164,16 +149,9 @@
<table
data-columns="{{ \App\Presenters\AccessoryPresenter::dataTableLayout() }}"
data-cookie-id-table="accessoriesTable"
data-pagination="true"
data-id-table="accessoriesTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-show-footer="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="accessoriesTable"
class="table table-striped snipe-table"
@@ -192,16 +170,9 @@
<table
data-columns="{{ \App\Presenters\ConsumablePresenter::dataTableLayout() }}"
data-cookie-id-table="consumablesTable"
data-pagination="true"
data-id-table="consumablesTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-show-footer="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="consumablesTable"
class="table table-striped snipe-table"
@@ -219,16 +190,9 @@
<table
data-columns="{{ \App\Presenters\ComponentPresenter::dataTableLayout() }}"
data-cookie-id-table="componentsTable"
data-pagination="true"
data-id-table="componentsTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-show-footer="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="componentsTable"
class="table table-striped snipe-table"

View File

@@ -40,20 +40,13 @@
<table
data-columns="{{ \App\Presenters\AssetModelPresenter::dataTableLayout() }}"
data-cookie-id-table="asssetModelsTable"
data-pagination="true"
data-id-table="asssetModelsTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-show-footer="true"
data-side-pagination="server"
data-footer-style="footerStyle"
data-show-columns="true"
data-toolbar="#modelsBulkEditToolbar"
data-bulk-button-id="#bulkModelsEditButton"
data-bulk-form-id="#modelsBulkForm"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="asssetModelsTable"
class="table table-striped snipe-table"

View File

@@ -88,20 +88,11 @@
<table
data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
data-cookie-id-table="assetListingTable"
data-pagination="true"
data-id-table="assetListingTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-toolbar="#assetsBulkEditToolbar"
data-bulk-button-id="#bulkAssetEditButton"
data-bulk-form-id="#assetsBulkForm"
data-click-to-select="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="assetListingTable"
data-url="{{ route('api.assets.index',['model_id'=> $model->id]) }}"

View File

@@ -16,7 +16,7 @@
{{ trans('button.bulk_actions') }}
</span>
</label>
<select name="bulk_actions" class="form-control select2" aria-label="bulk_actions" style="min-width: 350px;">
<select name="bulk_actions" class="form-control select2" aria-label="bulk_actions" style="min-width: 350px !important;">
@if ((isset($status)) && ($status == 'Deleted'))
@can('delete', \App\Models\Asset::class)
<option value="restore">{{trans('button.restore')}}</option>

View File

@@ -48,13 +48,27 @@
}
return htmlData
}
// This allows us to override the table defaults set below using the data-dash attributes
var table = this;
var data_with_default = function (key,default_value) {
console.dir($(table).data());
attrib_val = $(table).data(key);
if(attrib_val !== undefined) {
return attrib_val;
}
return default_value;
}
$(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,12 +78,23 @@
cookieStorage: '{{ config('session.bs_table_storage') }}',
cookie: true,
cookieExpire: '2y',
showColumnsToggleAll: true,
minimumCountColumns: 2,
mobileResponsive: true,
maintainSelected: true,
search: data_with_default('search', true),
advancedSearch: data_with_default('advanced-search', true),
searchHighlight: data_with_default('search-highlight', true),
clickToSelect: data_with_default('click-to-select', true),
showPrint: data_with_default('show-print', true),
showFullscreen: data_with_default('show-fullscreen', true),
showColumns: data_with_default('show-columns', true),
showExport: data_with_default('show-export', true),
showColumnsToggleAll: data_with_default('show-columns-toggle-all', true),
showRefresh: data_with_default('show-refresh', true),
pagination: data_with_default('pagination', true),
sortOrder: data_with_default('sort-order', 'asc'),
minimumCountColumns: data_with_default('minimum-count-columns', 2),
mobileResponsive: data_with_default('mobile-responsive', true),
maintainSelected: data_with_default('maintain-selected', true),
trimOnSearch: false,
showSearchClearButton: true,
showSearchClearButton: data_with_default('show-search-clear-button', true),
addrbar: {{ (config('session.bs_table_addrbar') == 'true') ? 'true' : 'false'}}, // deeplink search phrases, sorting, etc
paginationFirstText: "{{ trans('general.first') }}",
paginationLastText: "{{ trans('general.last') }}",

View File

@@ -15,15 +15,8 @@
<div class="box-body">
<table
data-cookie-id-table="accessoriesReport"
data-pagination="true"
data-id-table="accessoriesReport"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="accessoriesReport"
class="table table-striped snipe-table"

View File

@@ -25,24 +25,14 @@
<div class="box-body">
<table
data-advanced-search="true"
data-columns="{{ \App\Presenters\HistoryPresenter::dataTableLayout($serial = true) }}"
data-cookie-id-table="activityReport"
data-pagination="true"
data-id-table="activityReport"
data-search="true"
data-show-fullscreen="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="desc"
data-sort-name="created_at"
id="activityReport"
data-url="{{ route('api.activity.index') }}"
data-mobile-responsive="true"
class="table table-striped snipe-table"
data-export-options='{
"fileName": "activity-report-{{ date('Y-m-d') }}",

View File

@@ -22,14 +22,10 @@
<table
name="assetsReport"
data-search="true"
data-search-highlight="true"
data-show-print="true"
class="table table-striped snipe-table"
id="table"
data-url="{{route('api.assets.index', array(''=>e(Request::get('status')),'order_number'=>e(Request::get('order_number')), 'status_id'=>e(Request::get('status_id')), 'report'=>'true'))}}"
data-cookie="true"
data-click-to-select="true"
data-cookie-id-table="{{ e(Request::get('status')) }}assetTable-{{ config('version.hash_version') }}">
<thead>
<tr>

View File

@@ -14,16 +14,9 @@
<div class="box-body">
<table
data-cookie-id-table="maintenancesReport"
data-pagination="true"
data-show-footer="true"
data-id-table="maintenancesReport"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="maintenancesReport"
data-url="{{route('api.maintenances.index') }}"

View File

@@ -16,15 +16,8 @@
<table
data-cookie-id-table="auditReport"
data-pagination="true"
data-id-table="auditReport"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="auditReport"
data-url="{{ route('api.activity.index', ['action_type' => 'audit']) }}"

View File

@@ -18,15 +18,8 @@
@if (($depreciations) && ($depreciations->count() > 0))
<table
data-cookie-id-table="depreciationReport"
data-pagination="true"
data-id-table="depreciationReport"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="desc"
data-sort-name="created_at"
data-show-footer="true"

View File

@@ -14,15 +14,8 @@
<div class="box-body">
<table
data-cookie-id-table="licensesReport"
data-pagination="true"
data-id-table="licensesReport"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="client"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="licensesReport"
class="table table-striped snipe-table"

View File

@@ -36,15 +36,8 @@
<div class="box-body">
<table
data-cookie-id-table="unacceptedAssetsReport"
data-pagination="true"
data-id-table="unacceptedAssetsReport"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="client"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
data-sort-name="created_at"
id="unacceptedAssetsReport"

View File

@@ -66,9 +66,7 @@
<table
data-cookie="true"
data-cookie-id-table="system-backups"
data-pagination="true"
data-id-table="system-backups"
data-search="true"
data-side-pagination="client"
data-sort-order="desc"
data-sort-name="modified_display"

View File

@@ -68,18 +68,18 @@
<div class="col-md-9 col-md-offset-3">
<table
data-click-to-select="true"
data-columns="{{ \App\Presenters\LabelPresenter::dataTableLayout() }}"
data-cookie="true"
data-cookie-id-table="label2TemplateTable"
data-id-table="label2TemplateTable"
data-pagination="true"
data-search="true"
data-select-item-name="label2_template"
data-id-field="name"
data-show-columns="true"
data-show-fullscreen="true"
data-show-refresh="true"
data-side-pagination="server"
data-sort-name="name"
data-sort-order="asc"

View File

@@ -16,13 +16,9 @@
<table
data-cookie-id-table="loginReport"
data-pagination="true"
data-id-table="loginReport"
data-search="false"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="desc"
data-sort-name="created_at"
id="loginReport"

View File

@@ -22,17 +22,9 @@
<table
data-columns="{{ \App\Presenters\StatusLabelPresenter::dataTableLayout() }}"
data-cookie-id-table="statuslabelsTable"
data-pagination="true"
data-id-table="statuslabelsTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-show-footer="false"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-fullscreen="true"
data-show-refresh="true"
data-sort-order="asc"
data-sort-name="name"
id="statuslabelsTable"

View File

@@ -17,21 +17,12 @@
<table
data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
data-cookie-id-table="assetsListingTable"
data-pagination="true"
data-id-table="assetsListingTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
data-toolbar="#assetsBulkEditToolbar"
data-bulk-button-id="#bulkAssetEditButton"
data-bulk-form-id="#assetsBulkForm"
data-click-to-select="true"
id="assetsListingTable"
class="table table-striped snipe-table"
data-url="{{route('api.assets.index', ['status_id' => $statuslabel->id]) }}"

View File

@@ -23,16 +23,8 @@
<table
data-columns="{{ \App\Presenters\SupplierPresenter::dataTableLayout() }}"
data-cookie-id-table="suppliersTable"
data-pagination="true"
data-id-table="suppliersTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="suppliersTable"
class="table table-striped snipe-table"

View File

@@ -114,22 +114,13 @@
<table
data-cookie-id-table="suppliersAssetsTable"
data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
data-pagination="true"
data-id-table="suppliersAssetsTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-show-footer="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-show-fullscreen="true"
data-sort-order="asc"
data-toolbar="#assetsBulkEditToolbar"
data-bulk-button-id="#bulkAssetEditButton"
data-bulk-form-id="#assetsBulkForm"
data-click-to-select="true"
id="suppliersAssetsTable"
class="table table-striped snipe-table"
data-url="{{route('api.assets.index', ['supplier_id' => $supplier->id]) }}"
@@ -150,16 +141,8 @@
<table
data-columns="{{ \App\Presenters\AccessoryPresenter::dataTableLayout() }}"
data-cookie-id-table="accessoriesListingTable"
data-pagination="true"
data-id-table="accessoriesListingTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="accessoriesListingTable"
class="table table-striped snipe-table"
@@ -180,16 +163,8 @@
<table
data-columns="{{ \App\Presenters\LicensePresenter::dataTableLayout() }}"
data-cookie-id-table="licensesListingTable"
data-pagination="true"
data-id-table="licensesListingTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="licensesListingTable"
class="table table-striped snipe-table"
@@ -209,16 +184,8 @@
<table
data-columns="{{ \App\Presenters\ComponentPresenter::dataTableLayout() }}"
data-cookie-id-table="componentsListingTable"
data-pagination="true"
data-id-table="componentsListingTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="accessoriesListingTable"
class="table table-striped snipe-table"
@@ -237,16 +204,8 @@
<table
data-columns="{{ \App\Presenters\ConsumablePresenter::dataTableLayout() }}"
data-cookie-id-table="consumablesListingTable"
data-pagination="true"
data-id-table="consumablesListingTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="accessoriesListingTable"
class="table table-striped snipe-table"
@@ -267,16 +226,8 @@
<table
data-columns="{{ \App\Presenters\AssetMaintenancesPresenter::dataTableLayout() }}"
data-cookie-id-table="maintenancesTable"
data-pagination="true"
data-id-table="maintenancesTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="maintenancesTable"
class="table table-striped snipe-table"

View File

@@ -42,21 +42,10 @@
@include('partials.users-bulk-actions')
<table
data-advanced-search="true"
data-click-to-select="true"
data-columns="{{ \App\Presenters\UserPresenter::dataTableLayout() }}"
data-cookie-id-table="usersTable"
data-pagination="true"
data-id-table="usersTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
data-toolbar="#userBulkEditToolbar"
data-bulk-button-id="#bulkUserEditButton"
data-bulk-form-id="#usersBulkForm"

View File

@@ -111,7 +111,6 @@
data-side-pagination="client"
data-sortable="true"
data-toolbar="#assets-toolbar"
data-show-columns="true"
data-sort-order="desc"
data-sort-name="created_at"
data-show-columns-toggle-all="true"
@@ -211,7 +210,6 @@
data-search="false"
data-side-pagination="client"
data-sortable="true"
data-show-columns="true"
data-sort-order="desc"
data-sort-name="created_at"
data-show-columns-toggle-all="true"
@@ -274,7 +272,6 @@
data-search="false"
data-side-pagination="client"
data-sortable="true"
data-show-columns="true"
data-sort-order="desc"
data-sort-name="created_at"
data-show-columns-toggle-all="true"
@@ -339,7 +336,6 @@
data-search="false"
data-side-pagination="client"
data-sortable="true"
data-show-columns="true"
data-sort-order="desc"
data-sort-name="created_at"
data-show-columns-toggle-all="true"
@@ -368,19 +364,19 @@
<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 }}
@else
{{ ($consumable->manufacturer) ? $consumable->manufacturer->name : '' }} {{ $consumable->name }} {{ $consumable->model_number }}
@endif
</td>
<td>{{ ($consumable->category) ? $consumable->category->name : ' invalid/deleted category' }} </td>
<td>
{{ Helper::getFormattedDateObject($consumable->pivot->created_at, 'datetime', false) }}
</td>
<td>
@if ($consumable->getLatestSignedAcceptance($show_user))
<img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $consumable->getLatestSignedAcceptance($show_user)->accept_signature }}">
@endif
</td>
<td>{{ ($consumable->category) ? $consumable->category->name : ' invalid/deleted category' }} </td>
<td>
{{ Helper::getFormattedDateObject($consumable->pivot->created_at, 'datetime', false) }}
</td>
<td>
@if ($consumable->getLatestSignedAcceptance($show_user))
<img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $consumable->getLatestSignedAcceptance($show_user)->accept_signature }}">
@endif
</td>
</td>
</tr>
@php
$ccounter++

View File

@@ -808,21 +808,11 @@
<div class="table table-responsive">
<table
data-click-to-select="true"
data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
data-cookie-id-table="userAssetsListingTable"
data-pagination="true"
data-id-table="userAssetsListingTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-footer="true"
data-show-refresh="true"
data-sort-order="asc"
data-sort-name="name"
data-toolbar="#assetsBulkEditToolbar"
data-bulk-button-id="#bulkAssetEditButton"
@@ -846,17 +836,8 @@
data-cookie-id-table="userLicenseTable"
data-id-table="userLicenseTable"
id="userLicenseTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-pagination="true"
data-side-pagination="client"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-footer="true"
data-show-refresh="true"
data-sort-order="asc"
data-sort-name="name"
class="table table-striped snipe-table table-hover"
data-export-options='{
@@ -914,17 +895,7 @@
data-cookie-id-table="userAccessoryTable"
data-id-table="userAccessoryTable"
id="userAccessoryTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-pagination="true"
data-side-pagination="client"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-footer="true"
data-show-refresh="true"
data-sort-order="asc"
data-sort-name="name"
class="table table-striped snipe-table table-hover"
data-export-options='{
@@ -935,7 +906,7 @@
<tr>
<th class="col-md-1">{{ trans('general.id') }}</th>
<th class="col-md-4">{{ trans('general.name') }}</th>
<th class-="col-md-5" data-fieldname="note">{{ trans('general.notes') }}</th>
<th class="col-md-5" data-fieldname="note">{{ trans('general.notes') }}</th>
<th class="col-md-1" data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">{{ trans('general.purchase_cost') }}</th>
<th class="col-md-1 hidden-print">{{ trans('general.action') }}</th>
</tr>
@@ -967,17 +938,8 @@
data-cookie-id-table="userConsumableTable"
data-id-table="userConsumableTable"
id="userConsumableTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-pagination="true"
data-side-pagination="client"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-footer="true"
data-show-refresh="true"
data-sort-order="asc"
data-sort-name="name"
class="table table-striped snipe-table table-hover"
data-export-options='{
@@ -1026,18 +988,9 @@
<table
data-click-to-select="true"
data-cookie-id-table="usersHistoryTable"
data-pagination="true"
data-id-table="usersHistoryTable"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="desc"
id="usersHistoryTable"
class="table table-striped snipe-table"
@@ -1078,21 +1031,11 @@
<table
data-columns="{{ \App\Presenters\LocationPresenter::dataTableLayout() }}"
data-cookie-id-table="locationTable"
data-click-to-select="true"
data-pagination="true"
data-id-table="locationTable"
data-toolbar="#locationsBulkEditToolbar"
data-bulk-button-id="#bulkLocationsEditButton"
data-bulk-form-id="#locationsBulkForm"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="locationTable"
class="table table-striped snipe-table"
data-url="{{ route('api.locations.index', ['manager_id' => $user->id]) }}"
@@ -1112,21 +1055,11 @@
<table
data-columns="{{ \App\Presenters\UserPresenter::dataTableLayout() }}"
data-cookie-id-table="managedUsersTable"
data-click-to-select="true"
data-pagination="true"
data-id-table="managedUsersTable"
data-toolbar="#usersBulkEditToolbar"
data-bulk-button-id="#bulkUserEditButton"
data-bulk-form-id="#usersBulkForm"
data-search="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
id="managedUsersTable"
class="table table-striped snipe-table"
data-url="{{ route('api.users.index', ['manager_id' => $user->id]) }}"