From 0a2df262e1356da7e87ebdd761d785086bb5f472 Mon Sep 17 00:00:00 2001 From: amirghasempoor Date: Sat, 20 Dec 2025 11:36:14 +0330 Subject: [PATCH] debug --- app/Enums/MissionViolationStatus.php | 17 +++++++++++ .../Mission/RequestPortalController.php | 5 ++++ .../Mission/ViolationManagementController.php | 24 ++++++++++------ app/Http/Controllers/V3/ProfileController.php | 1 + ...024_12_11_110000_create_rahdaran_table.php | 2 +- ...add_column_to_mission_violations_table.php | 28 +++++++++++++++++++ routes/v3.php | 1 + 7 files changed, 69 insertions(+), 9 deletions(-) create mode 100644 app/Enums/MissionViolationStatus.php create mode 100644 database/migrations/2025_12_20_103013_add_column_to_mission_violations_table.php diff --git a/app/Enums/MissionViolationStatus.php b/app/Enums/MissionViolationStatus.php new file mode 100644 index 00000000..9124e2e9 --- /dev/null +++ b/app/Enums/MissionViolationStatus.php @@ -0,0 +1,17 @@ + "بدون اقدام", + self::EGHDAM_SHODE => "اقدام شده", + }; + } +} \ No newline at end of file diff --git a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php index adf24fe7..b35a66e6 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php @@ -94,6 +94,11 @@ class RequestPortalController extends Controller 'state_name' => MissionStates::name(MissionStates::END_MISSION->value), ]); + if ($mission->category_id == 2) { + $rpc = new OperatorController; + $rpc->store($mission); + } + $state = MissionStates::START_MISSION->value; $category = $request->category_id; $machine = CMMSMachine::query()->find($request->machine_id); diff --git a/app/Http/Controllers/V3/Dashboard/Mission/ViolationManagementController.php b/app/Http/Controllers/V3/Dashboard/Mission/ViolationManagementController.php index 4e6e95ad..7da66744 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/ViolationManagementController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/ViolationManagementController.php @@ -10,12 +10,15 @@ use App\Http\Controllers\Controller; use App\Http\Controllers\V3\Dashboard\RoadPatrol\OperatorController; use App\Http\Requests\V3\Mission\RequestPortal\NoProcessRequest; use App\Http\Traits\ApiResponse; +use App\Models\CMMSMachine; use App\Models\Mission; +use App\Models\MissionViolation; use App\Services\Cartables\Mission\DailyMoveMachineService; use Carbon\Carbon; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; +use Throwable; class ViolationManagementController extends Controller { @@ -28,9 +31,12 @@ class ViolationManagementController extends Controller return response()->json($data); } - public function noProcess(NoProcessRequest $request): JsonResponse + /** + * @throws Throwable + */ + public function noProcess(NoProcessRequest $request, MissionViolation $violation): JsonResponse { - DB::transaction(function () use ($request) { + DB::transaction(function () use ($request, $violation) { $start = Carbon::parse($request->start_date); $end = Carbon::parse($request->end_date); @@ -38,6 +44,7 @@ class ViolationManagementController extends Controller $user = auth()->user(); $zone = $request->zone; $state = MissionStates::END_MISSION->value; + $machine = CMMSMachine::query()->where('machine_code', '=', $violation->machine_code)->first(['id', 'machine_code']); $mission = Mission::query()->create([ 'user_id' => $user->id, @@ -50,22 +57,23 @@ class ViolationManagementController extends Controller 'zone_fa' => MissionZones::name($zone), 'type' => $type, 'type_fa' => MissionTypes::name($type), - 'start_date' => $request->start_date, - 'end_date' => $request->end_date, + 'start_date' => $request->start_date,// + 'end_date' => $request->end_date,// 'end_point' => $request->end_point, - 'area' => json_encode($request->area), + 'area' => json_encode($request->area),// 'category_id' => $request->category_id, 'category_name' => MissionCategory::name($request->category_id), - 'start_time' => $request->start_date, - 'finish_time' => $request->end_date, + 'start_time' => $request->start_date,// + 'finish_time' => $request->end_date,// 'state_id' => $state, 'state_name' => MissionStates::name($state), 'explanation' => $request->explanation, 'request_date' => now(), + 'machine_id' => $machine->id,// + 'machine_code' => $machine->machine_code,// ]); $mission->rahdaran()->sync($request->rahdaran); - $mission->machines()->attach($request->machines); $mission->rahdaran()->attach($request->driver, ['is_driver' => true]); if ($mission->category_id == 2) { diff --git a/app/Http/Controllers/V3/ProfileController.php b/app/Http/Controllers/V3/ProfileController.php index ab0eed0f..7dc9a448 100644 --- a/app/Http/Controllers/V3/ProfileController.php +++ b/app/Http/Controllers/V3/ProfileController.php @@ -31,6 +31,7 @@ class ProfileController extends Controller 'degree' => $user->degree, 'mobile' => $user->mobile, 'province_id' => $user->province_id, + 'city_id' => $user->city_id, 'avatar' => $user->avatarUrl(), ]); } diff --git a/database/migrations/2024_12_11_110000_create_rahdaran_table.php b/database/migrations/2024_12_11_110000_create_rahdaran_table.php index 615a1d74..32366a54 100644 --- a/database/migrations/2024_12_11_110000_create_rahdaran_table.php +++ b/database/migrations/2024_12_11_110000_create_rahdaran_table.php @@ -14,7 +14,7 @@ return new class extends Migration Schema::create('rahdaran', function (Blueprint $table) { $table->id(); $table->string('name'); - $table->string('code'); + $table->string('code')->nullable(); $table->timestamps(); }); } diff --git a/database/migrations/2025_12_20_103013_add_column_to_mission_violations_table.php b/database/migrations/2025_12_20_103013_add_column_to_mission_violations_table.php new file mode 100644 index 00000000..23c1457f --- /dev/null +++ b/database/migrations/2025_12_20_103013_add_column_to_mission_violations_table.php @@ -0,0 +1,28 @@ +smallInteger('status')->default(0); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('mission_violations', function (Blueprint $table) { + $table->dropColumn('status'); + }); + } +}; diff --git a/routes/v3.php b/routes/v3.php index 01351520..4bab477b 100644 --- a/routes/v3.php +++ b/routes/v3.php @@ -526,6 +526,7 @@ Route::prefix('missions') ->controller(ViolationManagementController::class) ->group(function () { Route::get('/', 'index')->name('index'); + Route::post('/no_process','noProcess')->name('noProcess'); }); });