From e435aa83721c1e0c2af3c8236b60f0e925fe8765 Mon Sep 17 00:00:00 2001 From: amirghasempoor Date: Sat, 20 Dec 2025 15:52:57 +0330 Subject: [PATCH] create no process --- app/Enums/MissionViolationStatus.php | 2 +- app/Enums/MissionViolationType.php | 2 +- .../V3/Dashboard/Mission/ViolationManagementController.php | 2 ++ .../Requests/V3/Mission/RequestPortal/NoProcessRequest.php | 4 +--- app/Services/Cartables/Mission/DailyMoveMachineService.php | 2 +- routes/v3.php | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/Enums/MissionViolationStatus.php b/app/Enums/MissionViolationStatus.php index 9124e2e9..68c75118 100644 --- a/app/Enums/MissionViolationStatus.php +++ b/app/Enums/MissionViolationStatus.php @@ -5,7 +5,7 @@ namespace App\Enums; enum MissionViolationStatus: int { case BEDON_EGHDAM = 0; - case EGHDAM_SHODE = 2; + case EGHDAM_SHODE = 1; public function label(): string { diff --git a/app/Enums/MissionViolationType.php b/app/Enums/MissionViolationType.php index e9c55b0c..1969841f 100644 --- a/app/Enums/MissionViolationType.php +++ b/app/Enums/MissionViolationType.php @@ -10,7 +10,7 @@ enum MissionViolationType: int public function label(): string { return match ($this) { - self::KHOROJ_BEDONE_MOGAVEZ => "خروج بدون مجوز ", + self::KHOROJ_BEDONE_MOGAVEZ => "خروج بدون مجوز", self::ADAM_TAHAROK => "عدم تحرک", }; } diff --git a/app/Http/Controllers/V3/Dashboard/Mission/ViolationManagementController.php b/app/Http/Controllers/V3/Dashboard/Mission/ViolationManagementController.php index 7da66744..d4b49d7b 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/ViolationManagementController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/ViolationManagementController.php @@ -76,6 +76,8 @@ class ViolationManagementController extends Controller $mission->rahdaran()->sync($request->rahdaran); $mission->rahdaran()->attach($request->driver, ['is_driver' => true]); + $violation->update(['status' => 1]); + if ($mission->category_id == 2) { $rpc = new OperatorController; $rpc->store($mission); diff --git a/app/Http/Requests/V3/Mission/RequestPortal/NoProcessRequest.php b/app/Http/Requests/V3/Mission/RequestPortal/NoProcessRequest.php index 9531a82b..5437dca1 100644 --- a/app/Http/Requests/V3/Mission/RequestPortal/NoProcessRequest.php +++ b/app/Http/Requests/V3/Mission/RequestPortal/NoProcessRequest.php @@ -12,7 +12,7 @@ class NoProcessRequest extends FormRequest */ public function authorize(): bool { - return true; + return $this->violation->status === 0 && $this->violation->type === 1; } /** @@ -25,8 +25,6 @@ class NoProcessRequest extends FormRequest return [ 'rahdaran' => 'array', 'rahdaran.*' => 'exists:rahdaran,id', - 'machines' => 'required|array', - 'machines.*' => 'required|integer|exists:cmms_machines,id', 'driver' => 'required|integer|exists:rahdaran,id', 'zone' => 'required|in:1,2,3', 'start_date' => 'required|date', diff --git a/app/Services/Cartables/Mission/DailyMoveMachineService.php b/app/Services/Cartables/Mission/DailyMoveMachineService.php index c074fba6..bed5ddd4 100644 --- a/app/Services/Cartables/Mission/DailyMoveMachineService.php +++ b/app/Services/Cartables/Mission/DailyMoveMachineService.php @@ -15,7 +15,7 @@ class DailyMoveMachineService $request, allowedFilters: ['*'], allowedSortings: ['*'], - allowedSelects: ['id', 'mission_id', 'machine_code', 'request_date', 'type', 'exit_time', 'enter_time'] + allowedSelects: ['id', 'mission_id', 'machine_code', 'request_date', 'type', 'exit_time', 'enter_time', 'status'] ); } } diff --git a/routes/v3.php b/routes/v3.php index 4bab477b..2b3774a5 100644 --- a/routes/v3.php +++ b/routes/v3.php @@ -526,7 +526,7 @@ Route::prefix('missions') ->controller(ViolationManagementController::class) ->group(function () { Route::get('/', 'index')->name('index'); - Route::post('/no_process','noProcess')->name('noProcess'); + Route::post('/no_process/{violation}','noProcess')->name('noProcess'); }); });