From 3158ac3102031e0123b3bda2f1aa0e37a1fe5a63 Mon Sep 17 00:00:00 2001
From: amirghasempoor <amirghasempoor79@gmail.com>
Date: Sun, 26 Jan 2025 11:14:30 +0330
Subject: [PATCH] debug city export

---
 .../ProvinceActivityPerSubItemReport.php              | 11 ++++++-----
 app/Services/Reports/RoadItemReportService.php        |  8 ++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/Exports/V3/RoadItemsProjects/ProvinceActivityPerSubItemReport.php b/app/Exports/V3/RoadItemsProjects/ProvinceActivityPerSubItemReport.php
index 6b8be60d..2d8aad5a 100644
--- a/app/Exports/V3/RoadItemsProjects/ProvinceActivityPerSubItemReport.php
+++ b/app/Exports/V3/RoadItemsProjects/ProvinceActivityPerSubItemReport.php
@@ -18,16 +18,17 @@ use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
 
 class ProvinceActivityPerSubItemReport implements FromView, WithEvents, ShouldAutoSize, WithDrawings
 {
-    public function __construct(private Collection $activities){}
+    public function __construct(private array $activities){}
 
     public function view(): View
     {
         $activities = $this->activities;
 
-        return view('', [
-            'activities' => $activities->data,
-            'fromDate' => $activities->fromDate,
-            'toDate' => $activities->toDate
+        return view('v3.Reports.RoadItems.ProvinceActivityPerSubItem', [
+            'activities' => $activities["data"],
+            'fromDate' => $activities["fromDate"],
+            'toDate' => $activities["toDate"],
+            'details' => $activities["details"]
         ]);
     }
 
diff --git a/app/Services/Reports/RoadItemReportService.php b/app/Services/Reports/RoadItemReportService.php
index c487d526..240d6bb4 100644
--- a/app/Services/Reports/RoadItemReportService.php
+++ b/app/Services/Reports/RoadItemReportService.php
@@ -49,14 +49,14 @@ class RoadItemReportService
         ];
     }
 
-    public function provinceActivityPerSubItem(int $item, string $fromDate, string $toDate, int $provinceId): Collection
+    public function provinceActivityPerSubItem(int $item, string $fromDate, string $toDate, int $provinceId): array
     {
         $subItems = InfoItem::query()->where('item', $item)
             ->orderBy('sub_item')
             ->get(['sub_item', 'sub_item_str', 'sub_item_unit']);
 
         $query = DB::table('road_items_projects')
-            ->selectRaw('province_id, province_fa, user_name as city_fa, city_id');
+            ->selectRaw('province_id, province_fa, TRIM(SUBSTRING_INDEX(user_name, "استان", 1)) as city_fa, city_id');
 
         foreach ($subItems as $subItem) {
             $query->selectRaw("
@@ -83,11 +83,11 @@ class RoadItemReportService
             $totalItemCount["Sum_{$subItem->sub_item}"] = $activities->sum("Sum_{$subItem->sub_item}");
         }
 
-        return collect([
+        return [
             'data' => $activities->push((object)$totalItemCount),
             'fromDate' => $fromDate,
             'toDate' => $toDate,
             'details' => $subItems->keyBy('sub_item')
-        ]);
+        ];
     }
 }
\ No newline at end of file