This commit is contained in:
2026-06-10 14:37:36 +03:30
parent eeff2861e5
commit 5d2a6d045b
12 changed files with 122 additions and 31 deletions

View File

@@ -35,12 +35,9 @@ class ContinueMissionRequest extends FormRequest
'end_date' => 'required|date',
'description' => 'string',
'end_point' => 'required|string',
'area' => 'required|array',
'area.type' => 'required|string',
'area.coordinates' => 'required|array',
'area' => 'required|string',
'explanation' => 'required|string',
'category_id' => 'required|in:1,2,3',
'road_observed_id' => 'required_if:category_id,3|exists:road_observeds,id',
];
}

View File

@@ -34,12 +34,9 @@ class StoreRequest extends FormRequest
'end_date' => 'required|date',
'description' => 'string',
'end_point' => 'required|string',
'area' => 'required|array',
'area.type' => 'required|string',
'area.coordinates' => 'required|array',
'area' => 'required|string',
'explanation' => 'required|string',
'category_id' => 'required|in:1,2,3',
'road_observed_id' => 'required_if:category_id,3|exists:road_observeds,id',
];
}
@@ -58,6 +55,12 @@ class StoreRequest extends FormRequest
);
}
}
if (strtotime($this->end_date) < strtotime($this->start_date)) {
$validator->errors()->add(
'time',
'زمان پایان ماموریت باید بعد از زمان شروع ماموریت باشد.'
);
}
},
];
}

View File

@@ -35,12 +35,9 @@ class UpdateRequest extends FormRequest
'end_date' => 'required|date',
'description' => 'string',
'end_point' => 'required|string',
'area' => 'required|array',
'area.type' => 'required|string',
'area.coordinates' => 'required|array',
'area' => 'required|string',
'explanation' => 'required|string',
'category_id' => 'required|in:1,2,3',
'road_observed_id' => 'required_if:category_id,3|exists:road_observeds,id',
];
}
@@ -59,6 +56,12 @@ class UpdateRequest extends FormRequest
);
}
}
if (strtotime($this->end_date) < strtotime($this->start_date)) {
$validator->errors()->add(
'time',
'زمان پایان ماموریت باید بعد از زمان شروع ماموریت باشد.'
);
}
},
];
}

View File

@@ -2,8 +2,10 @@
namespace App\Http\Requests\V3\Mission\Violation;
use Carbon\Carbon;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Validator;
class NoProcessRequest extends FormRequest
{
@@ -30,9 +32,7 @@ class NoProcessRequest extends FormRequest
'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',
'area' => 'required|string',
'category_id' => 'required|in:1,2,3',
'explanation' => 'required|string',
];

View File

@@ -25,7 +25,8 @@ class StoreRequest extends FormRequest
public function rules(): array
{
return [
'machine_code' => 'required',
'exit_time' => 'required|date',
'machine_code' => 'required',
'km'=> 'string',
];
}

View File

@@ -26,8 +26,7 @@ class UpdateRequest extends FormRequest
public function rules(): array
{
return [
'exit_time' => 'date',
'enter_time' => 'date',
'enter_time' => 'required|date',
];
}
}