Skip to content

A free open source IT asset/license management system

Added printIgnore, reordered fields

snipe755d7c235131
diff --git a/app/Presenters/AccessoryPresenter.php b/app/Presenters/AccessoryPresenter.php
index 8257f9babc..57e03bb424 100644
--- a/app/Presenters/AccessoryPresenter.php
+++ b/app/Presenters/AccessoryPresenter.php
@@ -22,6 +22,13 @@ class AccessoryPresenter extends Presenter
'title' => trans('general.id'),
'visible' => false,
'printIgnore' => true,
+ ], [
+ 'field' => 'name',
+ 'searchable' => true,
+ 'sortable' => true,
+ 'switchable' => false,
+ 'title' => trans('general.name'),
+ 'formatter' => 'accessoriesLinkFormatter',
], [
'field' => 'image',
'searchable' => false,
@@ -38,14 +45,7 @@ class AccessoryPresenter extends Presenter
'title' => trans('admin/companies/table.title'),
'visible' => false,
'formatter' => 'companiesLinkObjFormatter',
- ], [
- 'field' => 'name',
- 'searchable' => true,
- 'sortable' => true,
- 'switchable' => false,
- 'title' => trans('general.name'),
- 'formatter' => 'accessoriesLinkFormatter',
- ], [
+ ], [
'field' => 'category',
'searchable' => true,
'sortable' => true,
@@ -172,6 +172,7 @@ class AccessoryPresenter extends Presenter
'visible' => true,
'title' => trans('general.change'),
'formatter' => 'accessoriesInOutFormatter',
+ 'printIgnore' => true,
], [
'field' => 'available_actions',
'searchable' => false,
diff --git a/app/Presenters/ComponentPresenter.php b/app/Presenters/ComponentPresenter.php
index f29c473663..9a5e354c55 100644
--- a/app/Presenters/ComponentPresenter.php
+++ b/app/Presenters/ComponentPresenter.php
@@ -21,6 +21,13 @@ class ComponentPresenter extends Presenter
'switchable' => true,
'title' => trans('general.id'),
'visible' => false,
+ ], [
+ 'field' => 'name',
+ 'searchable' => true,
+ 'sortable' => true,
+ 'title' => trans('general.name'),
+ 'visible' => true,
+ 'formatter' => 'componentsLinkFormatter',
],
[
'field' => 'company',
@@ -31,14 +38,7 @@ class ComponentPresenter extends Presenter
'visible' => false,
'formatter' => 'companiesLinkObjFormatter',
],
- [
- 'field' => 'name',
- 'searchable' => true,
- 'sortable' => true,
- 'title' => trans('general.name'),
- 'visible' => true,
- 'formatter' => 'componentsLinkFormatter',
- ], [
+ [
'field' => 'image',
'searchable' => false,
'sortable' => true,
diff --git a/app/Presenters/ConsumablePresenter.php b/app/Presenters/ConsumablePresenter.php
index 2b2eec5b2e..8c7cf1d0d9 100644
--- a/app/Presenters/ConsumablePresenter.php
+++ b/app/Presenters/ConsumablePresenter.php
@@ -21,17 +21,7 @@ class ConsumablePresenter extends Presenter
'switchable' => true,
'title' => trans('general.id'),
'visible' => false,
- ],
- [
- 'field' => 'company',
- 'searchable' => true,
- 'sortable' => true,
- 'switchable' => true,
- 'title' => trans('general.company'),
- 'visible' => false,
- 'formatter' => 'companiesLinkObjFormatter',
- ],
- [
+ ], [
'field' => 'name',
'searchable' => true,
'sortable' => true,
@@ -39,7 +29,16 @@ class ConsumablePresenter extends Presenter
'title' => trans('general.name'),
'visible' => true,
'formatter' => 'consumablesLinkFormatter',
+ ], [
+ 'field' => 'company',
+ 'searchable' => true,
+ 'sortable' => true,
+ 'switchable' => true,
+ 'title' => trans('general.company'),
+ 'visible' => false,
+ 'formatter' => 'companiesLinkObjFormatter',
],
+
[
'field' => 'image',
'searchable' => false,
@@ -172,6 +171,7 @@ class ConsumablePresenter extends Presenter
'visible' => true,
'title' => trans('general.change'),
'formatter' => 'consumablesInOutFormatter',
+ 'printIgnore' => true,
], [
'field' => 'actions',
'searchable' => false,
diff --git a/app/Presenters/DepartmentPresenter.php b/app/Presenters/DepartmentPresenter.php
index cdce1d967d..ea3d051d4f 100644
--- a/app/Presenters/DepartmentPresenter.php
+++ b/app/Presenters/DepartmentPresenter.php
@@ -22,17 +22,7 @@ class DepartmentPresenter extends Presenter
'switchable' => true,
'title' => trans('general.id'),
'visible' => false,
- ],
- [
- 'field' => 'company',
- 'searchable' => true,
- 'sortable' => true,
- 'switchable' => true,
- 'title' => trans('general.company'),
- 'visible' => false,
- 'formatter' => 'companiesLinkObjFormatter'
- ],
- [
+ ], [
'field' => 'name',
'searchable' => true,
'sortable' => true,
@@ -40,6 +30,14 @@ class DepartmentPresenter extends Presenter
'title' => trans('general.name'),
'visible' => true,
'formatter' => 'departmentsLinkFormatter',
+ ], [
+ 'field' => 'company',
+ 'searchable' => true,
+ 'sortable' => true,
+ 'switchable' => true,
+ 'title' => trans('general.company'),
+ 'visible' => false,
+ 'formatter' => 'companiesLinkObjFormatter'
], [
'field' => 'image',
'searchable' => false,
@@ -112,6 +110,7 @@ class DepartmentPresenter extends Presenter
'title' => trans('table.actions'),
'visible' => true,
'formatter' => 'departmentsActionsFormatter',
+ 'printIgnore' => true,
],
];
diff --git a/app/Presenters/LicensePresenter.php b/app/Presenters/LicensePresenter.php
index 7fc1aa5682..87972c4e5a 100644
--- a/app/Presenters/LicensePresenter.php
+++ b/app/Presenters/LicensePresenter.php
@@ -21,6 +21,13 @@ class LicensePresenter extends Presenter
'switchable' => true,
'title' => trans('general.id'),
'visible' => false,
+ ], [
+ 'field' => 'name',
+ 'searchable' => true,
+ 'sortable' => true,
+ 'switchable' => false,
+ 'title' => trans('general.name'),
+ 'formatter' => 'licensesLinkFormatter',
], [
'field' => 'company',
'searchable' => true,
@@ -29,13 +36,6 @@ class LicensePresenter extends Presenter
'title' => trans('admin/companies/table.title'),
'visible' => false,
'formatter' => 'companiesLinkObjFormatter',
- ], [
- 'field' => 'name',
- 'searchable' => true,
- 'sortable' => true,
- 'switchable' => false,
- 'title' => trans('general.name'),
- 'formatter' => 'licensesLinkFormatter',
], [
'field' => 'product_key',
'searchable' => true,
diff --git a/app/Presenters/LocationPresenter.php b/app/Presenters/LocationPresenter.php
index ab739e871b..460bdb81df 100644
--- a/app/Presenters/LocationPresenter.php
+++ b/app/Presenters/LocationPresenter.php
@@ -333,6 +333,7 @@ class LocationPresenter extends Presenter
'switchable' => false,
'title' => trans('table.actions'),
'formatter' => 'accessoriesInOutFormatter',
+ 'printIgnore' => true,
],
];
diff --git a/app/Presenters/UploadedFilesPresenter.php b/app/Presenters/UploadedFilesPresenter.php
index 83b528d387..9a2d548cbc 100644
--- a/app/Presenters/UploadedFilesPresenter.php
+++ b/app/Presenters/UploadedFilesPresenter.php
@@ -92,6 +92,7 @@ class UploadedFilesPresenter extends Presenter
'title' => trans('table.actions'),
'visible' => true,
'formatter' => 'deleteUploadFormatter',
+ 'printIgnore' => true,
],
];
diff --git a/resources/views/blade/table/bulk-actions.blade.php b/resources/views/blade/table/bulk-actions.blade.php
new file mode 100644
index 0000000000..7a626a09d4
--- /dev/null
+++ b/resources/views/blade/table/bulk-actions.blade.php
@@ -0,0 +1,34 @@
+@props([
+ 'id_divname',
+ 'id_formname',
+ 'id_button',
+ 'action_route',
+ 'action_method',
+ 'model_name' => 'asset',
+ ])
+
+<div id="{{ $id_divname }}" style="min-width:400px">
+ <form
+ method="POST"
+ action="{{ $action_route }}"
+ accept-charset="UTF-8"
+ class="form-inline"
+ id="{{ $id_formname }}"
+ >
+ @csrf
+
+ {{-- The sort and order will only be used if the cookie is actually empty (like on first-use)--}}
+ <input name="sort" type="hidden" value="{{ "{$model_name}.id" }}">
+ <input name="order" type="hidden" value="asc">
+ <label for="bulk_actions">
+ <span class="sr-only">
+ {{ trans('button.bulk_actions') }}
+ </span>
+ </label>
+ <select name="bulk_actions" class="form-control select2" aria-label="bulk_actions" style="min-width: 350px;">
+ {{ $slot }}
+ </select>
+
+ <button class="btn btn-theme" id="{{ $id_button }}" disabled>{{ trans('button.go') }}</button>
+ </form>
+</div>
\ No newline at end of file
diff --git a/resources/views/blade/table/bulk-assets.blade.php b/resources/views/blade/table/bulk-assets.blade.php
new file mode 100644
index 0000000000..b89ec4ad04
--- /dev/null
+++ b/resources/views/blade/table/bulk-assets.blade.php
@@ -0,0 +1,49 @@
+@aware(['name'])
+
+ <form
+ method="POST"
+ action="{{ route('hardware.bulkedit.show') }}"
+ accept-charset="UTF-8"
+ class="form-inline"
+ id="{{ Illuminate\Support\Str::camel($name) }}Form"
+ >
+ @csrf
+
+ <div style="width:100% !important;">
+ {{-- The sort and order will only be used if the cookie is actually empty (like on first-use) --}}
+ <input name="sort" type="hidden" value="assets.id">
+ <input name="order" type="hidden" value="asc">
+ <label for="bulk_actions">
+ <span class="sr-only">
+ {{ trans('button.bulk_actions') }}
+ </span>
+ </label>
+ <select name="bulk_actions" class="form-control select2" aria-label="bulk_actions" style="width: 350px !important;">
+ @if ((isset($status)) && ($status == 'Deleted'))
+ @can('delete', \App\Models\Asset::class)
+ <option value="restore">{{trans('button.restore')}}</option>
+ @endcan
+ @else
+
+ @can('update', \App\Models\Asset::class)
+ <option value="edit">{{ trans('general.bulk_edit') }}</option>
+ <option value="maintenance">{{ trans('button.add_maintenance') }}</option>
+ @endcan
+
+ @if((!isset($status)) || (($status != 'Deployed') && ($status != 'Archived')))
+ @can('checkout', \App\Models\Asset::class)
+ <option value="checkout">{{ trans('general.bulk_checkout') }}</option>
+ @endcan
+ @endif
+
+ @can('delete', \App\Models\Asset::class)
+ <option value="delete">{{ trans('general.bulk_delete') }}</option>
+ @endcan
+
+ <option value="labels">{{ trans_choice('button.generate_labels', 2) }}</option>
+ @endif
+ </select>
+
+ <button class="btn btn-theme" id="{{ Illuminate\Support\Str::camel($name) }}Button" disabled>{{ trans('button.go') }}</button>
+ </div>
+ </form>
diff --git a/resources/views/blade/table/index.blade.php b/resources/views/blade/table/index.blade.php
new file mode 100644
index 0000000000..58a549f03b
--- /dev/null
+++ b/resources/views/blade/table/index.blade.php
@@ -0,0 +1,61 @@
+@props([
+ 'presenter' => null,
+ 'buttons' => null,
+ 'export_filename' => 'export-'.date('Y-m-d'),
+ 'api_url' => null,
+ 'show_column_search' => false,
+ 'show_advanced_search' => false,
+ 'fixed_number' => false,
+ 'fixed_right_number' => false,
+ 'show_footer' => false,
+ 'sort_order' => 'asc',
+ 'sort_field' => 'name',
+
+])
+
+@aware(['name'])
+
+<table
+ role="table"
+ class="table table-striped snipe-table"
+ data-cookie-id-table="{{ $name }}ListingTable"
+ data-id-table="{{ $name }}ListingTable"
+ data-sort-order="{{ $sort_order }}"
+ data-toolbar="#{{ Illuminate\Support\Str::camel($name) }}Toolbar"
+ data-bulk-button-id="#{{ Illuminate\Support\Str::camel($name) }}Button"
+ data-bulk-form-id="#{{ Illuminate\Support\Str::camel($name) }}Form"
+ id="{{ $name }}ListingTable"
+ data-show-columns-search="{{ $show_column_search }}"
+ data-show-advanced-search="{{ $show_advanced_search }}"
+
+ @if ($presenter)
+ data-columns="{{ $presenter }}"
+ @endif
+
+ @if ($fixed_number)
+ data-fixed-number="{{ $fixed_number }}"
+ @endif
+
+ @if ($fixed_right_number)
+ data-fixed-right-number="{{ $fixed_right_number }}"
+ @endif
+
+ @if ($buttons)
+ data-buttons="{{ $buttons }}"
+ @endif
+
+ @if ($show_footer)
+ data-show-footer="{{ $show_footer }}"
+ data-footer-style="footerStyle"
+ @endif
+
+ @if ($api_url)
+ data-side-pagination="server"
+ data-url="{!! $api_url !!}"
+ @endif
+
+ data-export-options='{
+ "fileName": "{{ $export_filename }}",
+ "ignoreColumn": ["actions","available_actions", "image","change","checkbox","checkincheckout","icon"]
+ }'>
+</table>
\ No newline at end of file