RMS/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor blade files

Browse Source
This commit is contained in:
amirghasempoor
2025-04-15 16:08:16 +03:30
parent ee933a3f91
commit 613a8f0bd8
4 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Exports/V3/SafetyAndPrivacy/CountryActivityReport.php
View File

@@ -19,13 +19,13 @@ class CountryActivityReport implements FromView, WithEvents, ShouldAutoSize, Wit
public function view(): View public function view(): View
{ {
$data = $this->data; $data = $this->data;
$existedProvinces = array_keys($data['activities']); $existedProvinces = array_keys($data);
foreach (\App\Models\Province::all() as $value) { foreach (\App\Models\Province::all() as $value) {
$provinceId = $value->id; $provinceId = $value->id;
if (!array_key_exists($provinceId, $existedProvinces)) { if (!array_key_exists($provinceId, $existedProvinces)) {
$data['activities'][] = (object) [ $data[] = (object) [
'province_id' => $provinceId, 'province_id' => $provinceId,
'name_fa' => $value->name_fa, 'name_fa' => $value->name_fa,
'sum' => 0, 'sum' => 0,
@@ -37,9 +37,7 @@ class CountryActivityReport implements FromView, WithEvents, ShouldAutoSize, Wit
} }
return view('v3.Reports.SafetyAndPrivacy.CountryActivityReport', [ return view('v3.Reports.SafetyAndPrivacy.CountryActivityReport', [
'data' => $data['activities'], 'data' => $data,
'fromDate' => $data['fromDate'],
'toDate' => $data['toDate'],
]); ]);
} }

6
app/Exports/V3/SafetyAndPrivacy/ProvinceActivityReport.php
View File

@@ -21,14 +21,14 @@ class ProvinceActivityReport implements FromView, WithEvents, ShouldAutoSize, Wi
public function view(): View public function view(): View
{ {
$data = $this->data; $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']); $edarat = EdarateShahri::query()->where('province_id', '=', $this->request->province_id)->get(['id', 'name_fa']);
foreach ($edarat as $value) { foreach ($edarat as $value) {
$edareId = $value->id; $edareId = $value->id;
if (!array_key_exists($edareId, $existedCities)) { if (!array_key_exists($edareId, $existedCities)) {
$data['activities'][] = (object) [ $data[] = (object) [
'edare_shahri_id' => $edareId, 'edare_shahri_id' => $edareId,
'name_fa' => $value->name_fa, 'name_fa' => $value->name_fa,
'sum' => 0, 'sum' => 0,
@@ -40,7 +40,7 @@ class ProvinceActivityReport implements FromView, WithEvents, ShouldAutoSize, Wi
} }
return view('v3.Reports.SafetyAndPrivacy.ProvinceActivityReport', [ return view('v3.Reports.SafetyAndPrivacy.ProvinceActivityReport', [
'data' => $data['activities'], 'data' => $data,
'fromDate' => $data['fromDate'], 'fromDate' => $data['fromDate'],
'toDate' => $data['toDate'], 'toDate' => $data['toDate'],
]); ]);

5
resources/views/v3/Reports/SafetyAndPrivacy/CountryActivityReport.blade.php
View File

@@ -29,11 +29,6 @@
<th colspan="11" <th colspan="11"
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;"> 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> </th>
</tr> </tr>

7
resources/views/v3/Reports/SafetyAndPrivacy/ProvinceActivityReport.blade.php
View File

@@ -27,13 +27,8 @@
</tr> </tr>
<tr> <tr>
<th colspan="11" <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> </th>
</tr> </tr>