diff --git a/app/Http/Controllers/V3/Dashboard/RoadItem/OperatorController.php b/app/Http/Controllers/V3/Dashboard/RoadItem/OperatorController.php index c422e120..f9d065a1 100644 --- a/app/Http/Controllers/V3/Dashboard/RoadItem/OperatorController.php +++ b/app/Http/Controllers/V3/Dashboard/RoadItem/OperatorController.php @@ -123,8 +123,6 @@ class OperatorController extends Controller new ProhibitedAction('اقدام مربوطه قبلا رسیدگی شده است.') ); - $road_item->rahdaran()->attach($request->rahdaran_id); - $road_item->cmmsMachines()->attach($request->machines_id); $road_item->missions()->attach($request->mission_id); $user->addActivityComplete(1154); diff --git a/app/Http/Requests/V3/RoadItem/Operator/StoreRequest.php b/app/Http/Requests/V3/RoadItem/Operator/StoreRequest.php index 66f045b3..a6093ca1 100644 --- a/app/Http/Requests/V3/RoadItem/Operator/StoreRequest.php +++ b/app/Http/Requests/V3/RoadItem/Operator/StoreRequest.php @@ -6,8 +6,6 @@ use App\Models\Mission; use Carbon\Carbon; use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Foundation\Http\FormRequest; -use Illuminate\Validation\Rule; -use Illuminate\Validation\ValidationException; use Illuminate\Validation\Validator; class StoreRequest extends FormRequest @@ -38,10 +36,6 @@ class StoreRequest extends FormRequest 'activity_time' => 'required|date_format:H:i', 'before_image' => 'image|max:4096', 'after_image' => 'image|max:4096', - 'machines_id' => 'required|array', - 'machines_id.*' => 'required|exists:cmms_machines,id', - 'rahdaran_id' => 'required|array', - 'rahdaran_id.*' => 'required|exists:rahdaran,id', ]; } @@ -52,18 +46,24 @@ class StoreRequest extends FormRequest 'activity_time' => 'ساعت فعالیت', ]; } + public function after(): array { return [ function (Validator $validator) { + + $mission = Mission::find($this->mission_id); + if (!$mission) { + $validator->errors()->add('mission_id', 'مأموریت یافت نشد.'); + return; + } $activityTime = Carbon::parse("{$this->activity_date} {$this->activity_time}"); - if ($activityTime->lt($this->mission->start_date) || $activityTime->gt($this->mission->end_date)) { + if ($activityTime->lt($mission->start_date) || $activityTime->gt($mission->end_date)) { $validator->errors()->add('activity_time', 'زمان گزارش باید بین بازه مأموریت باشد.'); } } ]; } - }