diff --git a/app/Exports/V3/RoadPatrols/CountryActivity.php b/app/Exports/V3/RoadPatrols/CountryActivity.php index 48c0c1e4..dd328cc1 100644 --- a/app/Exports/V3/RoadPatrols/CountryActivity.php +++ b/app/Exports/V3/RoadPatrols/CountryActivity.php @@ -21,9 +21,10 @@ class CountryActivity implements FromView, WithEvents, ShouldAutoSize, WithDrawi $activities = $this->activities; return view('v3.Reports.RoadPatrols.CountryActivity', [ - 'activities' => $activities["data"], - 'fromDate' => $activities["fromDate"], - 'toDate' => $activities["toDate"] + 'activities' => $activities["activities"]['data'], + 'provinces' => $activities["provinces"], + 'fromDate' => $activities["activities"]["fromDate"], + 'toDate' => $activities["activities"]["toDate"] ]); } diff --git a/app/Exports/V3/RoadPatrols/ProvinceActivity.php b/app/Exports/V3/RoadPatrols/ProvinceActivity.php index 5fcc3196..4118fd19 100644 --- a/app/Exports/V3/RoadPatrols/ProvinceActivity.php +++ b/app/Exports/V3/RoadPatrols/ProvinceActivity.php @@ -21,9 +21,10 @@ class ProvinceActivity implements FromView, WithEvents, ShouldAutoSize, WithDraw $activities = $this->activities; return view('v3.Reports.RoadPatrols.ProvinceActivity', [ - 'activities' => $activities["data"], - 'fromDate' => $activities["fromDate"], - 'toDate' => $activities["toDate"] + 'activities' => $activities["activities"]['data'], + 'edarateShahri' => $activities["edarateShahri"], + 'fromDate' => $activities["activities"]["fromDate"], + 'toDate' => $activities["activities"]["toDate"] ]); } diff --git a/app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php b/app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php index ab3d13dd..9f485e05 100644 --- a/app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php +++ b/app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php @@ -48,19 +48,27 @@ class RoadPatrolReportController extends Controller public function countryActivityExcel(Request $request, RoadPatrolReportService $roadPatrolReportService): BinaryFileResponse { $activities = $roadPatrolReportService->countryActivity($request); + $provinces = Province::all(['id', 'name_fa']); $name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx'; - return Excel::download(new CountryActivity($activities), $name); + return Excel::download(new CountryActivity([ + 'activities' => $activities, + 'provinces' => $provinces, + ]), $name); } public function provinceActivityExcel(Request $request, RoadPatrolReportService $roadPatrolReportService): BinaryFileResponse { $activities = $roadPatrolReportService->provinceActivity($request); + $edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']); $name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx'; - return Excel::download(new ProvinceActivity($activities), $name); + return Excel::download(new ProvinceActivity([ + 'activities' => $activities, + 'edarateShahri' => $edarateShahri, + ]), $name); } public function activitiesOnMap(Request $request): JsonResponse diff --git a/resources/views/v3/Reports/RoadPatrols/CountryActivity.blade.php b/resources/views/v3/Reports/RoadPatrols/CountryActivity.blade.php index 6efeed9b..292615ea 100644 --- a/resources/views/v3/Reports/RoadPatrols/CountryActivity.blade.php +++ b/resources/views/v3/Reports/RoadPatrols/CountryActivity.blade.php @@ -80,17 +80,44 @@
- @foreach ($activities as $activity) + @php + // محاسبه مجموع مقدار s برای کل کشور + $totalForCountry = collect($activities)->where('province_id', -1)->get(); + @endphp + + {{-- ردیف کل کشور --}}