modify the blades
This commit is contained in:
@@ -7,6 +7,7 @@ use App\Exports\V3\RoadObservation\SupervisorCartableReport;
|
||||
use App\Facades\File\FileFacade;
|
||||
use App\Facades\Sms\Sms;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\V3\RoadObservation\ModifyRegisterationRequest;
|
||||
use App\Http\Requests\V3\RoadObservation\ReferRequest;
|
||||
use App\Http\Requests\V3\RoadObservation\RegisterRequest;
|
||||
use App\Http\Requests\V3\RoadObservation\RestoreRequest;
|
||||
@@ -64,19 +65,11 @@ class RoadObservationController extends Controller
|
||||
|
||||
public function operatorIndex(Request $request, RoadObservationTableService $roadObservationTableService): JsonResponse
|
||||
{
|
||||
if (is_null(auth()->user()->edarate_shahri_id)) {
|
||||
return $this->errorResponse('ادارهای برای شما در سامانه ثبت نشده است!');
|
||||
}
|
||||
|
||||
return response()->json($roadObservationTableService->operatorCartableIndex($request));
|
||||
}
|
||||
|
||||
public function operatorCartableReport(Request $request, RoadObservationTableService $roadObservationTableService): BinaryFileResponse
|
||||
{
|
||||
if (is_null(auth()->user()->edarate_shahri_id)) {
|
||||
return $this->errorResponse('ادارهای برای شما در سامانه ثبت نشده است!');
|
||||
}
|
||||
|
||||
$name = 'گزارش از کارتابل عملیات واکنش سریع ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
|
||||
$data = $roadObservationTableService->operatorCartableIndex($request);
|
||||
return Excel::download(new OperatorCartableReport($data['data']), $name);
|
||||
@@ -117,6 +110,67 @@ class RoadObservationController extends Controller
|
||||
'new_files' => json_encode([])
|
||||
];
|
||||
|
||||
if ($request->rms_status == 1) {
|
||||
|
||||
$files_path = [];
|
||||
|
||||
$roadObserved->files()->where('path', 'like', '%_image_before%')->delete();
|
||||
$roadObserved->files()->where('path', 'like', '%_image_after%')->delete();
|
||||
|
||||
$image_before = FileFacade::save($request->image_before, "road_observeds/{$roadObserved->id}/");
|
||||
$image_after = FileFacade::save($request->image_after, "road_observeds/{$roadObserved->id}/");
|
||||
|
||||
$files_path[0]['path'] = $image_before;
|
||||
$files_path[1]['path'] = $image_after;
|
||||
|
||||
$files = json_encode($files_path);
|
||||
$now_date_time = Carbon::now();
|
||||
|
||||
$roadObservedData['image_after'] = $image_after;
|
||||
$roadObservedData['image_before'] = $image_before;
|
||||
$roadObservedData['rms_start_latlng'] = explode(',', $request->start_point);
|
||||
$roadObservedData['updated_at_fa'] = Verta::instance($now_date_time);
|
||||
$roadObservedData['rms_last_activity_fa'] = Verta::instance($now_date_time);
|
||||
$roadObservedData['rms_last_activity'] = $now_date_time;
|
||||
$roadObservedHistoryData['new_files'] = $files;
|
||||
}
|
||||
|
||||
$roadObserved->problemHistories()->create($roadObservedHistoryData);
|
||||
$roadObserved->update($roadObservedData);
|
||||
|
||||
auth()->user()->addActivityComplete(1142);
|
||||
|
||||
try {
|
||||
$nikarayanService->updateRoadObservedInfoByNikarayan($request, $roadObserved, json_encode($roadObservedHistoryData['new_files']));
|
||||
}
|
||||
catch (SoapFault $e) {
|
||||
|
||||
$msg = "error in send to nikarayan at" . date("Y-m-d H:i:s") . "\n";
|
||||
$msg .= $e->getMessage();
|
||||
Sms::sendSms(env('RMS_CTO_PHONE_NUMBER'), $msg);
|
||||
}
|
||||
|
||||
return $this->successResponse();
|
||||
}
|
||||
|
||||
public function modifyRegistration(ModifyRegisterationRequest $request, RoadObserved $roadObserved, NikarayanService $nikarayanService): JsonResponse
|
||||
{
|
||||
$roadObservedData = [
|
||||
'status' => 0,
|
||||
'status_fa' => 'در حال بررسی',
|
||||
'rms_status' => $request->rms_status ?? $roadObserved->rms_status,
|
||||
'rms_description' => $request->rms_description ?? $roadObserved->rms_description,
|
||||
];
|
||||
|
||||
$roadObservedHistoryData = [
|
||||
'user_id' => auth()->user()->id,
|
||||
'previous_rms_status' => $roadObserved->rms_status,
|
||||
'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([])
|
||||
];
|
||||
|
||||
if ($request->rms_status == 1) {
|
||||
|
||||
$files_path = [];
|
||||
@@ -125,12 +179,18 @@ class RoadObservationController extends Controller
|
||||
$roadObserved->files()->where('path', 'like', '%_image_after%')->delete();
|
||||
|
||||
if ($request->has('image_before')) {
|
||||
if ($roadObserved->image_before) {
|
||||
FileFacade::delete($roadObserved->image_before, true);
|
||||
}
|
||||
$image_before = FileFacade::save($request->image_before, "road_observeds/{$roadObserved->id}/");
|
||||
$roadObservedData['image_before'] = $image_before;
|
||||
$files_path[0]['path'] = $image_before;
|
||||
}
|
||||
|
||||
if ($request->has('image_after')) {
|
||||
if ($roadObserved->image_after) {
|
||||
FileFacade::delete($roadObserved->image_after, true);
|
||||
}
|
||||
$image_after = FileFacade::save($request->image_after, "road_observeds/{$roadObserved->id}/");
|
||||
$roadObservedData['image_after'] = $image_after;
|
||||
$files_path[1]['path'] = $image_after;
|
||||
|
||||
Reference in New Issue
Block a user