From 8099c2874c5dc6cedafea19c82c5713bda929316 Mon Sep 17 00:00:00 2001 From: amirghasempoor Date: Sun, 9 Feb 2025 15:56:31 +0330 Subject: [PATCH] create blade files --- .../RoadPatrols/CountryActivity.blade.php | 62 ++++++++++--------- .../RoadPatrols/ProvinceActivity.blade.php | 55 ++++++++++++---- 2 files changed, 76 insertions(+), 41 deletions(-) diff --git a/resources/views/v3/Reports/RoadPatrols/CountryActivity.blade.php b/resources/views/v3/Reports/RoadPatrols/CountryActivity.blade.php index 292615ea..bba1555a 100644 --- a/resources/views/v3/Reports/RoadPatrols/CountryActivity.blade.php +++ b/resources/views/v3/Reports/RoadPatrols/CountryActivity.blade.php @@ -82,48 +82,50 @@ @php // محاسبه مجموع مقدار s برای کل کشور - $totalForCountry = collect($activities)->where('province_id', -1)->get(); + $totalForCountry = collect($activities)->where('province_id', -1)->first(); @endphp {{-- ردیف کل کشور --}} کل کشور - {{ $totalForCountry }} - @foreach($items as $item) - {{ $itemTotalsForCountry[$item['item']] ?? '-' }} - @endforeach + {{ $totalForCountry->tedade }} + {{ $totalForCountry->tedad_mavarede_moshede_shode_adi }} + {{ $totalForCountry->tedad_mavarede_moshede_shode_fori }} + {{ $totalForCountry->tedad_mavarede_moshede_shode_ani }} + {{ $totalForCountry->tedad_mavarede_peygiri_shode }} + {{ $totalForCountry->masafat_tey_shode }} + {{ $totalForCountry->tedad_faliyat_sabt_shode }} + @foreach ($provinces as $province) - @foreach($activities as $activity) - @if($province->name_fa == $activity->province_fa) + @php + $totalForProvince = collect($activities)->where('province_id', $province->id)->first(); + @endphp + @if($totalForProvince) - {{ $activity->province_fa }} - {{ $activity->tedade }} - {{ $activity->tedad_mavarede_moshede_shode_adi }} - {{ $activity->tedad_mavarede_moshede_shode_fori }} - {{ $activity->tedad_mavarede_moshede_shode_ani }} - {{ $activity->tedad_mavarede_peygiri_shode }} - {{ $activity->masafat_tey_shode }} - {{ $activity->tedad_faliyat_sabt_shode }} + {{ $totalForProvince->province_fa }} + {{ $totalForProvince->tedade }} + {{ $totalForProvince->tedad_mavarede_moshede_shode_adi }} + {{ $totalForProvince->tedad_mavarede_moshede_shode_fori }} + {{ $totalForProvince->tedad_mavarede_moshede_shode_ani }} + {{ $totalForProvince->tedad_mavarede_peygiri_shode }} + {{ $totalForProvince->masafat_tey_shode }} + {{ $totalForProvince->tedad_faliyat_sabt_shode }} + + @else + + {{ $province->name_fa }} + 0 + 0 + 0 + 0 + 0 + 0 + 0 @endif - - {{ $province->name_fa }} - - - - - - - - - - - - - - - - @endforeach @endforeach - - - - diff --git a/resources/views/v3/Reports/RoadPatrols/ProvinceActivity.blade.php b/resources/views/v3/Reports/RoadPatrols/ProvinceActivity.blade.php index fe995428..5ab14deb 100644 --- a/resources/views/v3/Reports/RoadPatrols/ProvinceActivity.blade.php +++ b/resources/views/v3/Reports/RoadPatrols/ProvinceActivity.blade.php @@ -80,17 +80,50 @@ - @foreach ($activities as $activity) - - {{ $activity->edare_name }} - {{ $activity->tedade }} - {{ $activity->tedad_mavarede_moshede_shode_adi }} - {{ $activity->tedad_mavarede_moshede_shode_fori }} - {{ $activity->tedad_mavarede_moshede_shode_ani }} - {{ $activity->tedad_mavarede_peygiri_shode }} - {{ $activity->masafat_tey_shode }} - {{ $activity->tedad_faliyat_sabt_shode }} - + @php + // محاسبه مجموع مقدار s برای کل کشور + $totalForProvince = collect($activities)->where('edare_id', -1)->first(); + @endphp + + {{-- ردیف کل کشور --}} + + کل استان + {{ $totalForProvince->tedade ?? 0 }} + {{ $totalForProvince->tedad_mavarede_moshede_shode_adi ?? 0 }} + {{ $totalForProvince->tedad_mavarede_moshede_shode_fori ?? 0 }} + {{ $totalForProvince->tedad_mavarede_moshede_shode_ani ?? 0 }} + {{ $totalForProvince->tedad_mavarede_peygiri_shode ?? 0 }} + {{ $totalForProvince->masafat_tey_shode ?? 0 }} + {{ $totalForProvince->tedad_faliyat_sabt_shode ?? 0 }} + + + @foreach ($edarateShahri as $edareShahri) + @php + $totalForEdare = collect($activities)->where('edare_id', $edareShahri->id)->first(); + @endphp + @if($totalForEdare) + + {{ $totalForEdare->edare_name }} + {{ $totalForEdare->tedade }} + {{ $totalForEdare->tedad_mavarede_moshede_shode_adi }} + {{ $totalForEdare->tedad_mavarede_moshede_shode_fori }} + {{ $totalForEdare->tedad_mavarede_moshede_shode_ani }} + {{ $totalForEdare->tedad_mavarede_peygiri_shode }} + {{ $totalForEdare->masafat_tey_shode }} + {{ $totalForEdare->tedad_faliyat_sabt_shode }} + + @else + + {{ $edareShahri->name_fa }} + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + @endif @endforeach