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 @@