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

add machines and rahdaran to road patrols

Browse Source
This commit is contained in:
amirghasempoor
2024-12-28 11:22:55 +03:30
parent c25b7ecb32
commit 42c3dc4ce8
3 changed files with 47 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/Http/Controllers/V3/RoadPatrolProjectController.php
View File

@@ -37,7 +37,7 @@ class RoadPatrolProjectController extends Controller
'operator_name', 'officer_plaque', 'officer_phone_number', 'officer_name',
'supervisor_description', 'supervising_time', 'supervisor_name', 'status',
'status_fa', 'distance', 'province_id', 'province_fa', 'edare_id', 'edare_name',
'start_time', 'end_time','description'
'start_time', 'end_time','description', 'cmmsMachines.machine_code'
);
$allowedFilters = $columns;
@@ -47,13 +47,16 @@ class RoadPatrolProjectController extends Controller
$query = null;
if ($user->hasPermissionTo('show-road-patrol-supervise-cartable')) {
$query = RoadPatrol::query();
$query = RoadPatrol::query()
->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']);
}
elseif ($user->hasPermissionTo('show-road-patrol-supervise-cartable-province')) {
if (is_null($user->province_id)) {
return $this->errorResponse('استانی برای شما در سامانه ثبت نشده است!');
}
$query = RoadPatrol::query()->where('province_id', '=', $user->province_id);
$query = RoadPatrol::query()
->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number'])
->where('province_id', '=', $user->province_id);
}
$data = DataTableFacade::run(
@@ -123,13 +126,15 @@ class RoadPatrolProjectController extends Controller
$columns = array(
'id', 'start_lat', 'start_lon', 'end_lat', 'end_lon', 'officer_plaque',
'officer_phone_number', 'officer_name', 'supervisor_description', 'supervising_time',
'supervisor_name', 'status', 'status_fa', 'distance', 'start_time', 'end_time'
'supervisor_name', 'status', 'status_fa', 'distance', 'start_time', 'end_time', 'cmmsMachines.machine_code'
);
$allowedFilters = $columns;
$allowedSortings = $columns;
$query = RoadPatrol::query()->where('operator_id', '=', auth()->user()->id);
$query = RoadPatrol::query()
->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number'])
->where('operator_id', '=', auth()->user()->id);
$data = DataTableFacade::run(
$query,
@@ -192,6 +197,9 @@ class RoadPatrolProjectController extends Controller
'description' => $request->description ?? null,
]);
$road_patrol->rahdaran()->attach($request->rahdaran_id);
$road_patrol->cmmsMachines()->attach($request->machines_id);
if ($request->observed_items) {
foreach ($request->observed_items as $index => $item) {
$info_item = InfoItem::where('item', $item['item_id'])
@@ -297,10 +305,7 @@ class RoadPatrolProjectController extends Controller
return $road_patrol;
});
return response()->json([
'road_patrol_id' => $road_patrol->id,
'message' => 'succussful'
]);
return $this->successResponse();
}
public function getReport(RoadPatrol $roadPatrol): JsonResponse