A free open source IT asset/license management system
Updated presenters with new flags
snipe2d2bfc5016e3
diff --git a/app/Presenters/AccessoryPresenter.php b/app/Presenters/AccessoryPresenter.phpindex 2fdad14f03..f9c91e8cd9 100644--- a/app/Presenters/AccessoryPresenter.php+++ b/app/Presenters/AccessoryPresenter.php@@ -15,12 +15,14 @@ class AccessoryPresenter extends Presenter/*** JSON column layout for bootstrap-table.*- * @param bool $showDeletedAt Make the deleted_at column visible- * by default. Passed from the Deleted-index view so admins- * see when each row was deleted. Still switchable elsewhere.+ * @param array<int, string> $hide_fields Column field names to omit from the layout+ * entirely. Used by the main /accessories list+ * to skip `deleted_at`, which is always NULL on+ * non-trash views (the Archived / Deleted+ * status filter owns surfacing those rows).* @return string*/- public static function dataTableLayout(bool $showDeletedAt = false)+ public static function dataTableLayout(array $hide_fields = []){$layout = [[@@ -108,7 +110,7 @@ class AccessoryPresenter extends Presenter], ['field' => 'min_amt','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'title' => trans('general.min_amt'),'formatter' => 'minAmtFormatter',@@ -116,7 +118,7 @@ class AccessoryPresenter extends Presenter], ['field' => 'qty','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'title' => trans('admin/accessories/general.total'),'footerFormatter' => 'qtySumFormatter',@@ -124,7 +126,7 @@ class AccessoryPresenter extends Presenter], ['field' => 'remaining','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,// Kept hidden by default so the primary "% Remaining"// progress bar column stays the headline signal; users@@ -137,7 +139,7 @@ class AccessoryPresenter extends Presenter], ['field' => 'checkouts_count','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'visible' => true,'title' => trans('general.checked_out'),@@ -161,7 +163,7 @@ class AccessoryPresenter extends Presenter// through OrderByLastPurchaseDate accordingly.'field' => 'purchase_date','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'visible' => false,'title' => trans('general.last_purchase_date'),@@ -169,7 +171,7 @@ class AccessoryPresenter extends Presenter], ['field' => 'purchase_cost','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'title' => trans('general.last_unit_cost'),'class' => 'text-right text-padding-number-cell',@@ -204,7 +206,7 @@ class AccessoryPresenter extends Presenter], ['field' => 'requestable','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'switchable' => true,'visible' => false,@@ -222,7 +224,7 @@ class AccessoryPresenter extends Presenter], ['field' => 'created_by','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'title' => trans('general.created_by'),'visible' => false,@@ -251,7 +253,7 @@ class AccessoryPresenter extends Presenter'searchable' => false,'sortable' => true,'switchable' => true,- 'visible' => $showDeletedAt,+ 'visible' => true,'title' => trans('general.deleted_at'),'formatter' => 'dateDisplayFormatter',], [@@ -276,6 +278,12 @@ class AccessoryPresenter extends Presenter],];+ if (! empty($hide_fields)) {+ $layout = array_values(array_filter($layout, function ($col) use ($hide_fields) {+ return ! in_array($col['field'], $hide_fields, true);+ }));+ }+return json_encode($layout);}diff --git a/app/Presenters/AssetModelPresenter.php b/app/Presenters/AssetModelPresenter.phpindex 2647fcd362..5ad2963f8f 100644--- a/app/Presenters/AssetModelPresenter.php+++ b/app/Presenters/AssetModelPresenter.php@@ -196,7 +196,7 @@ class AssetModelPresenter extends Presenter['field' => 'eol','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'switchable' => true,'title' => trans('admin/hardware/form.eol_rate'),@@ -215,7 +215,7 @@ class AssetModelPresenter extends Presenter['field' => 'requestable','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'visible' => false,'title' => trans('admin/hardware/general.requestable'),@@ -224,7 +224,7 @@ class AssetModelPresenter extends Presenter['field' => 'require_serial','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'visible' => false,'title' => trans('admin/hardware/general.require_serial'),diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.phpindex 644566d8d2..a5f14c85ed 100644--- a/app/Presenters/AssetPresenter.php+++ b/app/Presenters/AssetPresenter.php@@ -205,7 +205,7 @@ class AssetPresenter extends Presenter['field' => 'age','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => false,'visible' => false,'title' => trans('general.age'),@@ -259,7 +259,7 @@ class AssetPresenter extends Presenter], ['field' => 'warranty_expires','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => false,'visible' => false,'title' => trans('admin/hardware/form.warranty_expires'),@@ -267,7 +267,7 @@ class AssetPresenter extends Presenter], ['field' => 'requestable','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'visible' => false,'title' => trans('admin/hardware/general.requestable'),@@ -308,7 +308,7 @@ class AssetPresenter extends Presenter], ['field' => 'created_by','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'title' => trans('general.created_by'),'visible' => false,@@ -352,7 +352,7 @@ class AssetPresenter extends Presenter['field' => 'last_checkout','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'visible' => false,'title' => trans('admin/hardware/table.checkout_date'),@@ -360,7 +360,7 @@ class AssetPresenter extends Presenter], ['field' => 'last_checkin','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'visible' => false,'title' => trans('admin/hardware/table.last_checkin_date'),@@ -376,7 +376,7 @@ class AssetPresenter extends Presenter], ['field' => 'last_audit_date','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'visible' => false,'title' => trans('general.last_audit'),@@ -384,7 +384,7 @@ class AssetPresenter extends Presenter], ['field' => 'next_audit_date','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'visible' => false,'title' => trans('general.next_audit_date'),@@ -392,7 +392,7 @@ class AssetPresenter extends Presenter], ['field' => 'byod','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'visible' => false,'title' => trans('general.byod'),diff --git a/app/Presenters/CategoryPresenter.php b/app/Presenters/CategoryPresenter.phpindex 5733bf3deb..69fde3c49b 100644--- a/app/Presenters/CategoryPresenter.php+++ b/app/Presenters/CategoryPresenter.php@@ -118,7 +118,7 @@ class CategoryPresenter extends Presenter], ['field' => 'created_by','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'title' => trans('general.created_by'),'visible' => false,@@ -135,7 +135,7 @@ class CategoryPresenter extends Presenter], ['field' => 'updated_at','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'switchable' => true,'title' => trans('general.updated_at'),diff --git a/app/Presenters/CompanyPresenter.php b/app/Presenters/CompanyPresenter.phpindex b5a751b204..faf8728b07 100644--- a/app/Presenters/CompanyPresenter.php+++ b/app/Presenters/CompanyPresenter.php@@ -43,7 +43,7 @@ class CompanyPresenter extends Presenter], ['field' => 'parent','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'switchable' => true,'title' => trans('admin/companies/table.parent'),@@ -169,7 +169,7 @@ class CompanyPresenter extends Presenter], ['field' => 'created_by','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'title' => trans('general.created_by'),'visible' => false,diff --git a/app/Presenters/DepartmentPresenter.php b/app/Presenters/DepartmentPresenter.phpindex 6f8d12872d..23f8bb072e 100644--- a/app/Presenters/DepartmentPresenter.php+++ b/app/Presenters/DepartmentPresenter.php@@ -61,7 +61,7 @@ class DepartmentPresenter extends Presenter], ['field' => 'manager','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'switchable' => true,'title' => trans('admin/departments/table.manager'),@@ -70,7 +70,7 @@ class DepartmentPresenter extends Presenter], ['field' => 'location','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'switchable' => true,'title' => trans('general.location'),diff --git a/app/Presenters/LicensePresenter.php b/app/Presenters/LicensePresenter.phpindex 53ae5e10a4..3b44d5191e 100644--- a/app/Presenters/LicensePresenter.php+++ b/app/Presenters/LicensePresenter.php@@ -113,7 +113,7 @@ class LicensePresenter extends Presenter], ['field' => 'min_amt','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'title' => trans('mail.min_QTY'),'formatter' => 'minAmtFormatter',@@ -121,7 +121,7 @@ class LicensePresenter extends Presenter], ['field' => 'seats','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'title' => trans('admin/accessories/general.total'),'class' => 'text-right text-padding-number-cell',@@ -129,7 +129,7 @@ class LicensePresenter extends Presenter], ['field' => 'free_seats_count','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'title' => trans('admin/accessories/general.remaining'),'class' => 'text-right text-padding-number-cell',@@ -166,7 +166,7 @@ class LicensePresenter extends Presenter['field' => 'maintained','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'visible' => false,'title' => trans('admin/licenses/form.maintained'),@@ -174,7 +174,7 @@ class LicensePresenter extends Presenter], ['field' => 'reassignable','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'visible' => false,'title' => trans('admin/licenses/form.reassignable'),@@ -206,7 +206,7 @@ class LicensePresenter extends Presenter], ['field' => 'created_by','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'title' => trans('general.created_by'),'visible' => false,@@ -214,7 +214,7 @@ class LicensePresenter extends Presenter], ['field' => 'created_at','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'visible' => false,'title' => trans('general.created_at'),@@ -222,7 +222,7 @@ class LicensePresenter extends Presenter], ['field' => 'updated_at','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'visible' => false,'title' => trans('general.updated_at'),diff --git a/app/Presenters/LocationPresenter.php b/app/Presenters/LocationPresenter.phpindex c2df19ed09..7062f313a7 100644--- a/app/Presenters/LocationPresenter.php+++ b/app/Presenters/LocationPresenter.php@@ -63,7 +63,7 @@ class LocationPresenter extends Presenter], ['field' => 'parent','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'switchable' => true,'title' => trans('admin/locations/table.parent'),@@ -258,7 +258,7 @@ class LocationPresenter extends Presenter], ['field' => 'manager','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'switchable' => true,'title' => trans('admin/users/table.manager'),diff --git a/app/Presenters/MaintenancesPresenter.php b/app/Presenters/MaintenancesPresenter.phpindex 28ab25154b..3c41da4461 100644--- a/app/Presenters/MaintenancesPresenter.php+++ b/app/Presenters/MaintenancesPresenter.php@@ -165,7 +165,7 @@ class MaintenancesPresenter extends Presenter], ['field' => 'completed_at','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'switchable' => true,'title' => trans('admin/maintenances/form.completed_at'),@@ -174,7 +174,7 @@ class MaintenancesPresenter extends Presenter], ['field' => 'completed_by','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => false,'switchable' => true,'title' => trans('admin/maintenances/form.completed_by'),@@ -225,7 +225,7 @@ class MaintenancesPresenter extends Presenter], ['field' => 'created_by','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'title' => trans('general.created_by'),'visible' => false,diff --git a/app/Presenters/ManufacturerPresenter.php b/app/Presenters/ManufacturerPresenter.phpindex 504ace9f77..44284054a1 100644--- a/app/Presenters/ManufacturerPresenter.php+++ b/app/Presenters/ManufacturerPresenter.php@@ -162,7 +162,7 @@ class ManufacturerPresenter extends Presenter], ['field' => 'created_by','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'title' => trans('general.created_by'),'visible' => false,diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.phpindex c3c985bb0f..4b4264a273 100644--- a/app/Presenters/UserPresenter.php+++ b/app/Presenters/UserPresenter.php@@ -125,7 +125,7 @@ class UserPresenter extends Presenter['field' => 'vip','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'switchable' => true,'title' => trans('admin/users/general.vip_label'),@@ -135,7 +135,7 @@ class UserPresenter extends Presenter['field' => 'remote','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'switchable' => true,'title' => trans('admin/users/general.remote'),@@ -366,7 +366,7 @@ class UserPresenter extends Presenter['field' => 'groups','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => false,'switchable' => true,'title' => trans('general.groups'),@@ -376,7 +376,7 @@ class UserPresenter extends Presenter['field' => 'ldap_import','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'switchable' => true,'title' => trans('admin/settings/general.ldap_enabled'),@@ -386,7 +386,7 @@ class UserPresenter extends Presenter['field' => 'two_factor_enrolled','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'switchable' => true,'title' => trans('admin/users/general.two_factor_enrolled'),@@ -396,7 +396,7 @@ class UserPresenter extends Presenter['field' => 'two_factor_optin','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'switchable' => true,'title' => trans('admin/users/general.two_factor_active'),@@ -406,7 +406,7 @@ class UserPresenter extends Presenter['field' => 'activated','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'switchable' => true,'title' => trans('general.login_enabled'),@@ -416,7 +416,7 @@ class UserPresenter extends Presenter['field' => 'autoassign_licenses','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'switchable' => true,'title' => trans('general.autoassign_licenses'),@@ -426,7 +426,7 @@ class UserPresenter extends Presenter['field' => 'created_by','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'title' => trans('general.created_by'),'visible' => false,@@ -474,13 +474,33 @@ class UserPresenter extends Presenter['field' => 'last_login','scope' => 'col',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'switchable' => true,'title' => trans('general.last_login'),'visible' => false,'formatter' => 'dateDisplayFormatter',],+ [+ 'field' => 'activated_at',+ 'scope' => 'col',+ 'searchable' => true,+ 'sortable' => true,+ 'switchable' => true,+ 'title' => trans('general.activated_at'),+ 'visible' => false,+ 'formatter' => 'dateDisplayFormatter',+ ],+ [+ 'field' => 'show_in_list',+ 'scope' => 'col',+ 'searchable' => true,+ 'sortable' => true,+ 'switchable' => true,+ 'title' => trans('general.show_in_list'),+ 'visible' => false,+ 'formatter' => 'trueFalseFormatter',+ ],['field' => 'actions','scope' => 'col',