Skip to content

A free open source IT asset/license management system

Added requestable table presenter

snipe5619e927bd9d
diff --git a/app/Presenters/AccessoryPresenter.php b/app/Presenters/AccessoryPresenter.php
index d836bbc475..0509525608 100644
--- a/app/Presenters/AccessoryPresenter.php
+++ b/app/Presenters/AccessoryPresenter.php
@@ -434,4 +434,68 @@ class AccessoryPresenter extends Presenter
{
return $this->model->name;
}
+
+ /**
+ * Column layout for the accessories tab on /account/requestable.
+ * Feeds <x-table> via api.accessories.requestable. Row shape
+ * comes from AccessoriesTransformer with assigned_to_self +
+ * available_actions.request/cancel populated so the
+ * accessoryRequestable*Formatter JS helpers can render the
+ * request/cancel button-swap.
+ */
+ public static function dataTableLayoutRequestable(): string
+ {
+ return json_encode([
+ [
+ 'field' => 'image',
+ 'scope' => 'col',
+ 'searchable' => false,
+ 'sortable' => false,
+ 'title' => trans('general.image'),
+ 'formatter' => 'imageFormatter',
+ ], [
+ 'field' => 'name',
+ 'scope' => 'col',
+ 'searchable' => true,
+ 'sortable' => true,
+ 'title' => trans('admin/accessories/general.accessory_name'),
+ 'formatter' => 'accessoryRequestableNameFormatter',
+ ], [
+ 'field' => 'category',
+ 'scope' => 'col',
+ 'searchable' => true,
+ 'sortable' => false,
+ 'title' => trans('general.category'),
+ 'formatter' => 'categoriesLinkObjFormatter',
+ ], [
+ 'field' => 'company.name',
+ 'scope' => 'col',
+ 'searchable' => true,
+ 'sortable' => false,
+ 'title' => trans('general.company'),
+ ], [
+ 'field' => 'location.name',
+ 'scope' => 'col',
+ 'searchable' => true,
+ 'sortable' => false,
+ 'title' => trans('admin/hardware/table.location'),
+ ], [
+ 'field' => 'remaining',
+ 'scope' => 'col',
+ 'searchable' => false,
+ 'sortable' => false,
+ 'title' => trans('admin/accessories/general.remaining'),
+ ], [
+ 'field' => 'actions',
+ 'scope' => 'col',
+ 'searchable' => false,
+ 'sortable' => false,
+ 'switchable' => false,
+ 'title' => trans('table.actions'),
+ 'formatter' => 'accessoryRequestableActionsFormatter',
+ 'printIgnore' => true,
+ 'class' => 'hidden-print',
+ ],
+ ]);
+ }
}
diff --git a/app/Presenters/AssetModelPresenter.php b/app/Presenters/AssetModelPresenter.php
index 45d624980e..5ce02f9ff2 100644
--- a/app/Presenters/AssetModelPresenter.php
+++ b/app/Presenters/AssetModelPresenter.php
@@ -355,4 +355,57 @@ class AssetModelPresenter extends Presenter
return '<span class="'.(($this->deleted_at != '') ? 'deleted' : '').'">'.e($this->display_name).'</span>';
}
+
+ /**
+ * Column layout for the models tab on /account/requestable. Feeds
+ * <x-table> via api.assetmodels.requestable. Row shape comes from
+ * AssetModelsTransformer with assigned_to_self +
+ * available_actions.request/cancel/view populated so the
+ * assetmodelRequestable*Formatter JS helpers can render the
+ * request/cancel button-swap and link-vs-plain-text decision
+ * without a compile-time @can.
+ */
+ public static function dataTableLayoutRequestable(): string
+ {
+ return json_encode([
+ [
+ 'field' => 'image',
+ 'scope' => 'col',
+ 'searchable' => false,
+ 'sortable' => false,
+ 'title' => trans('general.image'),
+ 'formatter' => 'imageFormatter',
+ ], [
+ 'field' => 'name',
+ 'scope' => 'col',
+ 'searchable' => true,
+ 'sortable' => true,
+ 'title' => trans('admin/hardware/table.asset_model'),
+ 'formatter' => 'assetmodelRequestableNameFormatter',
+ ], [
+ 'field' => 'category',
+ 'scope' => 'col',
+ 'searchable' => true,
+ 'sortable' => false,
+ 'title' => trans('general.category'),
+ 'formatter' => 'categoriesLinkObjFormatter',
+ ], [
+ 'field' => 'remaining',
+ 'scope' => 'col',
+ 'searchable' => false,
+ 'sortable' => false,
+ 'title' => trans('admin/accessories/general.remaining'),
+ ], [
+ 'field' => 'actions',
+ 'scope' => 'col',
+ 'searchable' => false,
+ 'sortable' => false,
+ 'switchable' => false,
+ 'title' => trans('table.actions'),
+ 'formatter' => 'assetmodelRequestableActionsFormatter',
+ 'printIgnore' => true,
+ 'class' => 'hidden-print',
+ ],
+ ]);
+ }
}
diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php
index 9ef0f5745d..bb268a581e 100644
--- a/app/Presenters/AssetPresenter.php
+++ b/app/Presenters/AssetPresenter.php
@@ -538,10 +538,10 @@ class AssetPresenter extends Presenter
public function formattedTagLink()
{
if (auth()->user()->can('view', ['\App\Models\Asset', $this])) {
- return '<a href="' . route('hardware.show', e($this->id)) . '" class="' . (($this->deleted_at != '') ? 'deleted' : '') . '">' . e($this->asset_tag) . '</a>';
+ return '<a href="'.route('hardware.show', e($this->id)).'" class="'.(($this->deleted_at != '') ? 'deleted' : '').'">'.e($this->asset_tag).'</a>';
}
- return '<span class="' . (($this->deleted_at != '') ? 'deleted' : '') . '">' . e($this->asset_tag) . '</span>';
+ return '<span class="'.(($this->deleted_at != '') ? 'deleted' : '').'">'.e($this->asset_tag).'</span>';
}
public function modelUrl()
@@ -770,4 +770,131 @@ class AssetPresenter extends Presenter
{
return '<x-icon type="assets" />';
}
+
+ /**
+ * Column layout for the assets tab on /account/requestable. Feeds
+ * <x-table> via api.assets.requestable. Row shape comes from
+ * AssetsTransformer with available_actions.request/cancel
+ * populated so the assetRequestActionsFormatter JS helper can
+ * render the request/cancel button-swap. Custom fields flagged
+ * show_in_requestable_list=1 append as extra columns so admin-
+ * defined per-asset attributes surface here without a code
+ * change.
+ */
+ public static function dataTableLayoutRequestable(): string
+ {
+ $layout = [
+ [
+ 'field' => 'image',
+ 'scope' => 'col',
+ 'searchable' => false,
+ 'sortable' => true,
+ 'title' => trans('general.image'),
+ 'formatter' => 'imageFormatter',
+ ], [
+ 'field' => 'asset_tag',
+ 'scope' => 'col',
+ 'searchable' => true,
+ 'sortable' => true,
+ 'title' => trans('general.asset_tag'),
+ ], [
+ 'field' => 'model',
+ 'scope' => 'col',
+ 'searchable' => true,
+ 'sortable' => true,
+ 'title' => trans('admin/hardware/table.asset_model'),
+ ], [
+ 'field' => 'model_number',
+ 'scope' => 'col',
+ 'searchable' => true,
+ 'sortable' => true,
+ 'title' => trans('admin/models/table.modelnumber'),
+ ], [
+ 'field' => 'name',
+ 'scope' => 'col',
+ 'searchable' => true,
+ 'sortable' => true,
+ 'title' => trans('admin/hardware/form.name'),
+ ], [
+ 'field' => 'serial',
+ 'scope' => 'col',
+ 'searchable' => true,
+ 'sortable' => true,
+ 'title' => trans('admin/hardware/table.serial'),
+ ], [
+ // Full object (not .name) so the formatter can read
+ // tag_color for the color-square icon prefix.
+ // Not searchable because Asset::$searchableRelations
+ // doesn't include category (Asset's category lives
+ // through the model relation, not a direct join),
+ // so a `search=` query wouldn't hit it.
+ 'field' => 'category',
+ 'scope' => 'col',
+ 'searchable' => false,
+ 'sortable' => false,
+ 'title' => trans('general.category'),
+ 'formatter' => 'categoriesLinkObjFormatter',
+ ], [
+ 'field' => 'company.name',
+ 'scope' => 'col',
+ 'searchable' => true,
+ 'sortable' => false,
+ 'title' => trans('general.company'),
+ ], [
+ 'field' => 'location',
+ 'scope' => 'col',
+ 'searchable' => true,
+ 'sortable' => true,
+ 'title' => trans('admin/hardware/table.location'),
+ ], [
+ 'field' => 'status',
+ 'scope' => 'col',
+ 'searchable' => true,
+ 'sortable' => true,
+ 'title' => trans('admin/hardware/table.status'),
+ ], [
+ 'field' => 'expected_checkin',
+ 'scope' => 'col',
+ 'searchable' => false,
+ 'sortable' => true,
+ 'title' => trans('admin/hardware/form.expected_checkin'),
+ 'formatter' => 'dateDisplayFormatter',
+ ],
+ ];
+
+ // Custom fields flagged for the requestable list. Same
+ // fieldset-must-be-attached-to-a-model guard as the standard
+ // asset layout uses (see dataTableLayout above) so the JS
+ // side doesn't ask for row properties that never travel over
+ // the REST API.
+ $fields = CustomField::whereHas('fieldset', function ($query) {
+ $query->whereHas('models');
+ })->where('field_encrypted', 0)
+ ->where('show_in_requestable_list', 1)
+ ->get();
+
+ foreach ($fields as $field) {
+ $layout[] = [
+ 'field' => 'custom_fields.'.$field->db_column,
+ 'scope' => 'col',
+ 'searchable' => true,
+ 'sortable' => true,
+ 'title' => e($field->name),
+ ];
+ }
+
+ $layout[] = [
+ 'field' => 'actions',
+ 'scope' => 'col',
+ 'searchable' => false,
+ 'sortable' => false,
+ 'switchable' => false,
+ 'title' => trans('table.actions'),
+ 'formatter' => 'assetRequestActionsFormatter',
+ 'printIgnore' => true,
+ 'class' => 'hidden-print',
+ ];
+
+ return json_encode($layout);
+ }
}
diff --git a/app/Presenters/CheckoutRequestPresenter.php b/app/Presenters/CheckoutRequestPresenter.php
index 86b967f6d8..2c842a9ce6 100644
--- a/app/Presenters/CheckoutRequestPresenter.php
+++ b/app/Presenters/CheckoutRequestPresenter.php
@@ -2,8 +2,10 @@
namespace App\Presenters;
+use App\Models\CustomField;
+
/**
- * bs-table column layout for the admin /hardware/requested view.
+ * bs-table column layout for the admin /requests view.
* Pairs with GET /api/v1/requests + CheckoutRequestsTransformer, so
* the internal admin UI eats the same API surface external integrators
* consume for #15541.
@@ -53,6 +55,35 @@ class CheckoutRequestPresenter extends Presenter
'sortable' => false,
'title' => trans('general.location'),
'visible' => true,
+ ], [
+ // Category is resolved polymorphically by the
+ // transformer (direct on most types, through model
+ // on Asset). Full object (not .name) so the
+ // formatter can render the tag_color icon. Off-by-
+ // default to keep the row narrow for admins that
+ // don't care - the switchable column picker turns
+ // it on when they do.
+ 'field' => 'requestable.category',
+ 'scope' => 'col',
+ 'searchable' => true,
+ 'sortable' => false,
+ 'switchable' => true,
+ 'visible' => false,
+ 'title' => trans('general.category'),
+ 'formatter' => 'categoriesLinkObjFormatter',
+ ], [
+ // Company is direct on every requestable type except
+ // AssetModel (models are shared across companies), so
+ // model rows render empty here. Off-by-default like
+ // category - the FMCS crowd toggles it on via the
+ // switchable column picker.
+ 'field' => 'requestable.company.name',
+ 'scope' => 'col',
+ 'searchable' => true,
+ 'sortable' => false,
+ 'switchable' => true,
+ 'visible' => false,
+ 'title' => trans('general.company'),
], [
'field' => 'requestable.expected_checkin',
'scope' => 'col',
@@ -62,26 +93,81 @@ class CheckoutRequestPresenter extends Presenter
'visible' => true,
'formatter' => 'dateDisplayFormatter',
], [
- 'field' => 'user',
+ // Qty the requester asked for. Emitted on every row
+ // (defaults to 1) since checkoutable requests carry
+ // a per-row quantity even for the not-strictly-qty-
+ // tracked types. Header reads "Requested" to
+ // disambiguate from the neighbouring "Remaining"
+ // (on-hand) column.
+ 'field' => 'quantity',
'scope' => 'col',
- 'searchable' => true,
- 'sortable' => false,
- 'title' => trans('admin/hardware/table.requesting_user'),
+ 'searchable' => false,
+ 'sortable' => true,
+ 'switchable' => true,
'visible' => true,
- 'formatter' => 'requesterFormatter',
+ 'title' => trans('admin/hardware/general.requested'),
+ 'class' => 'text-right text-padding-number-cell',
+ ], [
+ // On-hand available count for qty-tracked types
+ // (accessory / consumable / component). Null for
+ // asset / model / license rows; the default
+ // formatter renders that as empty which is the right
+ // read ("N/A here"). Sort is handled in-PHP inside
+ // the controller because numRemaining() is a
+ // computed method that differs per polymorphic type,
+ // so a DB orderBy isn't feasible - the whitelist
+ // entry in Api\CheckoutRequest::index maps this key
+ // to the polymorphic method call.
+ 'field' => 'requestable.remaining',
+ 'scope' => 'col',
+ 'searchable' => false,
+ 'sortable' => true,
+ 'switchable' => true,
+ 'visible' => true,
+ 'title' => trans('admin/components/general.remaining'),
+ 'class' => 'text-right text-padding-number-cell',
+ ], [
+ // Reservation window start (nullable). Requesters
+ // that just want "whenever" leave both blank and the
+ // column renders empty via dateDisplayFormatter.
+ 'field' => 'start_date',
+ 'scope' => 'col',
+ 'searchable' => false,
+ 'sortable' => true,
+ 'switchable' => true,
+ 'visible' => true,
+ 'title' => trans('general.start_date'),
+ 'formatter' => 'dateDisplayFormatter',
], [
- // Compact list of every open requester for THIS row's
- // requestable, current row included. Reuses the same
- // "1 / 2-3 / first + (+N more) with tooltip" pattern
- // as the accessory/consumable/component orders column.
- 'field' => 'pending_requesters',
+ 'field' => 'end_date',
'scope' => 'col',
'searchable' => false,
+ 'sortable' => true,
+ 'switchable' => true,
+ 'visible' => true,
+ 'title' => trans('general.end_date'),
+ 'formatter' => 'dateDisplayFormatter',
+ ], [
+ // Requester's free-text notes. Hidden by default so
+ // the table stays scannable; admins toggle it on via
+ // the switchable column picker when they need the
+ // per-row context.
+ 'field' => 'notes',
+ 'scope' => 'col',
+ 'searchable' => true,
'sortable' => false,
'switchable' => true,
+ 'visible' => false,
+ 'title' => trans('general.notes'),
+ 'formatter' => 'notesFormatter',
+ ], [
+ 'field' => 'user',
+ 'scope' => 'col',
+ 'searchable' => true,
+ 'sortable' => false,
+ 'title' => trans('admin/hardware/table.requesting_user'),
'visible' => true,
- 'title' => trans('admin/hardware/table.pending_requesters'),
- 'formatter' => 'ordersSummaryFormatter',
+ 'formatter' => 'requesterFormatter',
], [
'field' => 'requested_at',
'scope' => 'col',
@@ -104,6 +190,33 @@ class CheckoutRequestPresenter extends Presenter
],
];
+ // Custom fields flagged for the requestable list, appended
+ // as switchable/off-by-default columns so admins evaluating
+ // a request can toggle the per-instance context they care
+ // about (CPU, warranty, whatever the model's fieldset
+ // carries) without cluttering the default view. Same
+ // fieldset-must-be-attached-to-a-model guard the standard
+ // asset layout uses. Only asset requests have per-instance
+ // values so non-asset rows render blank in these columns;
+ // the transformer emits an empty object for those rows.
+ $fields = CustomField::whereHas('fieldset', function ($query): void {
+ $query->whereHas('models');
+ })->where('field_encrypted', 0)
+ ->where('show_in_requestable_list', 1)
+ ->get();
+
+ foreach ($fields as $field) {
+ $layout[] = [
+ 'field' => 'requestable.custom_fields.'.$field->db_column,
+ 'scope' => 'col',
+ 'searchable' => true,
+ 'sortable' => false,
+ 'switchable' => true,
+ 'visible' => false,
+ 'title' => e($field->name),
+ ];
+ }
+
return json_encode($layout);
}
}
diff --git a/app/Presenters/ComponentPresenter.php b/app/Presenters/ComponentPresenter.php
index 1b697bd9b6..27e62da8ce 100644
--- a/app/Presenters/ComponentPresenter.php
+++ b/app/Presenters/ComponentPresenter.php
@@ -331,4 +331,65 @@ class ComponentPresenter extends Presenter
{
return route('components.show', $this->id);
}
+
+ /**
+ * Column layout for the components tab on /account/requestable.
+ * Same shape as AccessoryPresenter::dataTableLayoutRequestable;
+ * paired with api.components.requestable + ComponentsTransformer.
+ */
+ public static function dataTableLayoutRequestable(): string
+ {
+ return json_encode([
+ [
+ 'field' => 'image',
+ 'scope' => 'col',
+ 'searchable' => false,
+ 'sortable' => false,
+ 'title' => trans('general.image'),
+ 'formatter' => 'imageFormatter',
+ ], [
+ 'field' => 'name',
+ 'scope' => 'col',
+ 'searchable' => true,
+ 'sortable' => true,
+ 'title' => trans('general.name'),
+ 'formatter' => 'componentRequestableNameFormatter',
+ ], [
+ 'field' => 'category',
+ 'scope' => 'col',
+ 'searchable' => true,
+ 'sortable' => false,
+ 'title' => trans('general.category'),
+ 'formatter' => 'categoriesLinkObjFormatter',
+ ], [
+ 'field' => 'company.name',
+ 'scope' => 'col',
+ 'searchable' => true,
+ 'sortable' => false,
+ 'title' => trans('general.company'),
+ ], [
+ 'field' => 'location.name',
+ 'scope' => 'col',
+ 'searchable' => true,
+ 'sortable' => false,
+ 'title' => trans('admin/hardware/table.location'),
+ ], [
+ 'field' => 'remaining',
+ 'scope' => 'col',
+ 'searchable' => false,
+ 'sortable' => false,
+ 'title' => trans('admin/components/general.remaining'),
+ ], [
+ 'field' => 'actions',
+ 'scope' => 'col',
+ 'searchable' => false,
+ 'sortable' => false,
+ 'switchable' => false,
+ 'title' => trans('table.actions'),
+ 'formatter' => 'componentRequestableActionsFormatter',
+ 'printIgnore' => true,
+ 'class' => 'hidden-print',
+ ],
+ ]);
+ }
}
diff --git a/app/Presenters/ConsumablePresenter.php b/app/Presenters/ConsumablePresenter.php
index b08f27475f..a96503b3c1 100644
--- a/app/Presenters/ConsumablePresenter.php
+++ b/app/Presenters/ConsumablePresenter.php
@@ -312,4 +312,65 @@ class ConsumablePresenter extends Presenter
{
return '<a href="'.route('consumables.show', $this->id).'">'.e($this->name).'</a>';
}
+
+ /**
+ * Column layout for the consumables tab on /account/requestable.
+ * Same shape as AccessoryPresenter::dataTableLayoutRequestable;
+ * paired with api.consumables.requestable + ConsumablesTransformer.
+ */
+ public static function dataTableLayoutRequestable(): string
+ {
+ return json_encode([
+ [
+ 'field' => 'image',
+ 'scope' => 'col',
+ 'searchable' => false,
+ 'sortable' => false,
+ 'title' => trans('general.image'),
+ 'formatter' => 'imageFormatter',
+ ], [
+ 'field' => 'name',
+ 'scope' => 'col',
+ 'searchable' => true,
+ 'sortable' => true,
+ 'title' => trans('general.name'),
+ 'formatter' => 'consumableRequestableNameFormatter',
+ ], [
+ 'field' => 'category',
+ 'scope' => 'col',
+ 'searchable' => true,
+ 'sortable' => false,
+ 'title' => trans('general.category'),
+ 'formatter' => 'categoriesLinkObjFormatter',
+ ], [
+ 'field' => 'company.name',
+ 'scope' => 'col',
+ 'searchable' => true,
+ 'sortable' => false,
+ 'title' => trans('general.company'),
+ ], [
+ 'field' => 'location.name',
+ 'scope' => 'col',
+ 'searchable' => true,
+ 'sortable' => false,
+ 'title' => trans('admin/hardware/table.location'),
+ ], [
+ 'field' => 'remaining',
+ 'scope' => 'col',
+ 'searchable' => false,
+ 'sortable' => false,
+ 'title' => trans('admin/components/general.remaining'),
+ ], [
+ 'field' => 'actions',
+ 'scope' => 'col',
+ 'searchable' => false,
+ 'sortable' => false,
+ 'switchable' => false,
+ 'title' => trans('table.actions'),
+ 'formatter' => 'consumableRequestableActionsFormatter',
+ 'printIgnore' => true,
+ 'class' => 'hidden-print',
+ ],
+ ]);
+ }
}