create no process
This commit is contained in:
@@ -5,7 +5,7 @@ namespace App\Enums;
|
|||||||
enum MissionViolationStatus: int
|
enum MissionViolationStatus: int
|
||||||
{
|
{
|
||||||
case BEDON_EGHDAM = 0;
|
case BEDON_EGHDAM = 0;
|
||||||
case EGHDAM_SHODE = 2;
|
case EGHDAM_SHODE = 1;
|
||||||
|
|
||||||
public function label(): string
|
public function label(): string
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ enum MissionViolationType: int
|
|||||||
public function label(): string
|
public function label(): string
|
||||||
{
|
{
|
||||||
return match ($this) {
|
return match ($this) {
|
||||||
self::KHOROJ_BEDONE_MOGAVEZ => "خروج بدون مجوز ",
|
self::KHOROJ_BEDONE_MOGAVEZ => "خروج بدون مجوز",
|
||||||
self::ADAM_TAHAROK => "عدم تحرک",
|
self::ADAM_TAHAROK => "عدم تحرک",
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -76,6 +76,8 @@ class ViolationManagementController extends Controller
|
|||||||
$mission->rahdaran()->sync($request->rahdaran);
|
$mission->rahdaran()->sync($request->rahdaran);
|
||||||
$mission->rahdaran()->attach($request->driver, ['is_driver' => true]);
|
$mission->rahdaran()->attach($request->driver, ['is_driver' => true]);
|
||||||
|
|
||||||
|
$violation->update(['status' => 1]);
|
||||||
|
|
||||||
if ($mission->category_id == 2) {
|
if ($mission->category_id == 2) {
|
||||||
$rpc = new OperatorController;
|
$rpc = new OperatorController;
|
||||||
$rpc->store($mission);
|
$rpc->store($mission);
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ class NoProcessRequest extends FormRequest
|
|||||||
*/
|
*/
|
||||||
public function authorize(): bool
|
public function authorize(): bool
|
||||||
{
|
{
|
||||||
return true;
|
return $this->violation->status === 0 && $this->violation->type === 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -25,8 +25,6 @@ class NoProcessRequest extends FormRequest
|
|||||||
return [
|
return [
|
||||||
'rahdaran' => 'array',
|
'rahdaran' => 'array',
|
||||||
'rahdaran.*' => 'exists:rahdaran,id',
|
'rahdaran.*' => 'exists:rahdaran,id',
|
||||||
'machines' => 'required|array',
|
|
||||||
'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',
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ class DailyMoveMachineService
|
|||||||
$request,
|
$request,
|
||||||
allowedFilters: ['*'],
|
allowedFilters: ['*'],
|
||||||
allowedSortings: ['*'],
|
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']
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -526,7 +526,7 @@ Route::prefix('missions')
|
|||||||
->controller(ViolationManagementController::class)
|
->controller(ViolationManagementController::class)
|
||||||
->group(function () {
|
->group(function () {
|
||||||
Route::get('/', 'index')->name('index');
|
Route::get('/', 'index')->name('index');
|
||||||
Route::post('/no_process','noProcess')->name('noProcess');
|
Route::post('/no_process/{violation}','noProcess')->name('noProcess');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user