diff --git a/app/Http/Controllers/V2/Dashboard/RoadObservationController.php b/app/Http/Controllers/V2/Dashboard/RoadObservationController.php index b1ddc4e1..4b961b8b 100644 --- a/app/Http/Controllers/V2/Dashboard/RoadObservationController.php +++ b/app/Http/Controllers/V2/Dashboard/RoadObservationController.php @@ -572,7 +572,7 @@ class RoadObservationController extends Controller // $url = "https://riws.rmto.ir/WebServices/NRPTrafficStatus.asmx?wsdl"; try { // $result = $nikarayanService->updateRoadObservedInfoByNikarayan($request->only(['rms-status', 'rms-description']), $roadObserved, $files_path); - $result = UpdateRoadObservedInfoByNikarayanJob::dispatch($request->only(['rms-status', 'rms-description']), $roadObserved, $files_path)->onQueue('nikarayan'); + $result = UpdateRoadObservedInfoByNikarayanJob::dispatch($roadObserved, $files_path)->onQueue('nikarayan'); } catch (SoapFault $e) { $msg = "error in send to nikarayan at" . date("Y-m-d H:i:s") . "\n" . 'rms: error in get road observation webservice babe!!!!' . "\n"; diff --git a/app/Http/Controllers/V3/Dashboard/RoadObservation/OperatorController.php b/app/Http/Controllers/V3/Dashboard/RoadObservation/OperatorController.php index 33f5c8c3..f4f2807f 100644 --- a/app/Http/Controllers/V3/Dashboard/RoadObservation/OperatorController.php +++ b/app/Http/Controllers/V3/Dashboard/RoadObservation/OperatorController.php @@ -105,13 +105,13 @@ class OperatorController $roadObservedHistoryData['new_files'] = json_encode($files_path); } - DB::transaction(function () use ($roadObserved, $roadObservedHistoryData, $roadObservedData, $request, $nikarayanService, $files_path) { + DB::transaction(function () use ($roadObserved, $roadObservedHistoryData, $roadObservedData, $nikarayanService, $files_path) { $roadObserved->problemHistories()->create($roadObservedHistoryData); $roadObserved->update($roadObservedData); auth()->user()->addActivityComplete(1142); - $nikarayanService->updateRoadObservedInfoByNikarayan($request, $roadObserved, $files_path); + $nikarayanService->updateRoadObservedInfoByNikarayan($roadObserved, $files_path); }); return $this->successResponse(); @@ -170,13 +170,13 @@ class OperatorController $roadObservedHistoryData['new_files'] = $files; } - DB::transaction(function () use ($roadObserved, $roadObservedHistoryData, $roadObservedData, $request, $nikarayanService) { + DB::transaction(function () use ($roadObserved, $roadObservedHistoryData, $roadObservedData, $files_path, $nikarayanService) { $roadObserved->problemHistories()->create($roadObservedHistoryData); $roadObserved->update($roadObservedData); auth()->user()->addActivityComplete(1142); - $nikarayanService->updateRoadObservedInfoByNikarayan($request, $roadObserved, json_encode($roadObservedHistoryData['new_files'])); + $nikarayanService->updateRoadObservedInfoByNikarayan($roadObserved, $files_path); }); return $this->successResponse(); diff --git a/app/Jobs/UpdateRoadObservedInfoByNikarayanJob.php b/app/Jobs/UpdateRoadObservedInfoByNikarayanJob.php index 6cc6a3c0..f79e7215 100644 --- a/app/Jobs/UpdateRoadObservedInfoByNikarayanJob.php +++ b/app/Jobs/UpdateRoadObservedInfoByNikarayanJob.php @@ -21,7 +21,7 @@ class UpdateRoadObservedInfoByNikarayanJob implements ShouldQueue /** * Create a new job instance. */ - public function __construct(public array $request, public RoadObserved $roadObserved, public $files) {} + public function __construct(public RoadObserved $roadObserved, public $files) {} /** * Execute the job. @@ -29,7 +29,7 @@ class UpdateRoadObservedInfoByNikarayanJob implements ShouldQueue */ public function handle(NikarayanService $nikarayanService) { - return $nikarayanService->updateRoadObservedInfoByNikarayan($this->request, $this->roadObserved, $this->files); + return $nikarayanService->updateRoadObservedInfoByNikarayan($this->roadObserved, $this->files); } /** diff --git a/app/Services/NikarayanService.php b/app/Services/NikarayanService.php index 2daf1fd0..7f2bfac3 100644 --- a/app/Services/NikarayanService.php +++ b/app/Services/NikarayanService.php @@ -14,7 +14,7 @@ class NikarayanService /** * @throws SoapFault */ - public function updateRoadObservedInfoByNikarayan($request, RoadObserved $roadObserved, $files) + public function updateRoadObservedInfoByNikarayan(RoadObserved $roadObserved, $files) { if (App::isProduction()) { @@ -24,8 +24,8 @@ class NikarayanService $array = array('strUserName' => 'vaytelrop', 'strPassword' => 'VaYtelROP*2024', 'strAutoID' => $roadObserved->fk_RegisteredEventMessage, - 'strStateID' => ($request['rms-status'] == 1) ? '2' : '3', - 'strDescription' => $request['rms-description'] ?? $roadObserved->rms_description, + 'strStateID' => ($roadObserved->rms_status == 1) ? '2' : '3', + 'strDescription' => $roadObserved->rms_description, 'strPreviousImageLink' => !empty($files) && isset($files[0]['path']) ? "https://rms.rmto.ir/" . $files[0]['path'] : "", 'strNextImageLink' => !empty($files) && isset($files[1]['path']) ? "https://rms.rmto.ir/" . $files[1]['path'] : "", 'strRMSDateAndTime' => $roadObserved->updated_at diff --git a/public/.gitignore b/public/.gitignore index 1c432f36..e69de29b 100644 --- a/public/.gitignore +++ b/public/.gitignore @@ -1,8 +0,0 @@ -* -!.gitignore -!.htaccess -!favicon.ico -!index.php -!robots.txt -!vendor -!web.config diff --git a/resources/.gitignore b/resources/.gitignore index a50fbbe5..e69de29b 100644 --- a/resources/.gitignore +++ b/resources/.gitignore @@ -1,3 +0,0 @@ -/views/* -!/views/v3/ -!/views/v3/* \ No newline at end of file diff --git a/resources/views/vendor/pulse/dashboard.blade.php b/resources/views/vendor/pulse/dashboard.blade.php new file mode 100644 index 00000000..6a95bb19 --- /dev/null +++ b/resources/views/vendor/pulse/dashboard.blade.php @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + +