From 8ecaebf34453dd310eb777742492b042cd5eb753 Mon Sep 17 00:00:00 2001
From: amirghasempoor <amirghasempoor79@gmail.com>
Date: Sun, 26 Jan 2025 14:18:03 +0330
Subject: [PATCH] bugfix

---
 app/Exports/V3/RoadPatrols/CountryActivity.php           | 2 --
 app/Exports/V3/RoadPatrols/ProvinceActivity.php          | 2 --
 .../V3/Dashboard/Reports/RoadPatrolReportController.php  | 9 ++++-----
 app/Services/Reports/RoadPatrolReportService.php         | 6 ++----
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/app/Exports/V3/RoadPatrols/CountryActivity.php b/app/Exports/V3/RoadPatrols/CountryActivity.php
index 06ac17dd..29be9cff 100644
--- a/app/Exports/V3/RoadPatrols/CountryActivity.php
+++ b/app/Exports/V3/RoadPatrols/CountryActivity.php
@@ -2,9 +2,7 @@
 
 namespace App\Exports\V3\RoadPatrols;
 
-use App\Models\RoadPatrolProject;
 use Illuminate\Contracts\View\View;
-use Illuminate\Support\Facades\DB;
 use Maatwebsite\Excel\Concerns\FromView;
 use Maatwebsite\Excel\Concerns\ShouldAutoSize;
 use Maatwebsite\Excel\Concerns\WithDrawings;
diff --git a/app/Exports/V3/RoadPatrols/ProvinceActivity.php b/app/Exports/V3/RoadPatrols/ProvinceActivity.php
index 959f561a..99e41d3b 100644
--- a/app/Exports/V3/RoadPatrols/ProvinceActivity.php
+++ b/app/Exports/V3/RoadPatrols/ProvinceActivity.php
@@ -2,9 +2,7 @@
 
 namespace App\Exports\V3\RoadPatrols;
 
-use App\Models\RoadPatrolProject;
 use Illuminate\Contracts\View\View;
-use Illuminate\Support\Facades\DB;
 use Maatwebsite\Excel\Concerns\FromView;
 use Maatwebsite\Excel\Concerns\ShouldAutoSize;
 use Maatwebsite\Excel\Concerns\WithDrawings;
diff --git a/app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php b/app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php
index be44d94a..8df975dd 100644
--- a/app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php
+++ b/app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php
@@ -2,16 +2,15 @@
 
 namespace App\Http\Controllers\V3\Dashboard\Reports;
 
-use App\Exports\V2\RoadPatrol\RoadPatrolTable\AllSheets as RoadPatrolTable;
+use App\Exports\V3\RoadPatrols\CountryActivity;
+use App\Exports\V3\RoadPatrols\ProvinceActivity;
 use App\Http\Controllers\Controller;
 use App\Http\Traits\ApiResponse;
 use App\Models\EdarateShahri;
 use App\Models\Province;
-use App\Models\RoadPatrolProject;
 use App\Services\Reports\RoadPatrolReportService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
 use Maatwebsite\Excel\Facades\Excel;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 
@@ -56,7 +55,7 @@ class RoadPatrolReportController extends Controller
 
         $name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
 
-        return Excel::download(new RoadPatrolTable($activities), $name);
+        return Excel::download(new CountryActivity($activities), $name);
     }
 
     public function provinceActivityExcel(Request $request, RoadPatrolReportService $roadPatrolReportService): BinaryFileResponse
@@ -65,6 +64,6 @@ class RoadPatrolReportController extends Controller
 
         $name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
 
-        return Excel::download(new RoadPatrolTable($activities), $name);
+        return Excel::download(new ProvinceActivity($activities), $name);
     }
 }
diff --git a/app/Services/Reports/RoadPatrolReportService.php b/app/Services/Reports/RoadPatrolReportService.php
index bb22cd4d..309533b0 100644
--- a/app/Services/Reports/RoadPatrolReportService.php
+++ b/app/Services/Reports/RoadPatrolReportService.php
@@ -2,8 +2,6 @@
 
 namespace App\Services\Reports;
 
-use App\Models\InfoItem;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 
 class RoadPatrolReportService
@@ -29,7 +27,7 @@ class RoadPatrolReportService
             (SELECT COUNT(*)  FROM `observed_items` oi WHERE rp.`id`= oi.road_patrol_id AND priority = 3) AS tedad_mavarede_moshede_shode_ani,
             (SELECT COUNT(*) FROM `observed_items` oii WHERE rp.`id`= oii.road_patrol_id AND oii.road_item_id IS NOT NULL AND priority IS NOT NULL) AS tedad_mavarede_peygiri_shode,
             (SELECT COUNT(*) FROM `observed_items` oii WHERE rp.`id`= oii.road_patrol_id AND oii.road_item_id IS NOT NULL AND priority IS NULL) AS tedad_faliyat_sabt_shode
-            FROM `road_patrols` rp where rp.start_time BETWEEN "'.$fromDate.'" AND "'.$dateTo.'") temp
+            FROM `road_patrols` rp where rp.start_time BETWEEN "'.$fromDate.'" AND "'.$toDate.'") temp
             union
             SELECT
             province_fa,
@@ -50,7 +48,7 @@ class RoadPatrolReportService
             (SELECT COUNT(*)  FROM `observed_items` oi WHERE rp.`id`= oi.road_patrol_id AND priority = 3) AS tedad_mavarede_moshede_shode_ani,
             (SELECT COUNT(*) FROM `observed_items` oii WHERE rp.`id`= oii.road_patrol_id AND oii.road_item_id IS NOT NULL AND priority IS NOT NULL) AS tedad_mavarede_peygiri_shode,
             (SELECT COUNT(*) FROM `observed_items` oii WHERE rp.`id`= oii.road_patrol_id AND oii.road_item_id IS NOT NULL AND priority IS NULL) AS tedad_faliyat_sabt_shode
-            FROM `road_patrols` rp where rp.start_time BETWEEN "'.$fromDate.'" AND "'.$dateTo.'") temp 
+            FROM `road_patrols` rp where rp.start_time BETWEEN "'.$fromDate.'" AND "'.$toDate.'") temp 
             GROUP BY province_id'
         );