diff --git a/app/Http/Controllers/V3/Dashboard/Reports/RoadItemsReportController.php b/app/Http/Controllers/V3/Dashboard/Reports/RoadItemsReportController.php index 81a8425d..f5afc74a 100644 --- a/app/Http/Controllers/V3/Dashboard/Reports/RoadItemsReportController.php +++ b/app/Http/Controllers/V3/Dashboard/Reports/RoadItemsReportController.php @@ -90,30 +90,6 @@ class RoadItemsReportController extends Controller ]); } - public function map(Request $request): JsonResponse - { - $provinceId = $request->province_id; - $cityId = $request->city_id; - $subId = $request->sub_id; - $item = $request->item; - $dateFrom = $request->date_from ? $request->date_from . ' 00:00:00' : now()->startOfDay()->toDateTimeString(); - $dateTo = $request->date_to ? $request->date_to . ' 23:59:59' : now()->addDay()->startOfDay()->toDateTimeString(); - - $data = RoadItemsProject::query() - ->where('is_new', '=', 1) - ->when($provinceId, fn($query) => $query->where('province_id', '=', $provinceId)) - ->when($cityId, fn($query) => $query->where('city_id', '=', $cityId)) - ->when($subId, fn($query) => $query->where('sub_items', 'like', '%' . $subId . '%')) - ->when($item, fn($query) => $query->where('item', '=', $item)) - ->when(!is_null($request->status), fn($query) => $query->where('status', '=', $request->status)) - ->whereBetween('activity_date', [$dateFrom, $dateTo]) - ->leftJoin('users', 'users.id', '=', 'road_items_projects.user_id') - ->select('road_items_projects.id as i', 'start_lat as l', 'start_lng as g', 'status') - ->get(); - - return $this->successResponse($data); - } - public function countryActivityExcelPerItem(Request $request, RoadItemReportService $roadItemReportService): BinaryFileResponse { auth()->user()->addActivityComplete(1034); @@ -169,4 +145,33 @@ class RoadItemsReportController extends Controller 'edarateShahri' => EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']), ]), $name); } + + public function activitiesOnMap(Request $request): JsonResponse + { + $provinceId = $request->province_id; + $cityId = $request->city_id; + $subId = $request->sub_id; + $item = $request->item; + $dateFrom = $request->date_from ? $request->date_from . ' 00:00:00' : now()->startOfDay()->toDateTimeString(); + $dateTo = $request->date_to ? $request->date_to . ' 23:59:59' : now()->addDay()->startOfDay()->toDateTimeString(); + + $data = RoadItemsProject::query() + ->where('is_new', '=', 1) + ->when($provinceId, fn($query) => $query->where('province_id', '=', $provinceId)) + ->when($cityId, fn($query) => $query->where('city_id', '=', $cityId)) + ->when($subId, fn($query) => $query->where('sub_items', 'like', '%' . $subId . '%')) + ->when($item, fn($query) => $query->where('item', '=', $item)) + ->when(!is_null($request->status), fn($query) => $query->where('status', '=', $request->status)) + ->whereBetween('activity_date', [$dateFrom, $dateTo]) + ->leftJoin('users', 'users.id', '=', 'road_items_projects.user_id') + ->select('road_items_projects.id as i', 'start_lat as l', 'start_lng as g', 'status') + ->get(); + + return $this->successResponse($data); + } + + public function showOnMap(RoadItemsProject $roadItemsProject): JsonResponse + { + return $this->successResponse($roadItemsProject->load(['files', 'rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number'])); + } } diff --git a/app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php b/app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php index d45967b6..9cb4ce6a 100644 --- a/app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php +++ b/app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php @@ -89,4 +89,9 @@ class RoadPatrolReportController extends Controller return $this->successResponse($data); } + + public function showOnMap(RoadPatrol $road_patrol) + { + return $this->successResponse($road_patrol->load(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number'])); + } } diff --git a/routes/v3.php b/routes/v3.php index 9557589f..cfba8f17 100644 --- a/routes/v3.php +++ b/routes/v3.php @@ -196,11 +196,12 @@ Route::prefix('road_item_reports') Route::get('/province_activity_per_sub_item', 'provinceActivityPerSubItem')->name('provinceActivityPerSubItem'); Route::get('/country_activity_per_item', 'countryActivityPerItem')->name('countryActivityPerItem'); Route::get('/province_activity_per_item', 'provinceActivityPerItem')->name('provinceActivityPerItem'); - Route::get('/map', 'map')->name('map'); Route::get('/country_activity_excel_per_item', 'countryActivityExcelPerItem')->name('countryActivityExcelPerItem'); Route::get('/province_activity_excel_per_item', 'provinceActivityExcelPerItem')->name('provinceActivityExcelPerItem'); Route::get('/country_activity_excel_per_sub_item', 'countryActivityExcelPerSubItem')->name('countryActivityExcelPerSubItem'); Route::get('/province_activity_excel_per_sub_item', 'provinceActivityExcelPerSubItem')->name('provinceActivityExcelPerSubItem'); + Route::get('/activities_on_map', 'activitiesOnMap')->name('activitiesOnMap'); + Route::get('/show_on_map', 'showOnMap')->name('showOnMap'); }); Route::prefix('road_patrol_reports')