From 613a8f0bd815955141803abed62c8f5bcbe7354a Mon Sep 17 00:00:00 2001
From: amirghasempoor <amirghasempoor79@gmail.com>
Date: Tue, 15 Apr 2025 16:08:16 +0330
Subject: [PATCH] refactor blade files

---
 app/Exports/V3/SafetyAndPrivacy/CountryActivityReport.php | 8 +++-----
 .../V3/SafetyAndPrivacy/ProvinceActivityReport.php        | 6 +++---
 .../SafetyAndPrivacy/CountryActivityReport.blade.php      | 5 -----
 .../SafetyAndPrivacy/ProvinceActivityReport.blade.php     | 7 +------
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/app/Exports/V3/SafetyAndPrivacy/CountryActivityReport.php b/app/Exports/V3/SafetyAndPrivacy/CountryActivityReport.php
index b6e6ccb2..68e1b99a 100644
--- a/app/Exports/V3/SafetyAndPrivacy/CountryActivityReport.php
+++ b/app/Exports/V3/SafetyAndPrivacy/CountryActivityReport.php
@@ -19,13 +19,13 @@ class CountryActivityReport implements FromView, WithEvents, ShouldAutoSize, Wit
     public function view(): View
     {
         $data = $this->data;
-        $existedProvinces = array_keys($data['activities']);
+        $existedProvinces = array_keys($data);
 
         foreach (\App\Models\Province::all() as $value) {
             $provinceId = $value->id;
 
             if (!array_key_exists($provinceId, $existedProvinces)) {
-                $data['activities'][] = (object) [
+                $data[] = (object) [
                     'province_id' => $provinceId,
                     'name_fa' => $value->name_fa,
                     'sum' => 0,
@@ -37,9 +37,7 @@ class CountryActivityReport implements FromView, WithEvents, ShouldAutoSize, Wit
         }
 
         return view('v3.Reports.SafetyAndPrivacy.CountryActivityReport', [
-            'data' => $data['activities'],
-            'fromDate' => $data['fromDate'],
-            'toDate' => $data['toDate'],
+            'data' => $data,
         ]);
     }
 
diff --git a/app/Exports/V3/SafetyAndPrivacy/ProvinceActivityReport.php b/app/Exports/V3/SafetyAndPrivacy/ProvinceActivityReport.php
index 399b5bca..8e839d90 100644
--- a/app/Exports/V3/SafetyAndPrivacy/ProvinceActivityReport.php
+++ b/app/Exports/V3/SafetyAndPrivacy/ProvinceActivityReport.php
@@ -21,14 +21,14 @@ class ProvinceActivityReport implements FromView, WithEvents, ShouldAutoSize, Wi
     public function view(): View
     {
         $data = $this->data;
-        $existedCities = array_keys($data['activities']);
+        $existedCities = array_keys($data);
         $edarat = EdarateShahri::query()->where('province_id', '=', $this->request->province_id)->get(['id', 'name_fa']);
 
         foreach ($edarat as $value) {
             $edareId = $value->id;
 
             if (!array_key_exists($edareId, $existedCities)) {
-                $data['activities'][] = (object) [
+                $data[] = (object) [
                     'edare_shahri_id' => $edareId,
                     'name_fa' => $value->name_fa,
                     'sum' => 0,
@@ -40,7 +40,7 @@ class ProvinceActivityReport implements FromView, WithEvents, ShouldAutoSize, Wi
         }
 
         return view('v3.Reports.SafetyAndPrivacy.ProvinceActivityReport', [
-            'data' => $data['activities'],
+            'data' => $data,
             'fromDate' => $data['fromDate'],
             'toDate' => $data['toDate'],
         ]);
diff --git a/resources/views/v3/Reports/SafetyAndPrivacy/CountryActivityReport.blade.php b/resources/views/v3/Reports/SafetyAndPrivacy/CountryActivityReport.blade.php
index f7c5bd53..72009c19 100644
--- a/resources/views/v3/Reports/SafetyAndPrivacy/CountryActivityReport.blade.php
+++ b/resources/views/v3/Reports/SafetyAndPrivacy/CountryActivityReport.blade.php
@@ -29,11 +29,6 @@
         <th colspan="11"
             style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
             گزارش نگهداری حریم راه از تاریخ
-            {{ verta($fromDate)->format('Y/n/j') }}
-            تا
-            تاریخ
-            {{ verta($toDate)->format('Y/n/j') }}
-
         </th>
     </tr>
 
diff --git a/resources/views/v3/Reports/SafetyAndPrivacy/ProvinceActivityReport.blade.php b/resources/views/v3/Reports/SafetyAndPrivacy/ProvinceActivityReport.blade.php
index 7e156b78..b5db906f 100644
--- a/resources/views/v3/Reports/SafetyAndPrivacy/ProvinceActivityReport.blade.php
+++ b/resources/views/v3/Reports/SafetyAndPrivacy/ProvinceActivityReport.blade.php
@@ -27,13 +27,8 @@
     </tr>
     <tr>
         <th colspan="11"
-            style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13;">
+            style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
             گزارش نگهداری حریم راه از تاریخ
-            {{ verta($fromDate)->format('Y/n/j') }}
-            تا
-            تاریخ
-            {{ verta($toDate)->format('Y/n/j') }}
-
         </th>
     </tr>