improve code in controller and form request for V3 whit pint package
This commit is contained in:
@@ -36,8 +36,9 @@ class OperatorController
|
||||
|
||||
public function cartableReport(Request $request, OperatorService $operatorService): BinaryFileResponse
|
||||
{
|
||||
$name = 'گزارش از کارتابل عملیات واکنش سریع ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
|
||||
$name = 'گزارش از کارتابل عملیات واکنش سریع '.verta()->now()->format('Y-m-d H:i').'.xlsx';
|
||||
$data = $operatorService->cartableIndex($request);
|
||||
|
||||
return Excel::download(new OperatorCartableReport($data['data']), $name);
|
||||
}
|
||||
|
||||
@@ -54,8 +55,9 @@ class OperatorController
|
||||
*/
|
||||
public function complaintsReport(Request $request, OperatorService $operatorService): BinaryFileResponse
|
||||
{
|
||||
$name = 'گزارش از رسیدگی به شکایات واکنش سریع ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
|
||||
$name = 'گزارش از رسیدگی به شکایات واکنش سریع '.verta()->now()->format('Y-m-d H:i').'.xlsx';
|
||||
$data = $operatorService->complaintsIndex($request);
|
||||
|
||||
return Excel::download(new ComplaintsReport($data['data']), $name);
|
||||
}
|
||||
|
||||
@@ -79,7 +81,7 @@ class OperatorController
|
||||
'previous_rms_start_latlng' => $roadObserved->rms_start_latlng,
|
||||
'previous_rms_end_latlng' => $roadObserved->rms_end_latlng,
|
||||
'previous_rms_description' => $roadObserved->rms_description,
|
||||
'new_files' => json_encode([])
|
||||
'new_files' => json_encode([]),
|
||||
];
|
||||
|
||||
$files_path = [];
|
||||
@@ -132,7 +134,7 @@ class OperatorController
|
||||
'previous_rms_start_latlng' => $roadObserved->rms_start_latlng,
|
||||
'previous_rms_end_latlng' => $roadObserved->rms_end_latlng,
|
||||
'previous_rms_description' => $roadObserved->rms_description,
|
||||
'new_files' => json_encode([])
|
||||
'new_files' => json_encode([]),
|
||||
];
|
||||
|
||||
if ($request->rms_status == 1) {
|
||||
@@ -195,7 +197,7 @@ class OperatorController
|
||||
'from_edareh' => $roadObserved->edarate_shahri_id,
|
||||
'to_edareh' => $request->edarate_shahri_id,
|
||||
'from_province' => $roadObserved->province_id,
|
||||
'to_province' => $province->id
|
||||
'to_province' => $province->id,
|
||||
]);
|
||||
|
||||
$roadObserved->update([
|
||||
@@ -218,7 +220,7 @@ class OperatorController
|
||||
->orderBy('created_at', 'desc')
|
||||
->get([
|
||||
'created_at', 'description', 'from_edareh', 'to_edareh',
|
||||
'from_province', 'to_province', 'user_id'
|
||||
'from_province', 'to_province', 'user_id',
|
||||
]);
|
||||
|
||||
foreach ($data as $key => $value) {
|
||||
@@ -227,8 +229,9 @@ class OperatorController
|
||||
$data[$key]->from_province = Province::query()->find($value->from_province)->name_fa ?? null;
|
||||
$data[$key]->to_province = Province::query()->find($value->to_province)->name_fa ?? null;
|
||||
$user = User::query()->find($value->user_id);
|
||||
$data[$key]->user = $user->first_name . ' ' . $user->last_name;
|
||||
$data[$key]->user = $user->first_name.' '.$user->last_name;
|
||||
}
|
||||
|
||||
return $this->successResponse($data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user