From 39f764803d9deaca451ff64ef1914f4672eeb674 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 22 Apr 2025 11:38:54 +0100 Subject: [PATCH] Added checkout date to license seats Signed-off-by: snipe --- app/Http/Transformers/LicenseSeatsTransformer.php | 5 +++++ app/Presenters/LicensePresenter.php | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/app/Http/Transformers/LicenseSeatsTransformer.php b/app/Http/Transformers/LicenseSeatsTransformer.php index 7ae68e9e4..6b83f1292 100644 --- a/app/Http/Transformers/LicenseSeatsTransformer.php +++ b/app/Http/Transformers/LicenseSeatsTransformer.php @@ -2,6 +2,7 @@ namespace App\Http\Transformers; +use App\Helpers\Helper; use App\Models\License; use App\Models\LicenseSeat; use Illuminate\Support\Facades\Gate; @@ -26,6 +27,7 @@ class LicenseSeatsTransformer $array = [ 'id' => (int) $seat->id, 'license_id' => (int) $seat->license->id, + 'updated_at' => Helper::getFormattedDateObject($seat->updated_at, 'datetime'), // we use updated_at here because the record gets updated when it's checked in or out 'assigned_user' => ($seat->user) ? [ 'id' => (int) $seat->user->id, 'name'=> e($seat->user->present()->fullName), @@ -36,14 +38,17 @@ class LicenseSeatsTransformer 'name' => e($seat->user->department->name), ] : null, + 'created_at' => Helper::getFormattedDateObject($seat->created_at, 'datetime'), ] : null, 'assigned_asset' => ($seat->asset) ? [ 'id' => (int) $seat->asset->id, 'name'=> e($seat->asset->present()->fullName), + 'created_at' => Helper::getFormattedDateObject($seat->created_at, 'datetime'), ] : null, 'location' => ($seat->location()) ? [ 'id' => (int) $seat->location()->id, 'name'=> e($seat->location()->name), + 'created_at' => Helper::getFormattedDateObject($seat->created_at, 'datetime'), ] : null, 'reassignable' => (bool) $seat->license->reassignable, 'notes' => e($seat->notes), diff --git a/app/Presenters/LicensePresenter.php b/app/Presenters/LicensePresenter.php index 351a9acea..b0f63acdb 100644 --- a/app/Presenters/LicensePresenter.php +++ b/app/Presenters/LicensePresenter.php @@ -280,6 +280,14 @@ class LicensePresenter extends Presenter 'visible' => true, 'formatter' => 'locationsLinkObjFormatter', ], + [ + 'field' => 'updated_at', + 'searchable' => false, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.date'), + 'formatter' => 'dateDisplayFormatter', + ], [ 'field' => 'notes', 'searchable' => false,