From 7421d089ffff51a363c7b3188c475489c2a2d4f7 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 12 Mar 2025 20:25:00 +0000 Subject: [PATCH] Added formatter and centering in presenters Signed-off-by: snipe --- app/Presenters/AccessoryPresenter.php | 17 +++++++++------ app/Presenters/AssetModelPresenter.php | 16 ++++++++++++++ app/Presenters/ComponentPresenter.php | 18 ++++++++++------ app/Presenters/ConsumablePresenter.php | 17 +++++++++------ app/Presenters/LicensePresenter.php | 30 +++++++++++++++----------- 5 files changed, 67 insertions(+), 31 deletions(-) diff --git a/app/Presenters/AccessoryPresenter.php b/app/Presenters/AccessoryPresenter.php index 532441e5b6..5e79cb4a20 100644 --- a/app/Presenters/AccessoryPresenter.php +++ b/app/Presenters/AccessoryPresenter.php @@ -78,28 +78,33 @@ class AccessoryPresenter extends Presenter 'sortable' => true, 'title' => trans('general.location'), 'formatter' => 'locationsLinkObjFormatter', + ], [ + 'field' => 'min_amt', + 'searchable' => false, + 'sortable' => true, + 'title' => trans('general.min_amt'), + 'formatter' => 'minAmtFormatter', + 'class' => 'text-right', ], [ 'field' => 'qty', 'searchable' => false, 'sortable' => true, 'title' => trans('admin/accessories/general.total'), + 'footerFormatter' => 'qtySumFormatter', ], [ - 'field' => 'remaining_qty', + 'field' => 'remaining', 'searchable' => false, 'sortable' => false, 'visible' => false, 'title' => trans('admin/accessories/general.remaining'), + 'footerFormatter' => 'qtySumFormatter', ],[ 'field' => 'checkouts_count', 'searchable' => false, 'sortable' => true, 'visible' => true, 'title' => trans('general.checked_out'), - ], [ - 'field' => 'min_qty', - 'searchable' => false, - 'sortable' => true, - 'title' => trans('general.min_amt'), + 'footerFormatter' => 'qtySumFormatter', ], [ 'field' => 'purchase_date', 'searchable' => true, diff --git a/app/Presenters/AssetModelPresenter.php b/app/Presenters/AssetModelPresenter.php index e3c39149d5..5eaf7dc448 100644 --- a/app/Presenters/AssetModelPresenter.php +++ b/app/Presenters/AssetModelPresenter.php @@ -74,7 +74,10 @@ class AssetModelPresenter extends Presenter 'switchable' => true, 'title' => trans('mail.min_QTY'), 'visible' => true, + 'formatter' => 'minAmtFormatter', + 'class' => 'text-right', ], + [ 'field' => 'assets_count', 'searchable' => false, @@ -82,6 +85,19 @@ class AssetModelPresenter extends Presenter 'switchable' => true, 'title' => trans('admin/models/table.numassets'), 'visible' => true, + 'class' => 'text-right', + 'footerFormatter' => 'qtySumFormatter', + ], + + [ + 'field' => 'remaining', + 'searchable' => false, + 'sortable' => false, + 'switchable' => true, + 'title' => trans('general.remaining'), + 'visible' => true, + 'class' => 'text-right', + 'footerFormatter' => 'qtySumFormatter', ], [ 'field' => 'depreciation', diff --git a/app/Presenters/ComponentPresenter.php b/app/Presenters/ComponentPresenter.php index 39a177592d..3bdc7728f9 100644 --- a/app/Presenters/ComponentPresenter.php +++ b/app/Presenters/ComponentPresenter.php @@ -79,24 +79,30 @@ class ComponentPresenter extends Presenter 'title' => trans('general.manufacturer'), 'visible' => false, 'formatter' => 'manufacturersLinkObjFormatter', + ], [ + 'field' => 'min_amt', + 'searchable' => false, + 'sortable' => true, + 'title' => trans('general.min_amt'), + 'visible' => true, + 'class' => 'text-right', + 'formatter' => 'minAmtFormatter', ], [ 'field' => 'qty', 'searchable' => false, 'sortable' => true, 'title' => trans('admin/components/general.total'), 'visible' => true, + 'class' => 'text-right', + 'footerFormatter' => 'qtySumFormatter', ], [ 'field' => 'remaining', 'searchable' => false, 'sortable' => false, 'title' => trans('admin/components/general.remaining'), 'visible' => true, - ], [ - 'field' => 'min_amt', - 'searchable' => false, - 'sortable' => false, - 'title' => trans('general.min_amt'), - 'visible' => true, + 'class' => 'text-right', + 'footerFormatter' => 'qtySumFormatter', ], [ 'field' => 'location', 'searchable' => true, diff --git a/app/Presenters/ConsumablePresenter.php b/app/Presenters/ConsumablePresenter.php index cab8bed8bb..db982cac6f 100644 --- a/app/Presenters/ConsumablePresenter.php +++ b/app/Presenters/ConsumablePresenter.php @@ -72,25 +72,30 @@ class ConsumablePresenter extends Presenter 'searchable' => true, 'sortable' => true, 'title' => trans('admin/consumables/general.item_no'), + ], [ + 'field' => 'min_amt', + 'searchable' => false, + 'sortable' => true, + 'title' => trans('general.min_amt'), + 'visible' => true, + 'formatter' => 'minAmtFormatter', + 'class' => 'text-right', ], [ 'field' => 'qty', 'searchable' => false, 'sortable' => true, 'title' => trans('admin/components/general.total'), 'visible' => true, + 'class' => 'text-right', + 'footerFormatter' => 'qtySumFormatter', ], [ 'field' => 'remaining', 'searchable' => false, 'sortable' => true, 'title' => trans('admin/components/general.remaining'), 'visible' => true, + 'footerFormatter' => 'qtySumFormatter', ], [ - 'field' => 'min_amt', - 'searchable' => false, - 'sortable' => false, - 'title' => trans('general.min_amt'), - 'visible' => true, - ], [ 'field' => 'location', 'searchable' => true, 'sortable' => true, diff --git a/app/Presenters/LicensePresenter.php b/app/Presenters/LicensePresenter.php index 4256c2c686..a54431a87e 100644 --- a/app/Presenters/LicensePresenter.php +++ b/app/Presenters/LicensePresenter.php @@ -80,24 +80,28 @@ class LicensePresenter extends Presenter 'sortable' => true, 'title' => trans('general.manufacturer'), 'formatter' => 'manufacturersLinkObjFormatter', - ], [ - 'field' => 'seats', - 'searchable' => false, - 'sortable' => true, - 'title' => trans('admin/accessories/general.total'), - ], [ - 'field' => 'free_seats_count', - 'searchable' => false, - 'sortable' => true, - 'title' => trans('admin/accessories/general.remaining'), - ], - [ + ], [ 'field' => 'min_amt', 'searchable' => false, 'sortable' => true, 'title' => trans('mail.min_QTY'), 'formatter' => 'minAmtFormatter', - ],[ + 'class' => 'text-right', + ], [ + 'field' => 'seats', + 'searchable' => false, + 'sortable' => true, + 'title' => trans('admin/accessories/general.total'), + 'class' => 'text-right', + 'footerFormatter' => 'qtySumFormatter', + ], [ + 'field' => 'free_seats_count', + 'searchable' => false, + 'sortable' => true, + 'title' => trans('admin/accessories/general.remaining'), + 'class' => 'text-right', + 'footerFormatter' => 'qtySumFormatter', + ], [ 'field' => 'purchase_date', 'searchable' => true, 'sortable' => true,