From 549bd8ebe18d2ed2754880938a9b5d0d10e0b5e7 Mon Sep 17 00:00:00 2001 From: Witel Group Date: Wed, 18 Dec 2024 12:30:01 +0000 Subject: [PATCH] add new column for filtering --- app/Http/Controllers/V3/CMMSMachinesController.php | 4 ++-- app/Http/Controllers/V3/RoadItemsProjectController.php | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/V3/CMMSMachinesController.php b/app/Http/Controllers/V3/CMMSMachinesController.php index 90cffe26..ffba9760 100644 --- a/app/Http/Controllers/V3/CMMSMachinesController.php +++ b/app/Http/Controllers/V3/CMMSMachinesController.php @@ -14,7 +14,7 @@ class CMMSMachinesController extends Controller public function list(): JsonResponse { - $machinesList = CMMSMachine::query()->get(['machine_code']); + $machinesList = CMMSMachine::query()->get(['machine_code', 'id']); return $this->successResponse($machinesList); } @@ -23,7 +23,7 @@ class CMMSMachinesController extends Controller { $matchedSearchedMachines = CMMSMachine::query() ->where('machine_code', 'LIKE', "%{$request->machine_code}%") - ->get(['machine_code']); + ->get(['machine_code', 'id']); return $this->successResponse($matchedSearchedMachines); } diff --git a/app/Http/Controllers/V3/RoadItemsProjectController.php b/app/Http/Controllers/V3/RoadItemsProjectController.php index c985f85c..58bfe994 100644 --- a/app/Http/Controllers/V3/RoadItemsProjectController.php +++ b/app/Http/Controllers/V3/RoadItemsProjectController.php @@ -39,7 +39,8 @@ class RoadItemsProjectController extends Controller 'end_lng', 'project_distance', 'item', 'item_fa', 'sub_item_fa', 'sub_item_data', 'created_at', 'updated_at', 'province_id', 'province_fa', 'unit_fa', 'status', 'status_fa', 'supervisor_description', 'supervising_time', - 'supervisor_name', 'edarat_id', 'edarat_name', 'activity_date_time' + 'supervisor_name', 'edarat_id', 'edarat_name', 'activity_date_time', + 'cmms_machine_id', 'cmms_machine_code', 'rahdar_id', 'rahdar_code' ); $allowedFilters = $columns; @@ -146,7 +147,8 @@ class RoadItemsProjectController extends Controller 'end_lng', 'project_distance', 'item', 'item_fa', 'sub_item_fa', 'sub_item_data', 'created_at', 'updated_at', 'province_id', 'province_fa', 'unit_fa', 'status', 'status_fa', 'supervisor_description', 'supervising_time', - 'supervisor_name', 'edarat_id', 'edarat_name', 'activity_date_time' + 'supervisor_name', 'edarat_id', 'edarat_name', 'activity_date_time', + 'cmms_machine_id', 'cmms_machine_code', 'rahdar_id', 'rahdar_code' ); $allowedFilters = $columns;