diff --git a/app/Exports/V3/RoadItemsProjects/ProvinceActivityPerItemReport.php b/app/Exports/V3/RoadItemsProjects/ProvinceActivityPerItemReport.php index bd924403..5afd7875 100644 --- a/app/Exports/V3/RoadItemsProjects/ProvinceActivityPerItemReport.php +++ b/app/Exports/V3/RoadItemsProjects/ProvinceActivityPerItemReport.php @@ -48,7 +48,7 @@ class ProvinceActivityPerItemReport implements FromView, WithEvents, ShouldAutoS province_id, edarat_name, edarat_id, - COUNT(CASE WHEN item != -1 THEN 1 END) AS TotalCount + COUNT(CASE WHEN item != -1 THEN 1 END) AS TotalCityCount FROM ( SELECT province_fa, @@ -64,10 +64,31 @@ class ProvinceActivityPerItemReport implements FromView, WithEvents, ShouldAutoS AND province_id = {$this->provinceId} GROUP BY edarat_id, edarat_name, order by province_id ASC;"; - $provinceActivities = DB::select($query); + $cityActivities = collect(DB::select($query)); - return view('', [ - 'activities' => $provinceActivities, + $totalItemCount = [ + 'totalMarematRooyeCount' => $cityActivities->sum('MarematRooyeCount'), + 'totalPaksaziCount' => $cityActivities->sum('PaksaziCount'), + 'totalAlaemCount' => $cityActivities->sum('AlaemCount'), + 'totalHefazCount' => $cityActivities->sum('HefazCount'), + 'totalRoshanayiCount' => $cityActivities->sum('RoshanayiCount'), + 'totalKhatkeshiCount' => $cityActivities->sum('KhatkeshiCount'), + 'totalRangamiziCount' => $cityActivities->sum('RangamiziCount'), + 'totalWashingCount' => $cityActivities->sum('WashingCount'), + 'totalImenSaziCount' => $cityActivities->sum('ImenSaziCount'), + 'totalHarimCount' => $cityActivities->sum('HarimCount'), + 'totalPolCount' => $cityActivities->sum('PolCount'), + 'totalToonelCount' => $cityActivities->sum('ToonelCount'), + 'totalAmaliatZemestaniCount' => $cityActivities->sum('AmaliatZemestaniCount'), + 'totalMashinAlatCount' => $cityActivities->sum('MashinAlatCount'), + 'totalTollhouseCount' => $cityActivities->sum('TollhouseCount'), + 'totalEmergencyCount' => $cityActivities->sum('EmergencyCount'), + 'TotalProvinceCount' => $cityActivities->sum('TotalCityCount'), + ]; + + return view('v3.Reports.RoadItems.ProvinceActivityPerItem', [ + 'cityCount' => $cityActivities, + 'provinceCount' => $totalItemCount, 'fromDate' => $fromDate, 'toDate' => $toDate ]); diff --git a/resources/views/v3/Reports/RoadItems/CountryActivityPerItem.blade.php b/resources/views/v3/Reports/RoadItems/CountryActivityPerItem.blade.php index 17c4040e..1fb13aec 100644 --- a/resources/views/v3/Reports/RoadItems/CountryActivityPerItem.blade.php +++ b/resources/views/v3/Reports/RoadItems/CountryActivityPerItem.blade.php @@ -69,24 +69,24 @@ @foreach ($provinceCount as $activity) - {{ $activity['province_fa'] }} - {{ $activity['MarematRooyeCount'] }} - {{ $activity['PaksaziCount'] }} - {{ $activity['AlaemCount'] }} - {{ $activity['HefazCount'] }} - {{ $activity['RoshanayiCount'] }} - {{ $activity['KhatkeshiCount'] }} - {{ $activity['RangamiziCount'] }} - {{ $activity['WashingCount'] }} - {{ $activity['ImenSaziCount'] }} - {{ $activity['HarimCount'] }} - {{ $activity['PolCount'] }} - {{ $activity['ToonelCount'] }} - {{ $activity['AmaliatZemestaniCount'] }} - {{ $activity['MashinAlatCount'] }} - {{ $activity['TollhouseCount'] }} - {{ $activity['EmergencyCount'] }} - {{ $activity['TotalProvinceCount'] }} + {{ $activity->province_fa }} + {{ $activity->MarematRooyeCount }} + {{ $activity->PaksaziCount }} + {{ $activity->AlaemCount }} + {{ $activity->HefazCount }} + {{ $activity->RoshanayiCount }} + {{ $activity->KhatkeshiCount }} + {{ $activity->RangamiziCount }} + {{ $activity->WashingCount }} + {{ $activity->ImenSaziCount }} + {{ $activity->HarimCount }} + {{ $activity->PolCount }} + {{ $activity->ToonelCount }} + {{ $activity->AmaliatZemestaniCount }} + {{ $activity->MashinAlatCount }} + {{ $activity->TollhouseCount }} + {{ $activity->EmergencyCount }} + {{ $activity->TotalProvinceCount }} @endforeach diff --git a/resources/views/v3/Reports/RoadItems/ProvinceActivityPerItem.blade.php b/resources/views/v3/Reports/RoadItems/ProvinceActivityPerItem.blade.php new file mode 100644 index 00000000..abacb6e1 --- /dev/null +++ b/resources/views/v3/Reports/RoadItems/ProvinceActivityPerItem.blade.php @@ -0,0 +1,119 @@ + + + + + + + + استانی + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @foreach ($cityCount as $activity) + + + + + + + + + + + + + + + + + + + + + @endforeach + + + + + + + + + + + + + + + + + + + + + + + +
+ تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }} +
+
+ گزارش فعالیت روزانه و جاری راهداری از تاریخ + {{ verta($fromDate)->format('Y/n/j') }} + تا + تاریخ + {{ verta($toDate)->format('Y/n/j') }} + +
اداره کل + فعالیت های + جاری و روزانه راهداری + کل
مرمت رویهپاکسازیعلائمحفاظروشناییخط کشیرنگ آمیزیشستشوایمن سازیحریمپلتونل و گالریعملیات زمستانیماشین آلاتراهدارخانهموارد اضطراری
{{ $activity->province_fa }}{{ $activity->MarematRooyeCount }}{{ $activity->PaksaziCount }}{{ $activity->AlaemCount }}{{ $activity->HefazCount }}{{ $activity->RoshanayiCount }}{{ $activity->KhatkeshiCount }}{{ $activity->RangamiziCount }}{{ $activity->WashingCount }}{{ $activity->ImenSaziCount }}{{ $activity->HarimCount }}{{ $activity->PolCount }}{{ $activity->ToonelCount }}{{ $activity->AmaliatZemestaniCount }}{{ $activity->MashinAlatCount }}{{ $activity->TollhouseCount }}{{ $activity->EmergencyCount }}{{ $activity->TotalCityCount }}
کشوری{{ $provinceCount['totalMarematRooyeCount'] }}{{ $provinceCount['totalPaksaziCount'] }}{{ $provinceCount['totalAlaemCount'] }}{{ $provinceCount['totalHefazCount'] }}{{ $provinceCount['totalRoshanayiCount'] }}{{ $provinceCount['totalKhatkeshiCount'] }}{{ $provinceCount['totalRangamiziCount'] }}{{ $provinceCount['totalWashingCount'] }}{{ $provinceCount['totalImenSaziCount'] }}{{ $provinceCount['totalHarimCount'] }}{{ $provinceCount['totalPolCount'] }}{{ $provinceCount['totalToonelCount'] }}{{ $provinceCount['totalAmaliatZemestaniCount'] }}{{ $provinceCount['totalMashinAlatCount'] }}{{ $provinceCount['totalTollhouseCount'] }}{{ $provinceCount['totalEmergencyCount'] }}{{ $provinceCount['TotalProvinceCount'] }}
+ + + +