From ce3b7d5688ddf6078a671bd192bcde1232cbea4f Mon Sep 17 00:00:00 2001 From: amirghasempoor Date: Sun, 9 Feb 2025 10:49:12 +0330 Subject: [PATCH] refactor the blades --- app/Exports/V3/RoadPatrols/OperatorCartableReport.php | 3 ++- app/Exports/V3/RoadPatrols/SupervisorCartableReport.php | 3 ++- .../Controllers/V3/Dashboard/RoadPatrolProjectController.php | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Exports/V3/RoadPatrols/OperatorCartableReport.php b/app/Exports/V3/RoadPatrols/OperatorCartableReport.php index d1279f13..0a72ef63 100644 --- a/app/Exports/V3/RoadPatrols/OperatorCartableReport.php +++ b/app/Exports/V3/RoadPatrols/OperatorCartableReport.php @@ -3,6 +3,7 @@ namespace App\Exports\V3\RoadPatrols; use Illuminate\Contracts\View\View; +use Illuminate\Database\Eloquent\Collection; use Maatwebsite\Excel\Concerns\FromView; use Maatwebsite\Excel\Concerns\ShouldAutoSize; use Maatwebsite\Excel\Concerns\WithDrawings; @@ -14,7 +15,7 @@ use PhpOffice\PhpSpreadsheet\Worksheet\Drawing; class OperatorCartableReport implements FromView, WithEvents, ShouldAutoSize, WithDrawings { - public function __construct(private array $data){} + public function __construct(private Collection $data){} public function view(): View { diff --git a/app/Exports/V3/RoadPatrols/SupervisorCartableReport.php b/app/Exports/V3/RoadPatrols/SupervisorCartableReport.php index 12f05996..6373978e 100644 --- a/app/Exports/V3/RoadPatrols/SupervisorCartableReport.php +++ b/app/Exports/V3/RoadPatrols/SupervisorCartableReport.php @@ -3,6 +3,7 @@ namespace App\Exports\V3\RoadPatrols; use Illuminate\Contracts\View\View; +use Illuminate\Database\Eloquent\Collection; use Maatwebsite\Excel\Concerns\FromView; use Maatwebsite\Excel\Concerns\ShouldAutoSize; use Maatwebsite\Excel\Concerns\WithDrawings; @@ -14,7 +15,7 @@ use PhpOffice\PhpSpreadsheet\Worksheet\Drawing; class SupervisorCartableReport implements FromView, WithEvents, ShouldAutoSize, WithDrawings { - public function __construct(private array $data){} + public function __construct(private Collection $data){} public function view(): View { diff --git a/app/Http/Controllers/V3/Dashboard/RoadPatrolProjectController.php b/app/Http/Controllers/V3/Dashboard/RoadPatrolProjectController.php index 44d58245..ca3247ef 100644 --- a/app/Http/Controllers/V3/Dashboard/RoadPatrolProjectController.php +++ b/app/Http/Controllers/V3/Dashboard/RoadPatrolProjectController.php @@ -84,7 +84,7 @@ class RoadPatrolProjectController extends Controller { $name = 'گزارش از کارتابل ارزیابی گشت راهداری ' . verta()->now()->format('Y-m-d H:i') . '.xlsx'; $data = $roadPatrolReportService->supervisorCartableReport($request); - return Excel::download(new SupervisorCartableReport($data), $name); + return Excel::download(new SupervisorCartableReport($data['data']), $name); } public function operatorIndex(Request $request, RoadPatrolReportService $roadPatrolReportService): JsonResponse @@ -321,6 +321,6 @@ class RoadPatrolProjectController extends Controller { $name = 'گزارش از کارتابل عملیات گشت راهداری ' . verta()->now()->format('Y-m-d H:i') . '.xlsx'; $data = $roadPatrolReportService->operatorCartableReport($request); - return Excel::download(new OperatorCartableReport($data), $name); + return Excel::download(new OperatorCartableReport($data['data']), $name); } }