Merge pull request #2 from witelgroup/feature/NikarayanJob

change no process cartable
2025-08-31 11:36:04 +03:30
parent a38ef4e16e db8a0e9021
commit 6231dc52b9
8 changed files with 91 additions and 57 deletions
--- a/app/Http/Controllers/V3/CMMSMachinesController.php
+++ b/app/Http/Controllers/V3/CMMSMachinesController.php
@@ -22,13 +22,13 @@ class CMMSMachinesController extends Controller
            $request,
            allowedFilters: ['*'],
            allowedSortings: ['*'],
-            allowedSelects: ['machine_code', 'id', 'plak_number', 'car_name']
+            allowedSelects: ['machine_code', 'id', 'plak_number', 'car_name', 'car_type']
        ));
    }

    public function list(): JsonResponse
    {
-        $machinesList = CMMSMachine::query()->get(['machine_code', 'id', 'plak_number', 'car_name']);
+        $machinesList = CMMSMachine::query()->get(['machine_code', 'id', 'plak_number', 'car_name', 'car_type']);

        return $this->successResponse($machinesList);
    }
--- a/app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php
+++ b/app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\V3\Dashboard\Harim;
 use App\Enums\HarimStates;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\V3\Dashboard\Harim\PanjareVahed\GetAccessRoadRequest;
+use App\Http\Requests\V3\Dashboard\Harim\PanjareVahed\ReceiveNewRequest;
 use App\Http\Traits\ApiResponse;
 use App\Models\City;
 use App\Models\Harim;
@@ -15,7 +16,7 @@ class PanjareVahedController extends Controller
 {
    use ApiResponse;

-    public function receiveNewRequests(Request $request)
+    public function receiveNewRequest(ReceiveNewRequest $request)
    {
        try {
            $city = City::query()
@@ -63,6 +64,7 @@ class PanjareVahedController extends Controller
            'province' => $city->province()->first()->name_fa,
        ]);
    }
+
    public function getAccessRoad(GetAccessRoadRequest $request)
    {
        $state = HarimStates::BARESI_FILE_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM->value;
--- a/app/Http/Controllers/V3/Dashboard/Mission/ControlUnitController.php
+++ b/app/Http/Controllers/V3/Dashboard/Mission/ControlUnitController.php
@@ -2,14 +2,10 @@

 namespace App\Http\Controllers\V3\Dashboard\Mission;

-use App\Enums\MissionCategory;
 use App\Enums\MissionStates;
-use App\Enums\MissionTypes;
-use App\Enums\MissionZones;
 use App\Events\V3\Dashboard\Mission\SendDataToFMSEvent;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\V3\Mission\ControlUnit\FinishRequest;
-use App\Http\Requests\V3\Mission\ControlUnit\NoProcessRequest;
 use App\Http\Requests\V3\Mission\ControlUnit\StartRequest;
 use App\Http\Traits\ApiResponse;
 use App\Models\Mission;
@@ -68,44 +64,4 @@ class ControlUnitController extends Controller

        return $this->successResponse();
    }
-
-
-    public function noProcess(NoProcessRequest $request): JsonResponse
-    {
-        DB::transaction(function () use ($request) {
-            $user = auth()->user();
-            $zone= $request->zone;
-            $type=  MissionTypes::NO_PROCESS->value;
-            $state = MissionStates::CREATED_NO_PROCESS->value;
-
-            $mission = Mission::query()->create([
-                'user_id' => $user->id,
-                'username' => $user->username,
-                'province_id' => $user->province_id,
-                'province_name' => $user->province_fa,
-                'edare_shahri_id' => $user->edarate_shahri_id ?? null,
-                'edare_shahri_name' => $user->edarate_shahri_name ?? null,
-                'zone' => $zone,
-                'zone_fa' => MissionZones::name($zone),
-                'type' => $type,
-                'type_fa' => MissionTypes::name($type),
-                'start_date' => $request->start_date,
-                'end_date' => $request->end_date,
-                'end_point' => $request->end_point,
-                '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,
-                'state_id' => $state,
-                'state_name' => MissionStates::name($state),
-            ]);
-
-            $mission->rahdaran()->sync($request->rahdaran);
-            $mission->machines()->attach($request->machines);
-            $mission->rahdaran()->attach($request->driver, ['is_driver' => true]);
-        });
-
-        return $this->successResponse();
-    }
 }
--- a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php
+++ b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php
@@ -8,6 +8,7 @@ use App\Enums\MissionTypes;
 use App\Enums\MissionZones;
 use App\Http\Controllers\Controller;
 use App\Http\Controllers\V3\Dashboard\RoadPatrol\OperatorController;
+use App\Http\Requests\V3\Mission\RequestPortal\NoProcessRequest;
 use App\Http\Requests\V3\Mission\RequestPortal\StoreRequest;
 use App\Http\Requests\V3\Mission\RequestPortal\UpdateRequest;
 use App\Http\Traits\ApiResponse;
@@ -123,4 +124,42 @@ class RequestPortalController extends Controller
        });
        return $this->successResponse();
    }
+    public function noProcess(NoProcessRequest $request): JsonResponse
+    {
+        DB::transaction(function () use ($request) {
+            $user = auth()->user();
+            $zone= $request->zone;
+            $type=  MissionTypes::NO_PROCESS->value;
+            $state = MissionStates::END_MISSION->value;
+
+            $mission = Mission::query()->create([
+                'user_id' => $user->id,
+                'username' => $user->username,
+                'province_id' => $user->province_id,
+                'province_name' => $user->province_fa,
+                'edare_shahri_id' => $user->edarate_shahri_id ?? null,
+                'edare_shahri_name' => $user->edarate_shahri_name ?? null,
+                'zone' => $zone,
+                'zone_fa' => MissionZones::name($zone),
+                'type' => $type,
+                'type_fa' => MissionTypes::name($type),
+                'start_date' => $request->start_date,
+                'end_date' => $request->end_date,
+                'end_point' => $request->end_point,
+                '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,
+                'state_id' => $state,
+                'state_name' => MissionStates::name($state),
+            ]);
+
+            $mission->rahdaran()->sync($request->rahdaran);
+            $mission->machines()->attach($request->machines);
+            $mission->rahdaran()->attach($request->driver, ['is_driver' => true]);
+        });
+
+        return $this->successResponse();
+    }
 }
--- a/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/ReceiveNewRequest.php
+++ b/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/ReceiveNewRequest.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Http\Requests\V3\Dashboard\Harim\PanjareVahed;
+
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+
+class ReceiveNewRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, ValidationRule|array|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'panjare_vahed_id' => 'required|integer',
+            'national_id' => 'required',
+            'phone_number' => 'required',
+            'request_date' => 'required',
+            'requested_organization' => 'required',
+            'plan_group' => 'required',
+            'plan_title' => 'required',
+            'worksheet_id' => 'required',
+            'response_options' => 'required',
+            'isic' => 'required',
+            'primary_area' => 'required',
+        ];
+    }
+}
--- a/app/Http/Requests/V3/Mission/RequestPortal/NoProcessRequest.php
+++ b/app/Http/Requests/V3/Mission/RequestPortal/NoProcessRequest.php
@@ -1,12 +1,9 @@
 <?php

-namespace App\Http\Requests\V3\Mission\ControlUnit;
+namespace App\Http\Requests\V3\Mission\RequestPortal;

-use App\Enums\MissionStates;
-use Carbon\Carbon;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Validator;

 class NoProcessRequest extends FormRequest
 {
@@ -45,8 +42,8 @@ class NoProcessRequest extends FormRequest
    public function messages(): array
    {
        return [
-            'end_date.before'   => 'تاریخ پایان باید قبل از زمان فعلی باشد.',
-            'end_date.after'    => 'تاریخ پایان نباید قبل از تاریخ شروع باشد.',
+            'end_date.before' => 'تاریخ پایان باید قبل از زمان فعلی باشد.',
+            'end_date.after' => 'تاریخ پایان نباید قبل از تاریخ شروع باشد.',
        ];
    }
 }
--- a/resources/views/v3/Reports/AccidentReceipt/ProvinceReport.blade.php
+++ b/resources/views/v3/Reports/AccidentReceipt/ProvinceReport.blade.php
@@ -101,7 +101,7 @@
                <td style="text-align: center;border:1px solid black;background-color: #DAEEF3;">
                    {{ $road['tedade'] }}</td>
                <td style="text-align: center;border:1px solid black;background-color: #DAEEF3;">
-                <<td style="text-align: center;border:1px solid black;background-color: #DAEEF3;">
+                <td style="text-align: center;border:1px solid black;background-color: #DAEEF3;">
                    {{ $road['egdam'] }}</td>
                <td style="text-align: center;border:1px solid black;background-color: #DAEEF3;">
                    {{ $road['pardakht'] }}</td>
--- a/routes/v3.php
+++ b/routes/v3.php
@@ -481,6 +481,7 @@ Route::prefix('missions')
            ->group(function () {
                Route::get('/', 'index')->name('index');
                Route::post('/', 'store')->name('store');
+                Route::post('/no_process','noProcess')->name('noProcess');
                Route::get('/{mission}', 'show')->name('show');
                Route::post('/{mission}', 'update')->name('update');
                Route::delete('/{mission}', 'destroy')->name('destroy');
@@ -501,7 +502,6 @@ Route::prefix('missions')
            ->controller(ControlUnitController::class)
            ->group(function () {
                Route::get('/', 'index')->name('index');
-                Route::post('/no_process','noProcess')->name('noProcess');
                Route::post('/start/{mission}', 'start')->name('start');
                Route::post('/finish/{mission}', 'finish')->name('finish');
            });
@@ -561,11 +561,12 @@ Route::prefix('harim')
                Route::post('/confirm_guarantee_letter_need/{harim}', 'confirmGuaranteeLetterNeed')->name('confirmGuaranteeLetterNeed');
                Route::get('/{harim}', 'show')->name('show');
            });
-        Route::prefix('panjarevahed')
+        Route::prefix('panjare_vahed')
            ->name('panjarevahed.')
            ->controller(PanjarevahedController::class)
            ->group(function () {
-                Route::post('/get_access_road','getAccessRoad')->name('getAccessRoad');
+                Route::post('/receive_new_request', 'receiveNewRequest')->name('receiveNewRequest');
+                Route::post('/receive_access_road','getAccessRoad')->name('getAccessRoad');
            });
    });