diff --git a/app/Enums/MissionStates.php b/app/Enums/MissionStates.php new file mode 100644 index 00000000..9a389cb4 --- /dev/null +++ b/app/Enums/MissionStates.php @@ -0,0 +1,28 @@ + 'درخواست ایجاد شد و در حال بررسی در توسط واحد نقلیه است', + 2 => 'خودرو اختصاص داده شد و درخواست توسط واحد کنترل در حال بررسی است', + 3 => 'درخواست توسط واحد کنترل تایید شد و ماموریت آغاز می شود', + 4 => 'اتمام ماموریت', + 5 => 'عدم تخصیص خودرو توسط واحد نقلیه و بازگشت درخواست به کارتابل کاربر', + 6 => 'عدم تایید توسط واحد کنترل', + ]; + + return $mapArray[$state]; + } +} \ No newline at end of file diff --git a/app/Http/Controllers/V3/Dashboard/Mission/CartableController.php b/app/Http/Controllers/V3/Dashboard/Mission/CartableController.php deleted file mode 100644 index 518bd4c8..00000000 --- a/app/Http/Controllers/V3/Dashboard/Mission/CartableController.php +++ /dev/null @@ -1,65 +0,0 @@ -json($requestPortalService->datatable($request)); + } + + public function store(StoreRequest $request): JsonResponse + { + DB::transaction(function () use ($request) { + $state = MissionStates::REQUEST_CREATED->value; + $mission = Mission::query()->create([ + 'user_id'=> auth()->user()->id, + 'state_id' =>$state, + 'state_name' => MissionStates::name($state), + 'requested_machine_type' => $request->requested_machine_type, + 'requested_machine_numbers' => $request->requested_machine_numbers, + 'type' => $request->type, + 'start_date' => $request->start_date, + 'end_date' => $request->end_date, + 'request_date' => $request->request_date, + 'description' => $request->description, + 'start_point' => $request->start_point, + 'end_point' => $request->end_point, + ]); + + $mission->rahdaran()->attach($request->rahdaran); + }); + + return $this->successResponse(); + } + + public function show(Mission $mission): JsonResponse + { + return $this->successResponse($mission); + } + + public function update(UpdateRequest $request,Mission $mission): JsonResponse + { + DB::transaction(function () use ($mission, $request) { + $state = MissionStates::REQUEST_CREATED->value; + $mission->update([ + 'state_id' =>$state, + 'state_name' => MissionStates::name($state), + 'requested_machine_type' => $request->requested_machine_type, + 'requested_machine_numbers' => $request->requested_machine_numbers, + 'type' => $request->type, + 'start_date' => $request->start_date, + 'end_date' => $request->end_date, + 'request_date' => $request->request_date, + 'description' => $request->description, + 'start_point' => $request->start_point, + 'end_point' => $request->end_point, + ]); + + $mission->rahdaran()->sync($request->rahdaran); + }); + + return $this->successResponse(); + } + + public function destroy(Mission $mission): JsonResponse + { + DB::transaction(function () use ($mission) { + $mission->rahdaran()->detach(); + $mission->delete(); + }); + return $this->successResponse(); + } +} diff --git a/app/Http/Controllers/V3/Dashboard/Mission/TransportationUnitController.php b/app/Http/Controllers/V3/Dashboard/Mission/TransportationUnitController.php new file mode 100644 index 00000000..1262df58 --- /dev/null +++ b/app/Http/Controllers/V3/Dashboard/Mission/TransportationUnitController.php @@ -0,0 +1,47 @@ +json($transportationUnitService->dataTable($request)); + } + + public function allocate(AllocateRequest $request, Mission $mission): JsonResponse + { + $mission->machines()->attach($request->machines); + + $state = MissionStates::PENDING_CONFIRMATION->value; + $mission->update([ + 'state_id' => $state, + 'state_name' => MissionStates::name($state), + ]); + + return $this->successResponse(); + } + + public function deallocate(Mission $mission): JsonResponse + { + $state = MissionStates::REJECT_BY_TRANSPORTATION->value; + + $mission->update([ + 'state_id' => $state, + 'state_name' => MissionStates::name($state), + ]); + + return $this->successResponse(); + } +} diff --git a/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/OperatorController.php b/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/OperatorController.php index b6726fe4..995233c1 100644 --- a/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/OperatorController.php +++ b/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/OperatorController.php @@ -17,7 +17,7 @@ use App\Http\Requests\V3\SafetyAndPrivacy\UpdateRequest; use App\Http\Traits\ApiResponse; use App\Models\InfoItem; use App\Models\SafetyAndPrivacy; -use App\Services\Cartables\SafetyAndPrivacyTableService; +use App\Services\Cartables\SafetyAndPrivacy\OperatorService; use App\Services\NominatimService; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; @@ -34,18 +34,18 @@ class OperatorController extends Controller /** * @throws Throwable */ - public function index(Request $request, SafetyAndPrivacyTableService $safetyAndPrivacyTableService): JsonResponse + public function index(Request $request, OperatorService $operatorService): JsonResponse { - return response()->json($safetyAndPrivacyTableService->operatorDatatable($request)); + return response()->json($operatorService->datatable($request)); } /** * @throws Throwable */ - public function excelReport(Request $request, SafetyAndPrivacyTableService $safetyAndPrivacyTableService): BinaryFileResponse + public function excelReport(Request $request, OperatorService $operatorService): BinaryFileResponse { $name = 'گزارش از نگهداری حریم راه ' . verta()->now()->format('Y-m-d H-i') . '.xlsx'; - $data = $safetyAndPrivacyTableService->operatorDatatable($request); + $data = $operatorService->datatable($request); return Excel::download(new OperatorCartableReport($data['data']), $name); } diff --git a/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/OperatorReportController.php b/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/OperatorReportController.php index 31b41c52..0e3c5e78 100644 --- a/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/OperatorReportController.php +++ b/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/OperatorReportController.php @@ -8,6 +8,7 @@ use App\Http\Controllers\Controller; use App\Http\Traits\ApiResponse; use App\Models\EdarateShahri; use App\Models\Province; +use App\Services\Cartables\SafetyAndPrivacy\OperatorService; use App\Services\Cartables\SafetyAndPrivacyTableService; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; @@ -18,34 +19,34 @@ class OperatorReportController extends Controller { use ApiResponse; - public function countryActivity(Request $request, SafetyAndPrivacyTableService $safetyAndPrivacyTableService): JsonResponse + public function countryActivity(Request $request, OperatorService $operatorService): JsonResponse { - $data = $safetyAndPrivacyTableService->countryActivity($request); + $data = $operatorService->countryActivity($request); return $this->successResponse([ 'activities' => $data, 'provinces' => Province::all(['id', 'name_fa']) ]); } - public function provinceActivity(Request $request, SafetyAndPrivacyTableService $safetyAndPrivacyTableService): JsonResponse + public function provinceActivity(Request $request, OperatorService $operatorService): JsonResponse { - $data = $safetyAndPrivacyTableService->provinceActivity($request); + $data = $operatorService->provinceActivity($request); return $this->successResponse([ 'activities' => $data, 'edarateShahri' => EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']), ]); } - public function countryExcelActivity(Request $request, SafetyAndPrivacyTableService $safetyAndPrivacyTableService): BinaryFileResponse + public function countryExcelActivity(Request $request, OperatorService $operatorService): BinaryFileResponse { - $data = $safetyAndPrivacyTableService->countryActivity($request); + $data = $operatorService->countryActivity($request); $name = 'گزارش از نگهداری حریم راه ' . verta()->now()->format('Y-m-d H-i') . '.xlsx'; return Excel::download(new CountryActivityReport($data), $name); } - public function provinceExcelActivity(Request $request, SafetyAndPrivacyTableService $safetyAndPrivacyTableService): BinaryFileResponse + public function provinceExcelActivity(Request $request, OperatorService $operatorService): BinaryFileResponse { - $data = $safetyAndPrivacyTableService->provinceActivity($request); + $data = $operatorService->provinceActivity($request); $name = 'گزارش از نگهداری حریم راه ' . verta()->now()->format('Y-m-d H-i') . '.xlsx'; return Excel::download(new ProvinceActivityReport($data, $request), $name); } diff --git a/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/SupervisorController.php b/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/SupervisorController.php index fc026166..0cd984c5 100644 --- a/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/SupervisorController.php +++ b/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/SupervisorController.php @@ -8,6 +8,7 @@ use App\Http\Controllers\Controller; use App\Http\Requests\V3\SafetyAndPrivacy\RejectRequest; use App\Http\Traits\ApiResponse; use App\Models\SafetyAndPrivacy; +use App\Services\Cartables\SafetyAndPrivacy\SupervisorService; use App\Services\Cartables\SafetyAndPrivacyTableService; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; @@ -22,18 +23,18 @@ class SupervisorController extends Controller /** * @throws Throwable */ - public function index(Request $request, SafetyAndPrivacyTableService $safetyAndPrivacyTableService): JsonResponse + public function index(Request $request, SupervisorService $supervisorService): JsonResponse { - return response()->json($safetyAndPrivacyTableService->supervisorDataTable($request)); + return response()->json($supervisorService->dataTable($request)); } /** * @throws Throwable */ - public function excelReport(Request $request, SafetyAndPrivacyTableService $safetyAndPrivacyTableService): BinaryFileResponse + public function excelReport(Request $request, SupervisorService $supervisorService): BinaryFileResponse { $name = 'گزارش از نگهداری حریم راه ' . verta()->now()->format('Y-m-d H-i') . '.xlsx'; - $data = $safetyAndPrivacyTableService->supervisorDataTable($request); + $data = $supervisorService->dataTable($request); return Excel::download(new SupervisorCartableReport($data['data']), $name); } diff --git a/app/Http/Requests/V3/Mission/RequestPortal/StoreRequest.php b/app/Http/Requests/V3/Mission/RequestPortal/StoreRequest.php new file mode 100644 index 00000000..62bd1984 --- /dev/null +++ b/app/Http/Requests/V3/Mission/RequestPortal/StoreRequest.php @@ -0,0 +1,38 @@ +|string> + */ + public function rules(): array + { + return [ + 'rahdaran' => 'required|array', + 'rahdaran.*' => 'exists:rahdaran,id', + 'requested_machine_type' => 'required|string|max:255', + 'requested_machine_numbers'=> 'required|integer|max:255', + 'type' => 'required|string|max:50', + 'start_date' => 'required|date', + 'end_date' => 'required|date', + 'request_date' => 'required|date', + 'description' => 'string', + 'start_point' => 'required|string', + 'end_point' => 'required|string', + ]; + } +} diff --git a/app/Http/Requests/V3/Mission/RequestPortal/UpdateRequest.php b/app/Http/Requests/V3/Mission/RequestPortal/UpdateRequest.php new file mode 100644 index 00000000..4498ea7b --- /dev/null +++ b/app/Http/Requests/V3/Mission/RequestPortal/UpdateRequest.php @@ -0,0 +1,38 @@ +route('mission'))->user_id === auth()->id(); + } + + /** + * Get the validation rules that apply to the request. + * + * @return array|string> + */ + public function rules(): array + { + return [ + 'rahdaran' => 'required|array', + 'rahdaran.*' => 'exists:rahdaran,id', + 'requested_machine_type' => 'required|string|max:255', + 'requested_machine_numbers'=> 'required|integer|max:255', + 'type' => 'required|string|max:50', + 'start_date' => 'required|date', + 'end_date' => 'required|date', + 'request_date' => 'required|date', + 'description' => 'string', + 'start_point' => 'required|string', + 'end_point' => 'required|string', + ]; + } +} diff --git a/app/Http/Requests/V3/Mission/TransportaionUnit/AllocateRequest.php b/app/Http/Requests/V3/Mission/TransportaionUnit/AllocateRequest.php new file mode 100644 index 00000000..bac0e6bd --- /dev/null +++ b/app/Http/Requests/V3/Mission/TransportaionUnit/AllocateRequest.php @@ -0,0 +1,29 @@ +mission->edare_shahri_id == auth()->user()->edarate_shahri_id; + } + + /** + * Get the validation rules that apply to the request. + * + * @return array|string> + */ + public function rules(): array + { + return [ + 'machines' => 'required|array', + 'machines.*' => 'required|integer|exists:cmms_machines,id', + ]; + } +} diff --git a/app/Models/Mission.php b/app/Models/Mission.php index a2184352..28ba82eb 100644 --- a/app/Models/Mission.php +++ b/app/Models/Mission.php @@ -26,4 +26,24 @@ class Mission extends Model { return $this->morphedByMany(RoadObserved::class, 'missionable'); } + + public function machines(): MorphToMany + { + return $this->morphToMany(CMMSMachine::class, + 'machinable', + 'machinables', + 'machinable_id', + 'machine_id' + ); + } + + public function rahdaran(): MorphToMany + { + return $this->morphToMany(Rahdaran::class, + 'rahdarable', + 'rahdarables', + 'rahdarable_id', + 'rahdar_id', + ); + } } diff --git a/app/Services/Cartables/Mission/RequestPortalService.php b/app/Services/Cartables/Mission/RequestPortalService.php new file mode 100644 index 00000000..c1757019 --- /dev/null +++ b/app/Services/Cartables/Mission/RequestPortalService.php @@ -0,0 +1,34 @@ +user(); + $query = Mission::query(); + + if ($user->hasPermissionTo('mission-manage-city')) { + $query->where('edarate_shahri_id', '=', $user->edarate_shahri_id); + } + elseif ($user->hasPermissionTo('mission-manage-province')) { + $query->where('province_id', '=', $user->province_id); + } + return DataTableFacade::run( + $query, + $request, + allowedFilters: ['*'], + allowedSortings: ['*'] + ); + + } +} \ No newline at end of file diff --git a/app/Services/Cartables/Mission/TransportationUnitService.php b/app/Services/Cartables/Mission/TransportationUnitService.php new file mode 100644 index 00000000..0f9a56a3 --- /dev/null +++ b/app/Services/Cartables/Mission/TransportationUnitService.php @@ -0,0 +1,33 @@ +user(); + + $fields = [ + 'id', '', '', '', '' + ]; + +// throw_if(is_null($user->edarate_shahri_id), new ProhibitedAction('اداره ای برای شما در سامانه ثبت نشده است!')); + + $query = Mission::query()->where('state_id', '=', MissionStates::REQUEST_CREATED->value); + + return DataTableFacade::run( + $query, + $request, + allowedFilters: ['*'], + allowedSortings: ['*'], + allowedSelects: $fields + ); + } +} \ No newline at end of file diff --git a/app/Services/Cartables/SafetyAndPrivacyTableService.php b/app/Services/Cartables/SafetyAndPrivacy/OperatorService.php similarity index 78% rename from app/Services/Cartables/SafetyAndPrivacyTableService.php rename to app/Services/Cartables/SafetyAndPrivacy/OperatorService.php index b6331901..f41270fd 100644 --- a/app/Services/Cartables/SafetyAndPrivacyTableService.php +++ b/app/Services/Cartables/SafetyAndPrivacy/OperatorService.php @@ -1,24 +1,15 @@ user(); @@ -41,37 +32,6 @@ class SafetyAndPrivacyTableService ); } - /** - * @throws Throwable - */ - public function supervisorDataTable(Request $request) - { - $user = auth()->user(); - - $fields = [ - 'id','lat','lon', 'recognize_picture','action_picture','created_at','status', 'final_description', 'province_fa', - 'info_fa', 'activity_date_time', 'action_picture_document_upload_date', 'judiciary_document_upload_date', 'edare_shahri_name', - 'step_fa', 'axis_type_id', 'axis_type_name', 'action_date', 'is_finished', 'status_fa', 'supervisor_description', 'operator_description' - ]; - - $query = SafetyAndPrivacy::query(); - - if ($user->hasPermissionTo('show-safety-and-privacy-operator-cartable-province')) - { - throw_if(is_null($user->province_id), new ProhibitedAction('استانی برای شما در سامانه ثبت نشده است!')); - - $query = $query->where('province_id', '=', $user->province_id); - } - - return DataTableFacade::run( - $query, - $request, - allowedFilters: ['*'], - allowedSortings: ['*'], - allowedSelects: $fields - ); - } - public function countryActivity(Request $request): array { $activities = []; @@ -186,4 +146,4 @@ class SafetyAndPrivacyTableService return array_values($activities); } -} +} \ No newline at end of file diff --git a/app/Services/Cartables/SafetyAndPrivacy/SupervisorService.php b/app/Services/Cartables/SafetyAndPrivacy/SupervisorService.php new file mode 100644 index 00000000..0579bc8b --- /dev/null +++ b/app/Services/Cartables/SafetyAndPrivacy/SupervisorService.php @@ -0,0 +1,39 @@ +user(); + + $fields = [ + 'id','lat','lon', 'recognize_picture','action_picture','created_at','status', 'final_description', 'province_fa', + 'info_fa', 'activity_date_time', 'action_picture_document_upload_date', 'judiciary_document_upload_date', 'edare_shahri_name', + 'step_fa', 'axis_type_id', 'axis_type_name', 'action_date', 'is_finished', 'status_fa', 'supervisor_description', 'operator_description' + ]; + + $query = SafetyAndPrivacy::query(); + + if ($user->hasPermissionTo('show-safety-and-privacy-operator-cartable-province')) + { + throw_if(is_null($user->province_id), new ProhibitedAction('استانی برای شما در سامانه ثبت نشده است!')); + + $query = $query->where('province_id', '=', $user->province_id); + } + + return DataTableFacade::run( + $query, + $request, + allowedFilters: ['*'], + allowedSortings: ['*'], + allowedSelects: $fields + ); + } +} \ No newline at end of file diff --git a/database/migrations/2025_05_17_103927_create_missions_table.php b/database/migrations/2025_05_17_103927_create_missions_table.php index af2a3340..adbad8a6 100644 --- a/database/migrations/2025_05_17_103927_create_missions_table.php +++ b/database/migrations/2025_05_17_103927_create_missions_table.php @@ -13,13 +13,17 @@ return new class extends Migration { Schema::create('missions', function (Blueprint $table) { $table->id(); - $table->foreignId('user_id')->constrained('users'); - $table->foreignId('machine_id')->nullable()->constrained('cmms_machines'); - $table->foreignId('rahdar_id')->constrained('rahdaran'); - $table->foreignId('state_id')->constrained('mission_states'); + $table->foreignId('user_id')->constrained('users')->cascadeOnDelete(); + $table->foreignId('machine_id')->nullable()->constrained('cmms_machines')->noActionOnDelete(); + $table->foreignId('rahdar_id')->constrained('rahdaran')->noActionOnDelete(); + $table->foreignId('state_id')->constrained('mission_states')->noActionOnDelete(); $table->string('state_name'); + $table->foreignId('province_id')->constrained('provinces')->noActionOnDelete(); + $table->string('province_name'); + $table->foreignId('edare_shahri_id')->constrained('edarate_shahri')->noActionOnDelete(); + $table->string('edare_shahri_name'); $table->string('requested_machine_type'); - $table->string('requested_machine_numbers'); + $table->integer('requested_machine_numbers'); $table->string('type'); $table->dateTime('start_date'); $table->dateTime('end_date'); diff --git a/routes/v3.php b/routes/v3.php index 4de8e0bc..ac3f0b46 100644 --- a/routes/v3.php +++ b/routes/v3.php @@ -7,6 +7,7 @@ use App\Http\Controllers\V3\Dashboard\Azmayesh\AzmayeshController; use App\Http\Controllers\V3\Dashboard\Azmayesh\AzmayeshSampleController; use App\Http\Controllers\V3\Dashboard\Azmayesh\AzmayeshTypeController; use App\Http\Controllers\V3\Dashboard\ItemsManagementController; +use App\Http\Controllers\V3\Dashboard\Mission\RequestPortalController; use App\Http\Controllers\V3\Dashboard\ObservedItemController; use App\Http\Controllers\V3\Dashboard\AccidentReceiptController; use App\Http\Controllers\V3\Dashboard\OtpManagementController; @@ -424,3 +425,13 @@ Route::prefix('road_maintenance_station') Route::post('/{rahdariPoint}', 'update')->name('update')->middleware('permission:edit-tollhouse|edit-tollhouse-province'); Route::delete('/{rahdariPoint}', 'destroy')->name('destroy')->middleware('permission:delete-tollhouse|delete-tollhouse-province'); }); +Route::prefix('missions') + ->name('missions.') + ->controller(RequestPortalController::class) + ->group(function () { + Route::get('/', 'index')->name('index'); + Route::post('/', 'store')->name('store'); + Route::get('/{mission}', 'show')->name('show'); + Route::post('/{mission}', 'update')->name('update'); + Route::delete('/{mission}', 'destroy')->name('destroy'); + });