RMS/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add new column for filtering

Browse Source
This commit is contained in:
Witel Group
2024-12-18 12:30:01 +00:00
parent a8efd6aac0
commit 549bd8ebe1
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/V3/CMMSMachinesController.php
View File

@@ -14,7 +14,7 @@ class CMMSMachinesController extends Controller
public function list(): JsonResponse public function list(): JsonResponse
{ {
$machinesList = CMMSMachine::query()->get(['machine_code']); $machinesList = CMMSMachine::query()->get(['machine_code', 'id']);
return $this->successResponse($machinesList); return $this->successResponse($machinesList);
} }
@@ -23,7 +23,7 @@ class CMMSMachinesController extends Controller
{ {
$matchedSearchedMachines = CMMSMachine::query() $matchedSearchedMachines = CMMSMachine::query()
->where('machine_code', 'LIKE', "%{$request->machine_code}%") ->where('machine_code', 'LIKE', "%{$request->machine_code}%")
->get(['machine_code']); ->get(['machine_code', 'id']);
return $this->successResponse($matchedSearchedMachines); return $this->successResponse($matchedSearchedMachines);
} }

6
app/Http/Controllers/V3/RoadItemsProjectController.php
View File

@@ -39,7 +39,8 @@ class RoadItemsProjectController extends Controller
'end_lng', 'project_distance', 'item', 'item_fa', 'sub_item_fa', 'end_lng', 'project_distance', 'item', 'item_fa', 'sub_item_fa',
'sub_item_data', 'created_at', 'updated_at', 'province_id', 'province_fa', 'sub_item_data', 'created_at', 'updated_at', 'province_id', 'province_fa',
'unit_fa', 'status', 'status_fa', 'supervisor_description', 'supervising_time', '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; $allowedFilters = $columns;
@@ -146,7 +147,8 @@ class RoadItemsProjectController extends Controller
'end_lng', 'project_distance', 'item', 'item_fa', 'sub_item_fa', 'end_lng', 'project_distance', 'item', 'item_fa', 'sub_item_fa',
'sub_item_data', 'created_at', 'updated_at', 'province_id', 'province_fa', 'sub_item_data', 'created_at', 'updated_at', 'province_id', 'province_fa',
'unit_fa', 'status', 'status_fa', 'supervisor_description', 'supervising_time', '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; $allowedFilters = $columns;