From 5a91095d2ab3ef7669ede86db0ca81643e8a0a0e Mon Sep 17 00:00:00 2001 From: joddyabott Date: Mon, 25 Aug 2025 16:09:30 +0330 Subject: [PATCH 1/2] fix code --- app/Enums/MissionStates.php | 2 ++ .../V3/Dashboard/Mission/ControlUnitController.php | 4 ++++ app/Listeners/V3/Dashboard/Mission/SendDataToFMSListener.php | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/Enums/MissionStates.php b/app/Enums/MissionStates.php index b72a5637..44df6680 100644 --- a/app/Enums/MissionStates.php +++ b/app/Enums/MissionStates.php @@ -10,6 +10,7 @@ enum MissionStates: int case END_MISSION = 4; case REJECT_BY_TRANSPORTATION = 5; case CANCELLED = 6; + case CREATED_NO_PROCESS = 7 ; public static function name(int $state): string { @@ -20,6 +21,7 @@ enum MissionStates: int 4 => 'اتمام ماموریت', 5 => 'عدم تخصیص خودرو توسط واحد نقلیه و بازگشت درخواست به کارتابل کاربر', 6 => 'ماموریت لغو شد', + 7 => 'ماموریت بدون فرایند ثبت شد' ]; return $mapArray[$state]; diff --git a/app/Http/Controllers/V3/Dashboard/Mission/ControlUnitController.php b/app/Http/Controllers/V3/Dashboard/Mission/ControlUnitController.php index c13d77f0..e76e92af 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/ControlUnitController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/ControlUnitController.php @@ -77,6 +77,8 @@ class ControlUnitController extends Controller $user = auth()->user(); $zone= $request->zone; $type= MissionTypes::NO_PROCESS->value; + $state = MissionStates::CREATED_NO_PROCESS->value; + $mission = Mission::query()->create([ 'user_id' => $user->id, @@ -97,6 +99,8 @@ class ControlUnitController extends Controller 'category_name' => MissionCategory::name($request->category_id), 'start_time' => $request->start_date, 'finish_time' => $request->end_date, + 'state_id' => $state, + 'state_name' => MissionStates::name($state), ]); $mission->rahdaran()->sync($request->rahdaran); diff --git a/app/Listeners/V3/Dashboard/Mission/SendDataToFMSListener.php b/app/Listeners/V3/Dashboard/Mission/SendDataToFMSListener.php index cab14dbe..afc06944 100644 --- a/app/Listeners/V3/Dashboard/Mission/SendDataToFMSListener.php +++ b/app/Listeners/V3/Dashboard/Mission/SendDataToFMSListener.php @@ -23,7 +23,7 @@ class SendDataToFMSListener implements ShouldQueue * @throws RequestException * @throws Exception */ - public function handle(SendDataToFMSEvent $event,): void + public function handle(SendDataToFMSEvent $event): void { $this->getErrorRateService->run($event->mission); } From c90e2cc9af451e2d2621731109928a660d4b1655 Mon Sep 17 00:00:00 2001 From: joddyabott Date: Tue, 26 Aug 2025 10:37:59 +0330 Subject: [PATCH 2/2] fix code --- .../Requests/V3/Mission/ControlUnit/NoProcessRequest.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/Http/Requests/V3/Mission/ControlUnit/NoProcessRequest.php b/app/Http/Requests/V3/Mission/ControlUnit/NoProcessRequest.php index 11d38716..3b914dc0 100644 --- a/app/Http/Requests/V3/Mission/ControlUnit/NoProcessRequest.php +++ b/app/Http/Requests/V3/Mission/ControlUnit/NoProcessRequest.php @@ -32,7 +32,7 @@ class NoProcessRequest extends FormRequest 'machines.*' => 'required|integer|exists:cmms_machines,id', 'driver' => 'required|integer|exists:rahdaran,id', 'zone' => 'required|in:1,2,3', - 'start_date' => 'required|date|before:now', + 'start_date' => 'required|date', 'end_date' => 'required|date|after:start_date|before:now', 'end_point' => 'required|string', 'area' => 'required|array', @@ -45,9 +45,8 @@ class NoProcessRequest extends FormRequest public function messages(): array { return [ - 'start_date.before' => 'امکان ثبت ماموریت بدون فرایند با توجه به زمان انتخابی مقدور نمی‌باشد.', - 'end_date.before' => 'امکان ثبت ماموریت بدون فرایند با توجه به زمان انتخابی مقدور نمی‌باشد.', - 'end_date.after' => 'امکان ثبت ماموریت بدون فرایند با توجه به زمان انتخابی مقدور نمی‌باشد.', + 'end_date.before' => 'تاریخ پایان باید قبل از زمان فعلی باشد.', + 'end_date.after' => 'تاریخ پایان نباید قبل از تاریخ شروع باشد.', ]; } }