From 86677b5f1389b121907ff6b84b6080d941ece5e9 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 27 Mar 2024 20:37:25 +0000 Subject: [PATCH 1/2] Make last_checkin sortable Signed-off-by: snipe --- app/Http/Controllers/Api/AssetsController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index dd375d0823..2ac2df3da4 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -94,6 +94,7 @@ class AssetsController extends Controller 'serial', 'model_number', 'last_checkout', + 'last_checkin', 'notes', 'expected_checkin', 'order_number', From 0d3d172108be43850f0869e2d5cae857b3b32a6b Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 27 Mar 2024 20:37:40 +0000 Subject: [PATCH 2/2] Make last_checkin searchable and fillable Signed-off-by: snipe --- app/Models/Asset.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Models/Asset.php b/app/Models/Asset.php index 2830eca7e5..1f4079e491 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -96,6 +96,7 @@ class Asset extends Depreciable 'company_id' => 'nullable|integer|exists:companies,id', 'warranty_months' => 'nullable|numeric|digits_between:0,240', 'last_checkout' => 'nullable|date_format:Y-m-d H:i:s', + 'last_checkin' => 'nullable|date_format:Y-m-d H:i:s', 'expected_checkin' => 'nullable|date', 'last_audit_date' => 'nullable|date_format:Y-m-d H:i:s', 'next_audit_date' => 'nullable|date|after:last_audit_date', @@ -169,6 +170,8 @@ class Asset extends Depreciable 'expected_checkin', 'next_audit_date', 'last_audit_date', + 'last_checkin', + 'last_checkout', 'asset_eol_date', ];