improve code in controller and form request for V3 whit pint package
This commit is contained in:
@@ -8,7 +8,6 @@ use App\Exports\V3\RoadObservation\ProvinceCartableReport;
|
||||
use App\Facades\DataTable\DataTableFacade;
|
||||
use App\Http\Traits\ApiResponse;
|
||||
use App\Models\EdarateShahri;
|
||||
use App\Models\Province;
|
||||
use App\Models\RoadObserved;
|
||||
use App\Services\Cartables\RoadObservation\ReportService;
|
||||
use App\Services\Cartables\SafetyAndPrivacy\OperatorService;
|
||||
@@ -24,13 +23,15 @@ class ReportController
|
||||
public function index(Request $request, ReportService $reportService): JsonResponse
|
||||
{
|
||||
$data = $reportService->index($request);
|
||||
|
||||
return response()->json($data['data']);
|
||||
}
|
||||
|
||||
public function excel(Request $request, ReportService $reportService): BinaryFileResponse
|
||||
{
|
||||
$name = 'گزارش رسیدگی به شکایات واکنش سریع ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
|
||||
$name = 'گزارش رسیدگی به شکایات واکنش سریع '.verta()->now()->format('Y-m-d H:i').'.xlsx';
|
||||
$data = $reportService->index($request);
|
||||
|
||||
return Excel::download(new ReportComplaintsExport($data), $name);
|
||||
}
|
||||
|
||||
@@ -48,6 +49,7 @@ class ReportController
|
||||
public function countryActivity(Request $request, ReportService $reportService): JsonResponse
|
||||
{
|
||||
$data = $reportService->countryActivity($request);
|
||||
|
||||
return $this->successResponse($data);
|
||||
}
|
||||
|
||||
@@ -59,22 +61,26 @@ class ReportController
|
||||
|
||||
return $this->successResponse([
|
||||
'activities' => $data,
|
||||
'edarateShahri' => EdarateShahri::where('province_id', $request->province_id)->get(['id', 'name_fa']),
|
||||
'edarateShahri' => EdarateShahri::query()->where('province_id', $request->province_id)->get(['id', 'name_fa']),
|
||||
]);
|
||||
}
|
||||
public function countryActivityExcel(Request $request, OperatorService $operatorService): BinaryFileResponse
|
||||
|
||||
public function countryActivityExcel(Request $request, ReportService $reportService): BinaryFileResponse
|
||||
{
|
||||
$data = $operatorService->countryActivity($request);
|
||||
$name = 'گزارش رسیدگی به شکایات واکنش سریع' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
|
||||
$data = $reportService->countryActivity($request);
|
||||
$name = 'گزارش رسیدگی به شکایات واکنش سریع'.verta()->now()->format('Y-m-d H-i').'.xlsx';
|
||||
|
||||
return Excel::download(new CountryCartableReport($data), $name);
|
||||
}
|
||||
|
||||
public function provinceActivityExcel(Request $request, OperatorService $operatorService): BinaryFileResponse
|
||||
public function provinceActivityExcel(Request $request, ReportService $reportService): BinaryFileResponse
|
||||
{
|
||||
$data = $operatorService->provinceActivity(
|
||||
$data = $reportService->provinceActivity(
|
||||
province_id: $request->input('province_id')
|
||||
);
|
||||
$name = 'گزارش رسیدگی به شکایات واکنش سریع' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
|
||||
return Excel::download(new ProvinceCartableReport($data, $request), $name);
|
||||
|
||||
$name = 'گزارش رسیدگی به شکایات واکنش سریع'.verta()->now()->format('Y-m-d H-i').'.xlsx';
|
||||
|
||||
return Excel::download(new ProvinceCartableReport($data), $name);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user