diff --git a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php index 1bb3de72..da2973bc 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php @@ -16,6 +16,7 @@ use App\Http\Requests\V3\Mission\RequestPortal\UpdateRequest; use App\Http\Traits\ApiResponse; use App\Models\CMMSMachine; use App\Models\Mission; +use App\Models\RahdariPoint; use App\Models\RoadObserved; use App\Services\Cartables\Mission\RequestPortalService; use App\Services\FMS\GetErrorRateService; @@ -71,7 +72,8 @@ class RequestPortalController extends Controller 'category_name' => MissionCategory::name($category), 'explanation' => $request->explanation, 'code' => rand(100000, 999999), - 'station_id' => $user->station_id + 'station_id' => $user->station_id, + 'station_name' => RahdariPoint::query()->find( $user->station_id)->name, ]); $mission->rahdaran()->sync($request->rahdaran); @@ -147,7 +149,8 @@ class RequestPortalController extends Controller 'start_time' => now(), 'machine_id' => $machine->id, 'machine_code' => $machine->machine_code, - 'station_id' => $user->station_id + 'station_id' => $user->station_id, + 'station_name' => RahdariPoint::query()->find( $user->station_id)->name, ]); $newMission->rahdaran()->sync($request->rahdaran); @@ -242,7 +245,8 @@ class RequestPortalController extends Controller 'request_date' => now(), 'machine_id' => $machine->id, 'machine_code' => $machine->machine_code, - 'station_id' => $user->station_id + 'station_id' => $user->station_id, + 'station_name' => RahdariPoint::query()->find( $user->station_id)->name, ]); $mission->rahdaran()->sync($request->rahdaran); diff --git a/app/Http/Controllers/V3/Dashboard/Mission/ViolationManagementController.php b/app/Http/Controllers/V3/Dashboard/Mission/ViolationManagementController.php index d2e79c57..b4042f61 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/ViolationManagementController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/ViolationManagementController.php @@ -7,12 +7,12 @@ use App\Enums\MissionStates; use App\Enums\MissionTypes; use App\Enums\MissionZones; use App\Http\Controllers\Controller; -use App\Http\Controllers\V3\Dashboard\RoadPatrol\OperatorController; -use App\Http\Requests\V3\Mission\RequestPortal\NoProcessRequest; +use App\Http\Requests\V3\Mission\Violation\NoProcessRequest; use App\Http\Traits\ApiResponse; use App\Models\CMMSMachine; use App\Models\Mission; use App\Models\MissionViolation; +use App\Models\RahdariPoint; use App\Services\Cartables\Mission\DailyMoveMachineService; use Carbon\Carbon; use Illuminate\Http\JsonResponse; @@ -72,7 +72,8 @@ class ViolationManagementController extends Controller 'request_date' => now(), 'machine_id' => $machine->id,// 'machine_code' => $machine->machine_code,// - 'station_id' => $user->station_id + 'station_id' => $user->station_id, + 'station_name' => RahdariPoint::query()->find( $user->station_id)->name, ]); $mission->rahdaran()->sync($request->rahdaran); diff --git a/app/Http/Requests/V3/Mission/RequestPortal/NoProcessRequest.php b/app/Http/Requests/V3/Mission/RequestPortal/NoProcessRequest.php index cab007cc..d30aa42d 100644 --- a/app/Http/Requests/V3/Mission/RequestPortal/NoProcessRequest.php +++ b/app/Http/Requests/V3/Mission/RequestPortal/NoProcessRequest.php @@ -12,7 +12,6 @@ class NoProcessRequest extends FormRequest */ public function authorize(): bool { -// return $this->violation->status === 0 && $this->violation->type === 1; return true; } diff --git a/app/Http/Requests/V3/Mission/Violation/NoProcessRequest.php b/app/Http/Requests/V3/Mission/Violation/NoProcessRequest.php new file mode 100644 index 00000000..6f223b4c --- /dev/null +++ b/app/Http/Requests/V3/Mission/Violation/NoProcessRequest.php @@ -0,0 +1,48 @@ +violation->status === 0 && $this->violation->type === 1; + } + + /** + * Get the validation rules that apply to the request. + * + * @return array + */ + public function rules(): array + { + return [ + 'rahdaran' => 'array', + 'rahdaran.*' => 'exists:rahdaran,id', + 'driver' => 'required|integer|exists:rahdaran,id', + 'zone' => 'required|in:1,2,3', + 'start_date' => 'required|date', + 'end_date' => 'required|date|after:start_date|before:now', + 'end_point' => 'required|string', + 'area' => 'array', + 'area.type' => 'string', + 'area.coordinates' => 'array', + 'category_id' => 'required|in:1,2,3', + 'explanation' => 'required|string', + ]; + } + + public function messages(): array + { + return [ + 'end_date.before' => 'تاریخ پایان باید قبل از زمان فعلی باشد.', + 'end_date.after' => 'تاریخ پایان نباید قبل از تاریخ شروع باشد.', + ]; + } +}