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

change patrol blade

Browse Source
This commit is contained in:
amirghasempoor
2025-02-09 15:21:14 +03:30
parent baf4b0502c
commit 382299dac5
4 changed files with 54 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Exports/V3/RoadPatrols/CountryActivity.php
View File

@@ -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"]
]);
}

7
app/Exports/V3/RoadPatrols/ProvinceActivity.php
View File

@@ -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"]
]);
}

12
app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php
View File

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