diff --git a/app/Exports/V3/RoadPatrols/ProvinceActivity.php b/app/Exports/V3/RoadPatrols/ProvinceActivity.php index 1d7d0d8d..5fcc3196 100644 --- a/app/Exports/V3/RoadPatrols/ProvinceActivity.php +++ b/app/Exports/V3/RoadPatrols/ProvinceActivity.php @@ -21,7 +21,7 @@ class ProvinceActivity implements FromView, WithEvents, ShouldAutoSize, WithDraw $activities = $this->activities; return view('v3.Reports.RoadPatrols.ProvinceActivity', [ - 'activities' => $activities["activities"], + 'activities' => $activities["data"], 'fromDate' => $activities["fromDate"], 'toDate' => $activities["toDate"] ]); diff --git a/app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php b/app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php index d0a28030..ab3d13dd 100644 --- a/app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php +++ b/app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php @@ -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'], diff --git a/resources/views/v3/Reports/RoadPatrols/CountryActivity.blade.php b/resources/views/v3/Reports/RoadPatrols/CountryActivity.blade.php index 0e94bde7..6efeed9b 100644 --- a/resources/views/v3/Reports/RoadPatrols/CountryActivity.blade.php +++ b/resources/views/v3/Reports/RoadPatrols/CountryActivity.blade.php @@ -27,7 +27,7 @@ + style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;"> گزارش گشت راهداری و ترابری از تاریخ {{ verta($fromDate)->format('Y/n/j') }} تا diff --git a/resources/views/v3/Reports/RoadPatrols/ProvinceActivity.blade.php b/resources/views/v3/Reports/RoadPatrols/ProvinceActivity.blade.php index 602352e5..fe995428 100644 --- a/resources/views/v3/Reports/RoadPatrols/ProvinceActivity.blade.php +++ b/resources/views/v3/Reports/RoadPatrols/ProvinceActivity.blade.php @@ -27,7 +27,7 @@ + style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;"> گزارش گشت راهداری و ترابری از تاریخ {{ verta($fromDate)->format('Y/n/j') }} تا