This commit is contained in:
2025-02-09 14:35:54 +03:30
parent c131e466da
commit baf4b0502c
4 changed files with 6 additions and 12 deletions

View File

@@ -21,10 +21,7 @@ class RoadPatrolReportController extends Controller
use ApiResponse;
public function countryPatrolActivity(Request $request, RoadPatrolReportService $roadPatrolReportService): JsonResponse
{
$fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString();
$toDate = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
$activities = $roadPatrolReportService->countryActivity($fromDate, $toDate);
$activities = $roadPatrolReportService->countryActivity($request);
$provinces = Province::all(['id', 'name_fa']);
@@ -37,13 +34,10 @@ class RoadPatrolReportController extends Controller
public function provincePatrolActivity(Request $request, RoadPatrolReportService $roadPatrolReportService): JsonResponse
{
$request->validate(["province_id" => "required",]);
$fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString();
$toDate = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
$provinceId = $request->province_id;
$activities = $roadPatrolReportService->provinceActivity($fromDate, $toDate, $provinceId);
$activities = $roadPatrolReportService->provinceActivity($request);
$edarateShahri = EdarateShahri::query()->where('province_id', '=', $provinceId)->get(['id', 'name_fa']);
$edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
return $this->successResponse([
'activities' => $activities['data'],