From c131e466da27ca58e92b69863b68348f7c30d0c4 Mon Sep 17 00:00:00 2001
From: amirghasempoor <amirghasempoor79@gmail.com>
Date: Sun, 9 Feb 2025 14:23:36 +0330
Subject: [PATCH] resolve the date debug

---
 app/Exports/V3/RoadPatrols/CountryActivity.php        |  2 +-
 .../Dashboard/Reports/RoadPatrolReportController.php  |  4 ++--
 app/Services/Reports/RoadPatrolReportService.php      | 11 +++++++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/Exports/V3/RoadPatrols/CountryActivity.php b/app/Exports/V3/RoadPatrols/CountryActivity.php
index 29be9cff..48c0c1e4 100644
--- a/app/Exports/V3/RoadPatrols/CountryActivity.php
+++ b/app/Exports/V3/RoadPatrols/CountryActivity.php
@@ -21,7 +21,7 @@ class CountryActivity implements FromView, WithEvents, ShouldAutoSize, WithDrawi
         $activities = $this->activities;
 
         return view('v3.Reports.RoadPatrols.CountryActivity', [
-            '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 4c28c442..d0a28030 100644
--- a/app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php
+++ b/app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php
@@ -53,7 +53,7 @@ class RoadPatrolReportController extends Controller
 
     public function countryActivityExcel(Request $request, RoadPatrolReportService $roadPatrolReportService): BinaryFileResponse
     {
-        $activities = $roadPatrolReportService->countryActivity($request->from_date, $request->date_to);
+        $activities = $roadPatrolReportService->countryActivity($request);
 
         $name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
 
@@ -62,7 +62,7 @@ class RoadPatrolReportController extends Controller
 
     public function provinceActivityExcel(Request $request, RoadPatrolReportService $roadPatrolReportService): BinaryFileResponse
     {
-        $activities = $roadPatrolReportService->provinceActivity($request->from_date, $request->date_to, $request->province_id);
+        $activities = $roadPatrolReportService->provinceActivity($request);
 
         $name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
 
diff --git a/app/Services/Reports/RoadPatrolReportService.php b/app/Services/Reports/RoadPatrolReportService.php
index c7051116..38559505 100644
--- a/app/Services/Reports/RoadPatrolReportService.php
+++ b/app/Services/Reports/RoadPatrolReportService.php
@@ -71,8 +71,11 @@ class RoadPatrolReportService
         return $data;
     }
 
-    public function countryActivity(string $fromDate, string $toDate): array
+    public function countryActivity(Request $request): array
     {
+        $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 = DB::select('SELECT
             "کشوری" as province_fa,
             -1 as province_id,
@@ -124,8 +127,12 @@ class RoadPatrolReportService
         ];
     }
 
-    public function provinceActivity(string $fromDate, string $toDate, int $provinceId): array
+    public function provinceActivity(Request $request): array
     {
+        $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 = DB::select(
             'SELECT
             province_fa,