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

map reports

Browse Source
This commit is contained in:
amirghasempoor
2025-02-08 15:39:15 +03:30
parent e570902f31
commit 18cbf77261
3 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
app/Http/Controllers/V3/Dashboard/Reports/RoadItemsReportController.php
View File

@@ -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']));
}
}

5
app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php
View File

@@ -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']));
}
}