RMS/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/NewMission' into 'develop'

Browse Source 
fix code

See merge request witelgroup/rms_v2!166
This commit is contained in:
faezeh zafarbakhsh
2025-08-25 12:21:19 +00:00
parent 0fa68169aa 143d57174b
commit 435f37992c
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/Http/Requests/V3/Mission/ControlUnit/NoProcessRequest.php
View File

@@ -32,8 +32,8 @@ class NoProcessRequest extends FormRequest
'machines.*' => 'required|integer|exists:cmms_machines,id', 'machines.*' => 'required|integer|exists:cmms_machines,id',
'driver' => 'required|integer|exists:rahdaran,id', 'driver' => 'required|integer|exists:rahdaran,id',
'zone' => 'required|in:1,2,3', 'zone' => 'required|in:1,2,3',
'start_date' => 'required|date', 'start_date' => 'required|date|before:now',
'end_date' => 'required|date', 'end_date' => 'required|date|after:start_date|before:now',
'end_point' => 'required|string', 'end_point' => 'required|string',
'area' => 'required|array', 'area' => 'required|array',
'area.type' => 'required|string', 'area.type' => 'required|string',
@@ -42,21 +42,12 @@ class NoProcessRequest extends FormRequest
]; ];
} }
public function after(): array public function messages(): array
{ {
return [ return [
function (Validator $validator) { 'start_date.before' => 'امکان ثبت ماموریت بدون فرایند با توجه به زمان انتخابی مقدور نمی‌باشد.',
$start = Carbon::parse($this->start_date); 'end_date.before' => 'امکان ثبت ماموریت بدون فرایند با توجه به زمان انتخابی مقدور نمی‌باشد.',
$end = Carbon::parse($this->end_date); 'end_date.after' => 'امکان ثبت ماموریت بدون فرایند با توجه به زمان انتخابی مقدور نمی‌باشد.',
$now = Carbon::now();
if ($end->diffInMinutes($now) > 0 || $start->diffInMinutes($now) > 0) {
$validator->errors()->add(
'end_date',
'امکان ثبت ماموریت بدون فرایند با توجه به زمان انتخابی مقدور نمی باشد.'
);
}
}
]; ];
} }
} }

6
app/Listeners/V3/Dashboard/Mission/SendDataToFMSListener.php
View File

@@ -10,6 +10,8 @@ use Illuminate\Http\Client\RequestException;
class SendDataToFMSListener implements ShouldQueue class SendDataToFMSListener implements ShouldQueue
{ {
public function __construct(public GetErrorRateService $getErrorRateService) {}
/** /**
* The name of the queue the job should be sent to. * The name of the queue the job should be sent to.
* *
@@ -21,8 +23,8 @@ class SendDataToFMSListener implements ShouldQueue
* @throws RequestException * @throws RequestException
* @throws Exception * @throws Exception
*/ */
public function handle(SendDataToFMSEvent $event, GetErrorRateService $getErrorRateService): void public function handle(SendDataToFMSEvent $event,): void
{ {
$getErrorRateService->run($event->mission); $this->getErrorRateService->run($event->mission);
} }
} }