fix code in mission controller and form request
This commit is contained in:
@@ -82,7 +82,6 @@ class RequestPortalController extends Controller
|
|||||||
'start_date' => $request->start_date,
|
'start_date' => $request->start_date,
|
||||||
'end_date' => $request->end_date,
|
'end_date' => $request->end_date,
|
||||||
'request_date' => now(),
|
'request_date' => now(),
|
||||||
'description' => $request->item_str . ' - ' . $request->sub_item_str,
|
|
||||||
'end_point' => $request->end_point,
|
'end_point' => $request->end_point,
|
||||||
'encoded_route' => $request->encoded_route,
|
'encoded_route' => $request->encoded_route,
|
||||||
'category_id' => $request->category_id,
|
'category_id' => $request->category_id,
|
||||||
@@ -136,6 +135,8 @@ class RequestPortalController extends Controller
|
|||||||
$machine = CMMSMachine::query()->find($request->machine_id, ['id', 'machine_code', 'car_type']);
|
$machine = CMMSMachine::query()->find($request->machine_id, ['id', 'machine_code', 'car_type']);
|
||||||
|
|
||||||
$newMission = Mission::query()->create([
|
$newMission = Mission::query()->create([
|
||||||
|
'item_id' => $request->item_id,
|
||||||
|
'sub_item_id' => $request->sub_item_id,
|
||||||
'user_id' => $user->id,
|
'user_id' => $user->id,
|
||||||
'username' => $user->username,
|
'username' => $user->username,
|
||||||
'province_id' => $user->province_id,
|
'province_id' => $user->province_id,
|
||||||
@@ -153,7 +154,6 @@ class RequestPortalController extends Controller
|
|||||||
'start_date' => now(),
|
'start_date' => now(),
|
||||||
'end_date' => $request->end_date,
|
'end_date' => $request->end_date,
|
||||||
'request_date' => now(),
|
'request_date' => now(),
|
||||||
'description' => $request->description,
|
|
||||||
'end_point' => $request->end_point,
|
'end_point' => $request->end_point,
|
||||||
'encoded_route' => $request->encoded_route,
|
'encoded_route' => $request->encoded_route,
|
||||||
'category_id' => $request->category_id,
|
'category_id' => $request->category_id,
|
||||||
@@ -184,6 +184,8 @@ class RequestPortalController extends Controller
|
|||||||
DB::transaction(function () use ($mission, $request) {
|
DB::transaction(function () use ($mission, $request) {
|
||||||
$state = MissionStates::REQUEST_CREATED->value;
|
$state = MissionStates::REQUEST_CREATED->value;
|
||||||
$mission->update([
|
$mission->update([
|
||||||
|
'item_id' => $request->item_id,
|
||||||
|
'sub_item_id' => $request->sub_item_id,
|
||||||
'state_id' => $state,
|
'state_id' => $state,
|
||||||
'state_name' => MissionStates::name($state),
|
'state_name' => MissionStates::name($state),
|
||||||
'requested_machines' => json_encode($request->requested_machines),
|
'requested_machines' => json_encode($request->requested_machines),
|
||||||
@@ -193,7 +195,6 @@ class RequestPortalController extends Controller
|
|||||||
'zone_fa' => MissionZones::name($request->zone),
|
'zone_fa' => MissionZones::name($request->zone),
|
||||||
'start_date' => $request->start_date,
|
'start_date' => $request->start_date,
|
||||||
'end_date' => $request->end_date,
|
'end_date' => $request->end_date,
|
||||||
'description' => $request->description,
|
|
||||||
'end_point' => $request->end_point,
|
'end_point' => $request->end_point,
|
||||||
'encoded_route' => $request->encoded_route,
|
'encoded_route' => $request->encoded_route,
|
||||||
'category_id' => $request->category_id,
|
'category_id' => $request->category_id,
|
||||||
@@ -246,6 +247,8 @@ class RequestPortalController extends Controller
|
|||||||
$machine = CMMSMachine::query()->where('machine_code', '=', $violation->machine_code)->first(['id', 'machine_code', 'car_type']);
|
$machine = CMMSMachine::query()->where('machine_code', '=', $violation->machine_code)->first(['id', 'machine_code', 'car_type']);
|
||||||
|
|
||||||
$mission = Mission::query()->create([
|
$mission = Mission::query()->create([
|
||||||
|
'item_id' => $request->item_id,
|
||||||
|
'sub_item_id' => $request->sub_item_id,
|
||||||
'user_id' => $user->id,
|
'user_id' => $user->id,
|
||||||
'username' => $user->username,
|
'username' => $user->username,
|
||||||
'province_id' => $user->province_id,
|
'province_id' => $user->province_id,
|
||||||
|
|||||||
@@ -25,6 +25,8 @@ class ClarifyUnauthorizedExitRequest extends FormRequest
|
|||||||
public function rules(): array
|
public function rules(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
|
'item_id' => 'required|exists:info_items,item',
|
||||||
|
'sub_item_id' => 'required|exists:info_items,sub_item',
|
||||||
'rahdaran' => 'array',
|
'rahdaran' => 'array',
|
||||||
'rahdaran.*' => 'exists:rahdaran,id',
|
'rahdaran.*' => 'exists:rahdaran,id',
|
||||||
'driver' => 'required|integer|exists:rahdaran,id',
|
'driver' => 'required|integer|exists:rahdaran,id',
|
||||||
|
|||||||
@@ -26,6 +26,8 @@ class ContinueMissionRequest extends FormRequest
|
|||||||
public function rules(): array
|
public function rules(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
|
'item_id' => 'required|exists:info_items,item',
|
||||||
|
'sub_item_id' => 'required|exists:info_items,sub_item',
|
||||||
'rahdaran' => 'array',
|
'rahdaran' => 'array',
|
||||||
'rahdaran.*' => 'exists:rahdaran,id',
|
'rahdaran.*' => 'exists:rahdaran,id',
|
||||||
'machine_id' => 'required|integer|exists:cmms_machines,id',
|
'machine_id' => 'required|integer|exists:cmms_machines,id',
|
||||||
@@ -33,7 +35,6 @@ class ContinueMissionRequest extends FormRequest
|
|||||||
'type' => 'required|in:1,2',
|
'type' => 'required|in:1,2',
|
||||||
'zone' => 'required|in:1,2,3',
|
'zone' => 'required|in:1,2,3',
|
||||||
'end_date' => 'required|date',
|
'end_date' => 'required|date',
|
||||||
'description' => 'string',
|
|
||||||
'end_point' => 'required|string',
|
'end_point' => 'required|string',
|
||||||
'encoded_route' => 'required|string',
|
'encoded_route' => 'required|string',
|
||||||
'explanation' => 'required|string',
|
'explanation' => 'required|string',
|
||||||
|
|||||||
@@ -34,7 +34,6 @@ class StoreRequest extends FormRequest
|
|||||||
'zone' => 'required|in:1,2,3',
|
'zone' => 'required|in:1,2,3',
|
||||||
'start_date' => 'required|date',
|
'start_date' => 'required|date',
|
||||||
'end_date' => 'required|date',
|
'end_date' => 'required|date',
|
||||||
'description' => 'string',
|
|
||||||
'end_point' => 'required|string',
|
'end_point' => 'required|string',
|
||||||
'encoded_route' => 'required|string',
|
'encoded_route' => 'required|string',
|
||||||
'explanation' => 'required|string',
|
'explanation' => 'required|string',
|
||||||
|
|||||||
@@ -26,6 +26,8 @@ class UpdateRequest extends FormRequest
|
|||||||
public function rules(): array
|
public function rules(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
|
'item_id' => 'required|exists:info_items,item',
|
||||||
|
'sub_item_id' => 'required|exists:info_items,sub_item',
|
||||||
'rahdaran' => 'array',
|
'rahdaran' => 'array',
|
||||||
'rahdaran.*' => 'exists:rahdaran,id',
|
'rahdaran.*' => 'exists:rahdaran,id',
|
||||||
'requested_machines' => 'required|array',
|
'requested_machines' => 'required|array',
|
||||||
@@ -33,7 +35,6 @@ class UpdateRequest extends FormRequest
|
|||||||
'zone' => 'required|in:1,2,3',
|
'zone' => 'required|in:1,2,3',
|
||||||
'start_date' => 'required|date',
|
'start_date' => 'required|date',
|
||||||
'end_date' => 'required|date',
|
'end_date' => 'required|date',
|
||||||
'description' => 'string',
|
|
||||||
'end_point' => 'required|string',
|
'end_point' => 'required|string',
|
||||||
'encoded_route' => 'required|string',
|
'encoded_route' => 'required|string',
|
||||||
'explanation' => 'required|string',
|
'explanation' => 'required|string',
|
||||||
|
|||||||
@@ -13,8 +13,8 @@ class DeallocateRequest extends FormRequest
|
|||||||
*/
|
*/
|
||||||
public function authorize(): bool
|
public function authorize(): bool
|
||||||
{
|
{
|
||||||
return $this->mission->station_id == auth()->user()->station_id &&
|
return ($this->mission->station_id == auth()->user()->station_id &&
|
||||||
in_array($this->mission->state_id, [MissionStates::REQUEST_CREATED->value, MissionStates::PENDING_CONFIRMATION->value])
|
in_array($this->mission->state_id, [MissionStates::REQUEST_CREATED->value, MissionStates::PENDING_CONFIRMATION->value]))
|
||||||
|| auth()->user()->username === 'witel';
|
|| auth()->user()->username === 'witel';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Relations\HasOne;
|
|||||||
class MissionViolation extends Model
|
class MissionViolation extends Model
|
||||||
{
|
{
|
||||||
use HasFactory;
|
use HasFactory;
|
||||||
protected $guarded =[];
|
protected $guarded =['id'];
|
||||||
|
|
||||||
public function mission(): BelongsTo
|
public function mission(): BelongsTo
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ return new class extends Migration
|
|||||||
public function down(): void
|
public function down(): void
|
||||||
{
|
{
|
||||||
Schema::table('missions', function (Blueprint $table) {
|
Schema::table('missions', function (Blueprint $table) {
|
||||||
//
|
$table->dropColumn('item_id', 'sub_item_id');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user