From 8ee7379bac3769e0fe59da430f4286e4204c5592 Mon Sep 17 00:00:00 2001
From: joddyabott <faezehzafarbakhsh@gmail.com>
Date: Sun, 15 Jun 2025 14:43:36 +0330
Subject: [PATCH 01/16] improve road patrole controller and conect whit mission

---
 .../Dashboard/RoadPatrolProjectController.php |   9 +
 .../V3/RoadPatrole/OperateorController.php    | 288 ++++++++++++++++++
 .../RoadPatrole/OperateorReportController.php |  19 ++
 .../V3/RoadPatrole/SupervisorController.php   |  65 ++++
 .../SupervisorReportController.php            |  21 ++
 app/Models/Mission.php                        |   4 +
 ...6_add_mission_id_to_road_patrols_table.php |  29 ++
 7 files changed, 435 insertions(+)
 create mode 100644 app/Http/Controllers/V3/RoadPatrole/OperateorController.php
 create mode 100644 app/Http/Controllers/V3/RoadPatrole/OperateorReportController.php
 create mode 100644 app/Http/Controllers/V3/RoadPatrole/SupervisorController.php
 create mode 100644 app/Http/Controllers/V3/RoadPatrole/SupervisorReportController.php
 create mode 100644 database/migrations/2025_06_15_122716_add_mission_id_to_road_patrols_table.php

diff --git a/app/Http/Controllers/V3/Dashboard/RoadPatrolProjectController.php b/app/Http/Controllers/V3/Dashboard/RoadPatrolProjectController.php
index 98550c02..1d5892dd 100644
--- a/app/Http/Controllers/V3/Dashboard/RoadPatrolProjectController.php
+++ b/app/Http/Controllers/V3/Dashboard/RoadPatrolProjectController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\V3\Dashboard;
 
+use App\Enums\MissionStates;
 use App\Exports\V3\RoadPatrols\OperatorCartableReport;
 use App\Exports\V3\RoadPatrols\SupervisorCartableReport;
 use App\Facades\Sms\Sms;
@@ -11,6 +12,7 @@ use App\Http\Requests\V3\RoadPatrolProject\StoreRequest;
 use App\Http\Traits\ApiResponse;
 use App\Models\EdarateShahri;
 use App\Models\InfoItem;
+use App\Models\Mission;
 use App\Models\RoadItemsProject;
 use App\Models\RoadObserved;
 use App\Models\RoadPatrol;
@@ -110,6 +112,13 @@ class RoadPatrolProjectController extends Controller
 
         $road_patrol = DB::transaction(function () use ($request, $edare_id,
             $edare_name, $nominatimService, $user) {
+            $mission = Mission::findOrFail($request->mission_id);
+
+            if ($mission->status !== MissionStates::START_MISSION->value) {
+                throw ValidationException::withMessages([
+                    'mission_id' => 'ماموریت انتخاب شده هنوز شروع نشده است.',
+                ]);
+            }
 
             $road_patrol = RoadPatrol::query()->create([
                 'operator_id' => $user->id,
diff --git a/app/Http/Controllers/V3/RoadPatrole/OperateorController.php b/app/Http/Controllers/V3/RoadPatrole/OperateorController.php
new file mode 100644
index 00000000..fb47fe54
--- /dev/null
+++ b/app/Http/Controllers/V3/RoadPatrole/OperateorController.php
@@ -0,0 +1,288 @@
+<?php
+
+namespace App\Http\Controllers\V3\RoadPatrole;
+
+use App\Enums\MissionStates;
+use App\Facades\Sms\Sms;
+use App\Http\Controllers\Controller;
+use App\Http\Requests\V3\RoadPatrolProject\DeleteRequest;
+use App\Http\Requests\V3\RoadPatrolProject\StoreRequest;
+use App\Models\EdarateShahri;
+use App\Models\InfoItem;
+use App\Models\Mission;
+use App\Models\RoadItemsProject;
+use App\Models\RoadObserved;
+use App\Models\RoadPatrol;
+use App\Services\Cartables\RoadPatrolTableService;
+use App\Services\NominatimService;
+use Carbon\Carbon;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Validation\ValidationException;
+
+class OperateorController extends Controller
+{
+    public function operatorIndex(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
+    {
+        $data = $roadPatrolTableService->operatorCartableReport($request);
+        return response()->json($data);
+    }
+    public function delete(DeleteRequest $request, RoadPatrol $roadPatrol): JsonResponse
+    {
+        if ($request->type == 1) {
+            DB::transaction(function () use ($roadPatrol) {
+                $roadPatrol->observedItems()->delete();
+                $roadPatrol->delete();
+            });
+        } else {
+            DB::transaction(function () use ($roadPatrol) {
+                if ($roadPatrol->observedItems) {
+                    foreach ($roadPatrol->observedItems as $index => $observed_item) {
+                        if ($observed_item->roadItemProject) {
+                            $road_item = $observed_item->roadItemProject;
+
+                            if ($road_item->files()->exists()) {
+                                Storage::delete('public/'. $road_item->files[0]->path);
+                                Storage::delete('public/'. $road_item->files[1]->path);
+                                $road_item->files()->delete();
+                            }
+
+                            $road_item->delete();
+                        }
+
+                        $observed_item->delete();
+                    }
+                }
+                auth()->user()->addActivityComplete(1144);
+
+                $roadPatrol->delete();
+            });
+        }
+
+        return $this->successResponse();
+    }
+
+
+
+
+    public function store(StoreRequest $request, NominatimService $nominatimService): JsonResponse
+    {
+        $user = auth()->user();
+
+        if ($user->edarate_ostani_id || is_null($user->city_id)) {
+            return $this->errorResponse('امکان ثبت فعالیت برای ادارات استانی وجود ندارد!');
+        }
+
+        if (is_null($user->edarate_shahri_id)) {
+            return $this->errorResponse('اداره شهری برای شما در سامانه ثبت نشده است!');
+        }
+
+        $edare_id = $user->edarate_shahri_id ?? $user->edarate_ostani_id;
+        $edare_name = $user->edarate_shahri_id ? $user->edarate_shahri_name : $user->edarate_ostani_name;
+
+        $road_patrol = DB::transaction(function () use ($request, $edare_id,
+            $edare_name, $nominatimService, $user) {
+            $mission = Mission::findOrFail($request->mission_id);
+
+            if ($mission->status !== MissionStates::START_MISSION->value) {
+                throw ValidationException::withMessages([
+                    'mission_id' => 'ماموریت انتخاب شده هنوز شروع نشده است.',
+                ]);
+            }
+
+            $road_patrol = RoadPatrol::query()->create([
+                'operator_id' => $user->id,
+                'operator_name' => $user->name,
+                'province_id' => $user->province_id,
+                'province_fa' => $user->province_fa,
+                'city_id' => $user->city_id,
+                'city_fa' => $user->city_fa,
+                'edare_id' => $edare_id,
+                'edare_name' => $edare_name,
+                'status' => 0,
+                'status_fa' => 'در حال بررسی',
+                'distance' => $request->distance,
+                'start_time' => $request->start_time,
+                'end_time' => $request->end_time,
+                'description' => $request->description ?? null,
+                'fuel_consumption' => $request->fuel_consumption,
+                'vehicle_runtime' => $request->vehicle_runtime,
+                'stop_points' => json_encode($request->stop_points),
+            ]);
+
+            $road_patrol->rahdaran()->attach($request->road_patrol_rahdaran_id);
+            $road_patrol->cmmsMachines()->attach($request->road_patrol_machines_id);
+
+            if ($request->observed_items) {
+                foreach ($request->observed_items as $index => $item) {
+                    $info_item = InfoItem::where('item', $item['item_id'])
+                        ->where('sub_item', $item['sub_item_id'])
+                        ->firstOrFail();
+
+                    $item_start_coordinates = explode(',', $item['start_point']);
+
+                    $observed_item = $road_patrol->observedItems()->create([
+                        'item_id' => $info_item->item,
+                        'item_name' => $info_item->item_str,
+                        'sub_item_id' => $info_item->sub_item,
+                        'sub_item_name' => $info_item->sub_item_str,
+                        'local_name' => $item['local_name'],
+                        'description' => $item['description'] ?? null,
+                        'start_lat' => $item_start_coordinates[0],
+                        'start_lon' => $item_start_coordinates[1],
+                    ]);
+
+                    $item_end_coordinates = null;
+                    if ($item['instant_action'] == 0) {
+                        $priority = [
+                            1 => 'عادی',
+                            2 => 'فوری',
+                            3 => 'آنی',
+                        ];
+                        $observed_item->priority = $item['priority'];
+                        $observed_item->priority_fa = $priority[$item['priority']];
+                        $observed_item->save();
+                    } elseif ($item['instant_action'] == 1) {
+                        if ($info_item->needs_end_point) {
+                            if (!isset($item['end_point'])) {
+                                throw ValidationException::withMessages([
+                                    "observed_items.$index.end_point" => __('validation.required', ['attribute' => 'end_point']),
+                                ]);
+                            }
+
+                            $item_end_coordinates = explode(',', $item['end_point']);
+                        }
+
+                        $before_image = null;
+                        $after_image = null;
+                        if ($info_item->needs_image) {
+                            if (!isset($item['before_image'])) {
+                                throw ValidationException::withMessages([
+                                    "observed_items.$index.before_image" => __('validation.required', ['attribute' => 'before_image']),
+                                ]);
+                            }
+                            if (!isset($item['after_image'])) {
+                                throw ValidationException::withMessages([
+                                    "observed_items.$index.after_image" => __('validation.required', ['attribute' => 'after_image']),
+                                ]);
+                            }
+
+                            $before_image = $item['before_image'];
+                            $after_image = $item['after_image'];
+                        }
+
+                        $start_time = Carbon::createFromFormat('Y-m-d H:i', $request->start_time);
+                        $end_time = Carbon::createFromFormat('Y-m-d H:i', $request->end_time);
+                        $activity_date = $start_time->average($end_time);
+
+                        $attributes = [
+                            'start_lat' => $item_start_coordinates[0],
+                            'start_lng' => $item_start_coordinates[1],
+                            'end_lat' => $item_end_coordinates ? $item_end_coordinates[0] : null,
+                            'end_lng' => $item_end_coordinates ? $item_end_coordinates[1] : null,
+                            'item' => $info_item->item,
+                            'item_fa' => $info_item->item_str,
+                            'sub_item' => $info_item->sub_item,
+                            'sub_item_fa' => $info_item->sub_item_str,
+                            'sub_item_data' => $item['amount'],
+                            'province_id' => $user->province_id,
+                            'province_fa' => $user->province_fa,
+                            'city_id' => $user->city_id,
+                            'city_fa' => $user->city_fa,
+                            'user_name' => $user->name,
+                            'start_way_id' => $nominatimService->get_way_id_from_nominatim($item_start_coordinates[0], $item_start_coordinates[1]),
+                            'end_way_id' => $item_end_coordinates ? $nominatimService->get_way_id_from_nominatim($item_end_coordinates[0], $item_end_coordinates[1]) : null,
+                            'unit_fa' => $info_item->sub_item_unit,
+                            'created_at_fa' => verta(Carbon::now())->format('Y-m-d H:i:s'),
+                            'info_id' => $info_item->id,
+                            'status' => 0,
+                            'status_fa' => 'در حال بررسی',
+                            'edarat_id' => $user->edarate_shahri_id,
+                            'edarat_type' => EdarateShahri::class,
+                            'edarat_name' => $user->edarate_shahri_name,
+                            'activity_date' => $activity_date->format('Y-m-d'),
+                            'activity_time' => $activity_date->format('H:i:s'),
+                        ];
+
+                        $road_item = RoadItemsProject::store($user, $attributes, $before_image, $after_image, $observed_item->id);
+
+                        if ($road_item === -1) {
+                            return $this->errorResponse('اقدام مربوطه قبلا رسیدگی شده است.');
+                        }
+
+                        $road_item->rahdaran()->attach($item['road_item_rahdaran_id']);
+                        $road_item->cmmsMachines()->attach($item['road_item_machines_id']);
+                    }
+                }
+            }
+
+            auth()->user()->addActivityComplete(1147);
+
+            Sms::sendSms($request->officer_phone_number,
+                "گشت راهداری با کد یکتای $road_patrol->id در تاریخ ".verta(\Carbon\Carbon::now())->format('Y-m-d H:i:s')." با شماره شما در سامانه RMS ثبت شد. \n لینک دریافت گزارش : \n https://rms.rmto.ir/v2/road_patrols/operator/report/$road_patrol->id"
+            );
+            return $road_patrol;
+        });
+
+        return $this->successResponse();
+    }
+
+
+
+    public function map(Request  $request): JsonResponse
+    {
+        $province = $request->province_id;
+        $edare_shahri = $request->edare_shahri_id;
+        $status = $request->status;
+        $rms_status = $request->rms_status;
+
+        if ($request->from_date && $request->date_to) {
+            $date_from = $request->from_date.' 00:00:00';
+            $date_to = $request->date_to.' 23:59:59';
+        } else {
+            $date_from = Date('Y-m-d');
+            $date_to = new \DateTime('tomorrow');
+            $date_to = $date_to->format('Y-m-d');
+        }
+
+        $projects = RoadObserved::query()->select(['id', 'lng', 'lat','status'])
+            ->whereBetween('created_at', [$date_from, $date_to])
+            ->when($province, function ($query) use ($province) {
+                return $query->where('province_id', '=', $province);
+            })
+            ->when($rms_status, function ($query) use ($rms_status) {
+                if ($rms_status == 2) {
+                    return $query->where('rms_status', '<>', 0);
+                } else {
+                    return $query->where('rms_status', '=', 0);
+                }
+            })
+            ->when($edare_shahri, function ($query) use ($edare_shahri) {
+                return $query->where('edarate_shahri_id', '=', $edare_shahri);
+            })
+            ->when($status, function ($query) use ($status) {
+                return $query->where('status', '=', $status);
+            })
+            ->get();
+        return $this->successResponse($projects);
+    }
+
+    public function show(RoadPatrol $roadPatrol): JsonResponse
+    {
+        return $this->successResponse($roadPatrol);
+    }
+
+
+
+    public function roadPatrolMachine(RoadPatrol $roadPatrol): JsonResponse
+    {
+        return $this->successResponse($roadPatrol->cmmsMachines()->get(['cmms_machines.id', 'cmms_machines.machine_code', 'cmms_machines.car_name', 'cmms_machines.plak_number']));
+    }
+
+    public function roadPatrolRahdar(RoadPatrol $roadPatrol): JsonResponse
+    {
+        return $this->successResponse($roadPatrol->rahdaran()->get(['rahdaran.id', 'rahdaran.name', 'rahdaran.code']));
+    }
+}
diff --git a/app/Http/Controllers/V3/RoadPatrole/OperateorReportController.php b/app/Http/Controllers/V3/RoadPatrole/OperateorReportController.php
new file mode 100644
index 00000000..50ffb177
--- /dev/null
+++ b/app/Http/Controllers/V3/RoadPatrole/OperateorReportController.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\V3\RoadPatrole;
+
+use App\Exports\V3\RoadPatrols\OperatorCartableReport;
+use App\Http\Controllers\Controller;
+use App\Services\Cartables\RoadPatrolTableService;
+use Illuminate\Http\Request;
+use Maatwebsite\Excel\Facades\Excel;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+
+class OperateorReportController extends Controller
+{
+    public function operatorCartableReport(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
+    {
+        $name = 'گزارش از کارتابل عملیات گشت راهداری ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
+        $data = $roadPatrolTableService->operatorCartableReport($request, true);
+        return Excel::download(new OperatorCartableReport($data['data']), $name);
+    }}
diff --git a/app/Http/Controllers/V3/RoadPatrole/SupervisorController.php b/app/Http/Controllers/V3/RoadPatrole/SupervisorController.php
new file mode 100644
index 00000000..795ea953
--- /dev/null
+++ b/app/Http/Controllers/V3/RoadPatrole/SupervisorController.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Http\Controllers\V3\RoadPatrole;
+
+use App\Http\Controllers\Controller;
+use App\Http\Traits\ApiResponse;
+use App\Models\RoadPatrol;
+use App\Services\Cartables\RoadPatrolTableService;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Gate;
+
+class SupervisorController extends Controller
+{
+    use ApiResponse;
+
+    public function supervisorIndex(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
+    {
+        $data = $roadPatrolTableService->supervisorCartableReport($request);
+
+        foreach ($data['data'] as $road_patrol) {
+            if (Gate::allows('gate-supervise-road-item', $road_patrol)) {
+                $road_patrol['can_supervise'] = 1;
+            } else {
+                $road_patrol['can_supervise'] = 0;
+            }
+        }
+
+        return response()->json($data);
+    }
+    public function getReport(RoadPatrol $roadPatrol): JsonResponse
+    {
+        $data = [
+            'serial_no' => $roadPatrol->id,
+            'province_fa' => $roadPatrol->province_fa,
+            'edare_name' => $roadPatrol->edare_name,
+            'start_time' => $roadPatrol->start_time,
+            'end_time' => $roadPatrol->end_time,
+            'officer_name' => $roadPatrol->officer_name,
+            'officer_plaque' => $roadPatrol->officer_plaque,
+            'officer_phone_number' => $roadPatrol->officer_phone_number,
+            'created_at' => $roadPatrol->created_at
+        ];
+
+        $observed_items = array();
+        if($roadPatrol->observedItems) {
+            foreach ($roadPatrol->observedItems as $index => $observed_item) {
+                $observed_items[] = [
+                    'item' => $observed_item->item_name,
+                    'sub_item' => $observed_item->sub_item_name,
+                    'local_name' => $observed_item->local_name,
+                    'description' => $observed_item->description,
+                    'priority_fa' => $observed_item->priority_fa,
+                ];
+            }
+        }
+
+        $data['observed_items'] = $observed_items;
+        return $this->successResponse($data);
+    }
+    public function show(RoadPatrol $roadPatrol): JsonResponse
+    {
+        return $this->successResponse($roadPatrol);
+    }
+}
diff --git a/app/Http/Controllers/V3/RoadPatrole/SupervisorReportController.php b/app/Http/Controllers/V3/RoadPatrole/SupervisorReportController.php
new file mode 100644
index 00000000..42d12cbf
--- /dev/null
+++ b/app/Http/Controllers/V3/RoadPatrole/SupervisorReportController.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Controllers\V3\RoadPatrole;
+
+use App\Exports\V3\RoadPatrols\SupervisorCartableReport;
+use App\Http\Controllers\Controller;
+use App\Services\Cartables\RoadPatrolTableService;
+use Illuminate\Http\Request;
+use Maatwebsite\Excel\Facades\Excel;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+
+class SupervisorReportController extends Controller
+{
+    public function supervisorCartableReport(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
+    {
+        $name = 'گزارش از کارتابل ارزیابی گشت راهداری ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
+        $data = $roadPatrolTableService->supervisorCartableReport($request, true);
+        return Excel::download(new SupervisorCartableReport($data['data']), $name);
+    }
+
+}
diff --git a/app/Models/Mission.php b/app/Models/Mission.php
index c2dcb959..ba3878ad 100644
--- a/app/Models/Mission.php
+++ b/app/Models/Mission.php
@@ -67,4 +67,8 @@ class Mission extends Model
             'rahdar_id',
         );
     }
+    public function road_patrol():HasMany
+    {
+        return $this->hasMany(RoadPatrol::class);
+    }
 }
diff --git a/database/migrations/2025_06_15_122716_add_mission_id_to_road_patrols_table.php b/database/migrations/2025_06_15_122716_add_mission_id_to_road_patrols_table.php
new file mode 100644
index 00000000..ab5a63bf
--- /dev/null
+++ b/database/migrations/2025_06_15_122716_add_mission_id_to_road_patrols_table.php
@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('road_patrols', function (Blueprint $table) {
+        $table->foreignId('mission_id')->constrained('missions');
+    });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('road_patrols', function (Blueprint $table) {
+            $table->dropForeign(['mission_id']);
+            $table->dropColumn('mission_id');
+        });
+    }
+};

From 72b66d51f9caf15332aff70b67dc8d91c20b9d7a Mon Sep 17 00:00:00 2001
From: joddyabott <faezehzafarbakhsh@gmail.com>
Date: Sun, 15 Jun 2025 17:04:04 +0330
Subject: [PATCH 02/16] fix report

---
 .../RoadPatrole/OperateorController.php       |  11 +
 .../V3/RoadPatrole/OperateorController.php    | 291 ++----------------
 .../RoadPatrole/OperateorReportController.php |  22 +-
 .../V3/RoadPatrole/SupervisorController.php   |  53 +---
 .../SupervisorReportController.php            |  20 +-
 5 files changed, 79 insertions(+), 318 deletions(-)
 create mode 100644 app/Http/Controllers/RoadPatrole/OperateorController.php

diff --git a/app/Http/Controllers/RoadPatrole/OperateorController.php b/app/Http/Controllers/RoadPatrole/OperateorController.php
new file mode 100644
index 00000000..b3c23918
--- /dev/null
+++ b/app/Http/Controllers/RoadPatrole/OperateorController.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Http\Controllers\RoadPatrole;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+
+class OperateorController extends Controller
+{
+    //
+}
diff --git a/app/Http/Controllers/V3/RoadPatrole/OperateorController.php b/app/Http/Controllers/V3/RoadPatrole/OperateorController.php
index fb47fe54..da7bac2d 100644
--- a/app/Http/Controllers/V3/RoadPatrole/OperateorController.php
+++ b/app/Http/Controllers/V3/RoadPatrole/OperateorController.php
@@ -2,287 +2,52 @@
 
 namespace App\Http\Controllers\V3\RoadPatrole;
 
-use App\Enums\MissionStates;
-use App\Facades\Sms\Sms;
+
 use App\Http\Controllers\Controller;
-use App\Http\Requests\V3\RoadPatrolProject\DeleteRequest;
-use App\Http\Requests\V3\RoadPatrolProject\StoreRequest;
+use App\Http\Traits\ApiResponse;
 use App\Models\EdarateShahri;
-use App\Models\InfoItem;
-use App\Models\Mission;
-use App\Models\RoadItemsProject;
-use App\Models\RoadObserved;
 use App\Models\RoadPatrol;
 use App\Services\Cartables\RoadPatrolTableService;
-use App\Services\NominatimService;
-use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Storage;
-use Illuminate\Validation\ValidationException;
+
 
 class OperateorController extends Controller
 {
-    public function operatorIndex(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
+    use ApiResponse;
+    public function provincePatrolActivity(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
     {
-        $data = $roadPatrolTableService->operatorCartableReport($request);
-        return response()->json($data);
+        $request->validate(["province_id" => "required",]);
+
+        $activities = $roadPatrolTableService->provinceActivity($request);
+
+        $edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
+
+        return $this->successResponse([
+            'activities' => $activities['data'],
+            'edarateShahri' => $edarateShahri,
+        ]);
     }
-    public function delete(DeleteRequest $request, RoadPatrol $roadPatrol): JsonResponse
+    public function activitiesOnMap(Request $request): JsonResponse
     {
-        if ($request->type == 1) {
-            DB::transaction(function () use ($roadPatrol) {
-                $roadPatrol->observedItems()->delete();
-                $roadPatrol->delete();
-            });
-        } else {
-            DB::transaction(function () use ($roadPatrol) {
-                if ($roadPatrol->observedItems) {
-                    foreach ($roadPatrol->observedItems as $index => $observed_item) {
-                        if ($observed_item->roadItemProject) {
-                            $road_item = $observed_item->roadItemProject;
+        $date_from = $request->from_date ? $request->from_date .' 00:00:00' : now()->startOfDay()->toDateTimeString();
+        $date_to = $request->date_to ? $request->date_to.' 23:59:59' : now()->addDay()->startOfDay()->toDateTimeString();
+        $provinceId = $request->province_id;
+        $edareId = $request->edare_id;
 
-                            if ($road_item->files()->exists()) {
-                                Storage::delete('public/'. $road_item->files[0]->path);
-                                Storage::delete('public/'. $road_item->files[1]->path);
-                                $road_item->files()->delete();
-                            }
-
-                            $road_item->delete();
-                        }
-
-                        $observed_item->delete();
-                    }
-                }
-                auth()->user()->addActivityComplete(1144);
-
-                $roadPatrol->delete();
-            });
-        }
-
-        return $this->successResponse();
-    }
-
-
-
-
-    public function store(StoreRequest $request, NominatimService $nominatimService): JsonResponse
-    {
-        $user = auth()->user();
-
-        if ($user->edarate_ostani_id || is_null($user->city_id)) {
-            return $this->errorResponse('امکان ثبت فعالیت برای ادارات استانی وجود ندارد!');
-        }
-
-        if (is_null($user->edarate_shahri_id)) {
-            return $this->errorResponse('اداره شهری برای شما در سامانه ثبت نشده است!');
-        }
-
-        $edare_id = $user->edarate_shahri_id ?? $user->edarate_ostani_id;
-        $edare_name = $user->edarate_shahri_id ? $user->edarate_shahri_name : $user->edarate_ostani_name;
-
-        $road_patrol = DB::transaction(function () use ($request, $edare_id,
-            $edare_name, $nominatimService, $user) {
-            $mission = Mission::findOrFail($request->mission_id);
-
-            if ($mission->status !== MissionStates::START_MISSION->value) {
-                throw ValidationException::withMessages([
-                    'mission_id' => 'ماموریت انتخاب شده هنوز شروع نشده است.',
-                ]);
-            }
-
-            $road_patrol = RoadPatrol::query()->create([
-                'operator_id' => $user->id,
-                'operator_name' => $user->name,
-                'province_id' => $user->province_id,
-                'province_fa' => $user->province_fa,
-                'city_id' => $user->city_id,
-                'city_fa' => $user->city_fa,
-                'edare_id' => $edare_id,
-                'edare_name' => $edare_name,
-                'status' => 0,
-                'status_fa' => 'در حال بررسی',
-                'distance' => $request->distance,
-                'start_time' => $request->start_time,
-                'end_time' => $request->end_time,
-                'description' => $request->description ?? null,
-                'fuel_consumption' => $request->fuel_consumption,
-                'vehicle_runtime' => $request->vehicle_runtime,
-                'stop_points' => json_encode($request->stop_points),
-            ]);
-
-            $road_patrol->rahdaran()->attach($request->road_patrol_rahdaran_id);
-            $road_patrol->cmmsMachines()->attach($request->road_patrol_machines_id);
-
-            if ($request->observed_items) {
-                foreach ($request->observed_items as $index => $item) {
-                    $info_item = InfoItem::where('item', $item['item_id'])
-                        ->where('sub_item', $item['sub_item_id'])
-                        ->firstOrFail();
-
-                    $item_start_coordinates = explode(',', $item['start_point']);
-
-                    $observed_item = $road_patrol->observedItems()->create([
-                        'item_id' => $info_item->item,
-                        'item_name' => $info_item->item_str,
-                        'sub_item_id' => $info_item->sub_item,
-                        'sub_item_name' => $info_item->sub_item_str,
-                        'local_name' => $item['local_name'],
-                        'description' => $item['description'] ?? null,
-                        'start_lat' => $item_start_coordinates[0],
-                        'start_lon' => $item_start_coordinates[1],
-                    ]);
-
-                    $item_end_coordinates = null;
-                    if ($item['instant_action'] == 0) {
-                        $priority = [
-                            1 => 'عادی',
-                            2 => 'فوری',
-                            3 => 'آنی',
-                        ];
-                        $observed_item->priority = $item['priority'];
-                        $observed_item->priority_fa = $priority[$item['priority']];
-                        $observed_item->save();
-                    } elseif ($item['instant_action'] == 1) {
-                        if ($info_item->needs_end_point) {
-                            if (!isset($item['end_point'])) {
-                                throw ValidationException::withMessages([
-                                    "observed_items.$index.end_point" => __('validation.required', ['attribute' => 'end_point']),
-                                ]);
-                            }
-
-                            $item_end_coordinates = explode(',', $item['end_point']);
-                        }
-
-                        $before_image = null;
-                        $after_image = null;
-                        if ($info_item->needs_image) {
-                            if (!isset($item['before_image'])) {
-                                throw ValidationException::withMessages([
-                                    "observed_items.$index.before_image" => __('validation.required', ['attribute' => 'before_image']),
-                                ]);
-                            }
-                            if (!isset($item['after_image'])) {
-                                throw ValidationException::withMessages([
-                                    "observed_items.$index.after_image" => __('validation.required', ['attribute' => 'after_image']),
-                                ]);
-                            }
-
-                            $before_image = $item['before_image'];
-                            $after_image = $item['after_image'];
-                        }
-
-                        $start_time = Carbon::createFromFormat('Y-m-d H:i', $request->start_time);
-                        $end_time = Carbon::createFromFormat('Y-m-d H:i', $request->end_time);
-                        $activity_date = $start_time->average($end_time);
-
-                        $attributes = [
-                            'start_lat' => $item_start_coordinates[0],
-                            'start_lng' => $item_start_coordinates[1],
-                            'end_lat' => $item_end_coordinates ? $item_end_coordinates[0] : null,
-                            'end_lng' => $item_end_coordinates ? $item_end_coordinates[1] : null,
-                            'item' => $info_item->item,
-                            'item_fa' => $info_item->item_str,
-                            'sub_item' => $info_item->sub_item,
-                            'sub_item_fa' => $info_item->sub_item_str,
-                            'sub_item_data' => $item['amount'],
-                            'province_id' => $user->province_id,
-                            'province_fa' => $user->province_fa,
-                            'city_id' => $user->city_id,
-                            'city_fa' => $user->city_fa,
-                            'user_name' => $user->name,
-                            'start_way_id' => $nominatimService->get_way_id_from_nominatim($item_start_coordinates[0], $item_start_coordinates[1]),
-                            'end_way_id' => $item_end_coordinates ? $nominatimService->get_way_id_from_nominatim($item_end_coordinates[0], $item_end_coordinates[1]) : null,
-                            'unit_fa' => $info_item->sub_item_unit,
-                            'created_at_fa' => verta(Carbon::now())->format('Y-m-d H:i:s'),
-                            'info_id' => $info_item->id,
-                            'status' => 0,
-                            'status_fa' => 'در حال بررسی',
-                            'edarat_id' => $user->edarate_shahri_id,
-                            'edarat_type' => EdarateShahri::class,
-                            'edarat_name' => $user->edarate_shahri_name,
-                            'activity_date' => $activity_date->format('Y-m-d'),
-                            'activity_time' => $activity_date->format('H:i:s'),
-                        ];
-
-                        $road_item = RoadItemsProject::store($user, $attributes, $before_image, $after_image, $observed_item->id);
-
-                        if ($road_item === -1) {
-                            return $this->errorResponse('اقدام مربوطه قبلا رسیدگی شده است.');
-                        }
-
-                        $road_item->rahdaran()->attach($item['road_item_rahdaran_id']);
-                        $road_item->cmmsMachines()->attach($item['road_item_machines_id']);
-                    }
-                }
-            }
-
-            auth()->user()->addActivityComplete(1147);
-
-            Sms::sendSms($request->officer_phone_number,
-                "گشت راهداری با کد یکتای $road_patrol->id در تاریخ ".verta(\Carbon\Carbon::now())->format('Y-m-d H:i:s')." با شماره شما در سامانه RMS ثبت شد. \n لینک دریافت گزارش : \n https://rms.rmto.ir/v2/road_patrols/operator/report/$road_patrol->id"
-            );
-            return $road_patrol;
-        });
-
-        return $this->successResponse();
-    }
-
-
-
-    public function map(Request  $request): JsonResponse
-    {
-        $province = $request->province_id;
-        $edare_shahri = $request->edare_shahri_id;
-        $status = $request->status;
-        $rms_status = $request->rms_status;
-
-        if ($request->from_date && $request->date_to) {
-            $date_from = $request->from_date.' 00:00:00';
-            $date_to = $request->date_to.' 23:59:59';
-        } else {
-            $date_from = Date('Y-m-d');
-            $date_to = new \DateTime('tomorrow');
-            $date_to = $date_to->format('Y-m-d');
-        }
-
-        $projects = RoadObserved::query()->select(['id', 'lng', 'lat','status'])
+        $data = RoadPatrol::query()
+            ->when($provinceId, fn($query, $provinceId) => $query->where('province_id', '=', $provinceId))
+            ->when($edareId, fn($query, $edareId) => $query->where('edare_id', '=', $edareId))
             ->whereBetween('created_at', [$date_from, $date_to])
-            ->when($province, function ($query) use ($province) {
-                return $query->where('province_id', '=', $province);
-            })
-            ->when($rms_status, function ($query) use ($rms_status) {
-                if ($rms_status == 2) {
-                    return $query->where('rms_status', '<>', 0);
-                } else {
-                    return $query->where('rms_status', '=', 0);
-                }
-            })
-            ->when($edare_shahri, function ($query) use ($edare_shahri) {
-                return $query->where('edarate_shahri_id', '=', $edare_shahri);
-            })
-            ->when($status, function ($query) use ($status) {
-                return $query->where('status', '=', $status);
-            })
+            ->select('id', 'start_lat', 'start_lon')
             ->get();
-        return $this->successResponse($projects);
+
+        return $this->successResponse($data);
     }
 
-    public function show(RoadPatrol $roadPatrol): JsonResponse
+    public function showOnMap(RoadPatrol $roadPatrol): JsonResponse
     {
-        return $this->successResponse($roadPatrol);
+        return $this->successResponse($roadPatrol->load(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
     }
 
-
-
-    public function roadPatrolMachine(RoadPatrol $roadPatrol): JsonResponse
-    {
-        return $this->successResponse($roadPatrol->cmmsMachines()->get(['cmms_machines.id', 'cmms_machines.machine_code', 'cmms_machines.car_name', 'cmms_machines.plak_number']));
-    }
-
-    public function roadPatrolRahdar(RoadPatrol $roadPatrol): JsonResponse
-    {
-        return $this->successResponse($roadPatrol->rahdaran()->get(['rahdaran.id', 'rahdaran.name', 'rahdaran.code']));
-    }
 }
diff --git a/app/Http/Controllers/V3/RoadPatrole/OperateorReportController.php b/app/Http/Controllers/V3/RoadPatrole/OperateorReportController.php
index 50ffb177..f7f2e81c 100644
--- a/app/Http/Controllers/V3/RoadPatrole/OperateorReportController.php
+++ b/app/Http/Controllers/V3/RoadPatrole/OperateorReportController.php
@@ -3,7 +3,10 @@
 namespace App\Http\Controllers\V3\RoadPatrole;
 
 use App\Exports\V3\RoadPatrols\OperatorCartableReport;
+use App\Exports\V3\RoadPatrols\ProvinceActivity;
 use App\Http\Controllers\Controller;
+use App\Http\Traits\ApiResponse;
+use App\Models\EdarateShahri;
 use App\Services\Cartables\RoadPatrolTableService;
 use Illuminate\Http\Request;
 use Maatwebsite\Excel\Facades\Excel;
@@ -11,9 +14,18 @@ use Symfony\Component\HttpFoundation\BinaryFileResponse;
 
 class OperateorReportController extends Controller
 {
-    public function operatorCartableReport(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
+    use ApiResponse;
+    public function provinceActivityExcel(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
     {
-        $name = 'گزارش از کارتابل عملیات گشت راهداری ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
-        $data = $roadPatrolTableService->operatorCartableReport($request, true);
-        return Excel::download(new OperatorCartableReport($data['data']), $name);
-    }}
+        $activities = $roadPatrolTableService->provinceActivity($request);
+        $edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
+
+        $name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
+
+        return Excel::download(new ProvinceActivity([
+            'activities' => $activities,
+            'edarateShahri' => $edarateShahri,
+        ]), $name);
+    }
+
+}
diff --git a/app/Http/Controllers/V3/RoadPatrole/SupervisorController.php b/app/Http/Controllers/V3/RoadPatrole/SupervisorController.php
index 795ea953..cb94b6ff 100644
--- a/app/Http/Controllers/V3/RoadPatrole/SupervisorController.php
+++ b/app/Http/Controllers/V3/RoadPatrole/SupervisorController.php
@@ -4,62 +4,25 @@ namespace App\Http\Controllers\V3\RoadPatrole;
 
 use App\Http\Controllers\Controller;
 use App\Http\Traits\ApiResponse;
-use App\Models\RoadPatrol;
+use App\Models\Province;
 use App\Services\Cartables\RoadPatrolTableService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Gate;
 
 class SupervisorController extends Controller
 {
     use ApiResponse;
-
-    public function supervisorIndex(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
+    public function countryPatrolActivity(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
     {
-        $data = $roadPatrolTableService->supervisorCartableReport($request);
+        $activities = $roadPatrolTableService->countryActivity($request);
 
-        foreach ($data['data'] as $road_patrol) {
-            if (Gate::allows('gate-supervise-road-item', $road_patrol)) {
-                $road_patrol['can_supervise'] = 1;
-            } else {
-                $road_patrol['can_supervise'] = 0;
-            }
-        }
+        $provinces = Province::all(['id', 'name_fa']);
 
-        return response()->json($data);
+        return $this->successResponse([
+            'activities' => $activities['data'],
+            'provinces' => $provinces
+        ]);
     }
-    public function getReport(RoadPatrol $roadPatrol): JsonResponse
-    {
-        $data = [
-            'serial_no' => $roadPatrol->id,
-            'province_fa' => $roadPatrol->province_fa,
-            'edare_name' => $roadPatrol->edare_name,
-            'start_time' => $roadPatrol->start_time,
-            'end_time' => $roadPatrol->end_time,
-            'officer_name' => $roadPatrol->officer_name,
-            'officer_plaque' => $roadPatrol->officer_plaque,
-            'officer_phone_number' => $roadPatrol->officer_phone_number,
-            'created_at' => $roadPatrol->created_at
-        ];
 
-        $observed_items = array();
-        if($roadPatrol->observedItems) {
-            foreach ($roadPatrol->observedItems as $index => $observed_item) {
-                $observed_items[] = [
-                    'item' => $observed_item->item_name,
-                    'sub_item' => $observed_item->sub_item_name,
-                    'local_name' => $observed_item->local_name,
-                    'description' => $observed_item->description,
-                    'priority_fa' => $observed_item->priority_fa,
-                ];
-            }
-        }
 
-        $data['observed_items'] = $observed_items;
-        return $this->successResponse($data);
-    }
-    public function show(RoadPatrol $roadPatrol): JsonResponse
-    {
-        return $this->successResponse($roadPatrol);
-    }
 }
diff --git a/app/Http/Controllers/V3/RoadPatrole/SupervisorReportController.php b/app/Http/Controllers/V3/RoadPatrole/SupervisorReportController.php
index 42d12cbf..138894f2 100644
--- a/app/Http/Controllers/V3/RoadPatrole/SupervisorReportController.php
+++ b/app/Http/Controllers/V3/RoadPatrole/SupervisorReportController.php
@@ -2,8 +2,10 @@
 
 namespace App\Http\Controllers\V3\RoadPatrole;
 
-use App\Exports\V3\RoadPatrols\SupervisorCartableReport;
+use App\Exports\V3\RoadPatrols\CountryActivity;
 use App\Http\Controllers\Controller;
+use App\Http\Traits\ApiResponse;
+use App\Models\Province;
 use App\Services\Cartables\RoadPatrolTableService;
 use Illuminate\Http\Request;
 use Maatwebsite\Excel\Facades\Excel;
@@ -11,11 +13,19 @@ use Symfony\Component\HttpFoundation\BinaryFileResponse;
 
 class SupervisorReportController extends Controller
 {
-    public function supervisorCartableReport(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
+    use ApiResponse;
+    public function countryActivityExcel(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
     {
-        $name = 'گزارش از کارتابل ارزیابی گشت راهداری ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
-        $data = $roadPatrolTableService->supervisorCartableReport($request, true);
-        return Excel::download(new SupervisorCartableReport($data['data']), $name);
+        $activities = $roadPatrolTableService->countryActivity($request);
+        $provinces = Province::all(['id', 'name_fa']);
+
+        $name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
+
+        return Excel::download(new CountryActivity([
+            'activities' => $activities,
+            'provinces' => $provinces,
+        ]), $name);
     }
 
+
 }

From 6aa073f0aed599d11822239fac0b46cf976ea686 Mon Sep 17 00:00:00 2001
From: joddyabott <faezehzafarbakhsh@gmail.com>
Date: Sun, 15 Jun 2025 17:06:15 +0330
Subject: [PATCH 03/16] fix controller for report

---
 routes/v3.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/routes/v3.php b/routes/v3.php
index 68830950..0c92a6c0 100644
--- a/routes/v3.php
+++ b/routes/v3.php
@@ -237,6 +237,7 @@ Route::prefix('road_item_reports')
         Route::get('/show_on_map/{roadItemsProject}', 'showOnMap')->name('showOnMap');
     });
 
+
 Route::prefix('road_patrol_reports')
     ->name('roadPatrolReports.')
     ->controller(RoadPatrolReportController::class)

From d16effc80e1e8d3f3afbaded9eddc1b66edb9ce7 Mon Sep 17 00:00:00 2001
From: joddyabott <faezehzafarbakhsh@gmail.com>
Date: Mon, 16 Jun 2025 12:35:04 +0330
Subject: [PATCH 04/16] change structure of road patrol

---
 .../RoadPatrole/OperateorController.php       | 11 -----
 .../Dashboard/RoadPatrolProjectController.php |  4 +-
 ...eorController.php => DetailController.php} | 18 +-------
 ...tController.php => OperatorController.php} | 20 ++++++++-
 .../V3/RoadPatrole/SupervisorController.php   | 16 +++++++
 .../SupervisorReportController.php            | 31 -------------
 .../DeleteRequest.php                         |  2 +-
 .../StoreRequest.php                          |  2 +-
 routes/v3.php                                 | 44 ++++++++++++++-----
 9 files changed, 73 insertions(+), 75 deletions(-)
 delete mode 100644 app/Http/Controllers/RoadPatrole/OperateorController.php
 rename app/Http/Controllers/V3/RoadPatrole/{OperateorController.php => DetailController.php} (65%)
 rename app/Http/Controllers/V3/RoadPatrole/{OperateorReportController.php => OperatorController.php} (62%)
 delete mode 100644 app/Http/Controllers/V3/RoadPatrole/SupervisorReportController.php
 rename app/Http/Requests/V3/{RoadPatrolProject => RoadPatrol}/DeleteRequest.php (92%)
 rename app/Http/Requests/V3/{RoadPatrolProject => RoadPatrol}/StoreRequest.php (98%)

diff --git a/app/Http/Controllers/RoadPatrole/OperateorController.php b/app/Http/Controllers/RoadPatrole/OperateorController.php
deleted file mode 100644
index b3c23918..00000000
--- a/app/Http/Controllers/RoadPatrole/OperateorController.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\RoadPatrole;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-
-class OperateorController extends Controller
-{
-    //
-}
diff --git a/app/Http/Controllers/V3/Dashboard/RoadPatrolProjectController.php b/app/Http/Controllers/V3/Dashboard/RoadPatrolProjectController.php
index 1d5892dd..3d0de3b9 100644
--- a/app/Http/Controllers/V3/Dashboard/RoadPatrolProjectController.php
+++ b/app/Http/Controllers/V3/Dashboard/RoadPatrolProjectController.php
@@ -7,8 +7,8 @@ use App\Exports\V3\RoadPatrols\OperatorCartableReport;
 use App\Exports\V3\RoadPatrols\SupervisorCartableReport;
 use App\Facades\Sms\Sms;
 use App\Http\Controllers\Controller;
-use App\Http\Requests\V3\RoadPatrolProject\DeleteRequest;
-use App\Http\Requests\V3\RoadPatrolProject\StoreRequest;
+use App\Http\Requests\V3\RoadPatrol\DeleteRequest;
+use App\Http\Requests\V3\RoadPatrol\StoreRequest;
 use App\Http\Traits\ApiResponse;
 use App\Models\EdarateShahri;
 use App\Models\InfoItem;
diff --git a/app/Http/Controllers/V3/RoadPatrole/OperateorController.php b/app/Http/Controllers/V3/RoadPatrole/DetailController.php
similarity index 65%
rename from app/Http/Controllers/V3/RoadPatrole/OperateorController.php
rename to app/Http/Controllers/V3/RoadPatrole/DetailController.php
index da7bac2d..a80483de 100644
--- a/app/Http/Controllers/V3/RoadPatrole/OperateorController.php
+++ b/app/Http/Controllers/V3/RoadPatrole/DetailController.php
@@ -2,32 +2,16 @@
 
 namespace App\Http\Controllers\V3\RoadPatrole;
 
-
 use App\Http\Controllers\Controller;
 use App\Http\Traits\ApiResponse;
-use App\Models\EdarateShahri;
 use App\Models\RoadPatrol;
-use App\Services\Cartables\RoadPatrolTableService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
 
-class OperateorController extends Controller
+class DetailController extends Controller
 {
     use ApiResponse;
-    public function provincePatrolActivity(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
-    {
-        $request->validate(["province_id" => "required",]);
-
-        $activities = $roadPatrolTableService->provinceActivity($request);
-
-        $edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
-
-        return $this->successResponse([
-            'activities' => $activities['data'],
-            'edarateShahri' => $edarateShahri,
-        ]);
-    }
     public function activitiesOnMap(Request $request): JsonResponse
     {
         $date_from = $request->from_date ? $request->from_date .' 00:00:00' : now()->startOfDay()->toDateTimeString();
diff --git a/app/Http/Controllers/V3/RoadPatrole/OperateorReportController.php b/app/Http/Controllers/V3/RoadPatrole/OperatorController.php
similarity index 62%
rename from app/Http/Controllers/V3/RoadPatrole/OperateorReportController.php
rename to app/Http/Controllers/V3/RoadPatrole/OperatorController.php
index f7f2e81c..2978d112 100644
--- a/app/Http/Controllers/V3/RoadPatrole/OperateorReportController.php
+++ b/app/Http/Controllers/V3/RoadPatrole/OperatorController.php
@@ -2,19 +2,35 @@
 
 namespace App\Http\Controllers\V3\RoadPatrole;
 
-use App\Exports\V3\RoadPatrols\OperatorCartableReport;
+
 use App\Exports\V3\RoadPatrols\ProvinceActivity;
 use App\Http\Controllers\Controller;
 use App\Http\Traits\ApiResponse;
 use App\Models\EdarateShahri;
 use App\Services\Cartables\RoadPatrolTableService;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Maatwebsite\Excel\Facades\Excel;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 
-class OperateorReportController extends Controller
+
+class OperatorController extends Controller
 {
     use ApiResponse;
+    public function provincePatrolActivity(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
+    {
+        $request->validate(["province_id" => "required",]);
+
+        $activities = $roadPatrolTableService->provinceActivity($request);
+
+        $edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
+
+        return $this->successResponse([
+            'activities' => $activities['data'],
+            'edarateShahri' => $edarateShahri,
+        ]);
+    }
+
     public function provinceActivityExcel(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
     {
         $activities = $roadPatrolTableService->provinceActivity($request);
diff --git a/app/Http/Controllers/V3/RoadPatrole/SupervisorController.php b/app/Http/Controllers/V3/RoadPatrole/SupervisorController.php
index cb94b6ff..44567a63 100644
--- a/app/Http/Controllers/V3/RoadPatrole/SupervisorController.php
+++ b/app/Http/Controllers/V3/RoadPatrole/SupervisorController.php
@@ -2,12 +2,15 @@
 
 namespace App\Http\Controllers\V3\RoadPatrole;
 
+use App\Exports\V3\RoadPatrols\CountryActivity;
 use App\Http\Controllers\Controller;
 use App\Http\Traits\ApiResponse;
 use App\Models\Province;
 use App\Services\Cartables\RoadPatrolTableService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Maatwebsite\Excel\Facades\Excel;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
 
 class SupervisorController extends Controller
 {
@@ -23,6 +26,19 @@ class SupervisorController extends Controller
             'provinces' => $provinces
         ]);
     }
+    public function countryActivityExcel(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
+    {
+        $activities = $roadPatrolTableService->countryActivity($request);
+        $provinces = Province::all(['id', 'name_fa']);
+
+        $name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
+
+        return Excel::download(new CountryActivity([
+            'activities' => $activities,
+            'provinces' => $provinces,
+        ]), $name);
+    }
+
 
 
 }
diff --git a/app/Http/Controllers/V3/RoadPatrole/SupervisorReportController.php b/app/Http/Controllers/V3/RoadPatrole/SupervisorReportController.php
deleted file mode 100644
index 138894f2..00000000
--- a/app/Http/Controllers/V3/RoadPatrole/SupervisorReportController.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\V3\RoadPatrole;
-
-use App\Exports\V3\RoadPatrols\CountryActivity;
-use App\Http\Controllers\Controller;
-use App\Http\Traits\ApiResponse;
-use App\Models\Province;
-use App\Services\Cartables\RoadPatrolTableService;
-use Illuminate\Http\Request;
-use Maatwebsite\Excel\Facades\Excel;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;
-
-class SupervisorReportController extends Controller
-{
-    use ApiResponse;
-    public function countryActivityExcel(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
-    {
-        $activities = $roadPatrolTableService->countryActivity($request);
-        $provinces = Province::all(['id', 'name_fa']);
-
-        $name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
-
-        return Excel::download(new CountryActivity([
-            'activities' => $activities,
-            'provinces' => $provinces,
-        ]), $name);
-    }
-
-
-}
diff --git a/app/Http/Requests/V3/RoadPatrolProject/DeleteRequest.php b/app/Http/Requests/V3/RoadPatrol/DeleteRequest.php
similarity index 92%
rename from app/Http/Requests/V3/RoadPatrolProject/DeleteRequest.php
rename to app/Http/Requests/V3/RoadPatrol/DeleteRequest.php
index b6527892..128c020f 100644
--- a/app/Http/Requests/V3/RoadPatrolProject/DeleteRequest.php
+++ b/app/Http/Requests/V3/RoadPatrol/DeleteRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\V3\RoadPatrolProject;
+namespace App\Http\Requests\V3\RoadPatrol;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Http/Requests/V3/RoadPatrolProject/StoreRequest.php b/app/Http/Requests/V3/RoadPatrol/StoreRequest.php
similarity index 98%
rename from app/Http/Requests/V3/RoadPatrolProject/StoreRequest.php
rename to app/Http/Requests/V3/RoadPatrol/StoreRequest.php
index 5b82d689..30c4d899 100644
--- a/app/Http/Requests/V3/RoadPatrolProject/StoreRequest.php
+++ b/app/Http/Requests/V3/RoadPatrol/StoreRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\V3\RoadPatrolProject;
+namespace App\Http\Requests\V3\RoadPatrol;
 
 use App\Rules\VerificationCode;
 use Illuminate\Foundation\Http\FormRequest;
diff --git a/routes/v3.php b/routes/v3.php
index 0c92a6c0..2f94345b 100644
--- a/routes/v3.php
+++ b/routes/v3.php
@@ -237,19 +237,43 @@ Route::prefix('road_item_reports')
         Route::get('/show_on_map/{roadItemsProject}', 'showOnMap')->name('showOnMap');
     });
 
-
-Route::prefix('road_patrol_reports')
-    ->name('roadPatrolReports.')
-    ->controller(RoadPatrolReportController::class)
+Route::prefix('road_patrol')
     ->group(function () {
-        Route::get('/country_activity', 'countryPatrolActivity')->name('countryPatrolActivity');
-        Route::get('/province_activity', 'provincePatrolActivity')->name('provincePatrolActivity');
-        Route::get('/country_activity_excel', 'countryActivityExcel')->name('countryActivityExcel');
-        Route::get('/province_activity_excel', 'provinceActivityExcel')->name('provinceActivityExcel');
-        Route::get('/activities_on_map', 'activitiesOnMap')->name('activitiesOnMap');
-        Route::get('/show_on_map/{roadPatrol}', 'showOnMap')->name('showOnMap');
+        Route::prefix('details')
+            ->name('details.')
+            ->controller(\App\Http\Controllers\V3\RoadPatrole\DetailController::class)
+            ->group(function () {
+                Route::get('/activities_on_map', 'activitiesOnMap')->name('activitiesOnMap');
+                Route::get('/show_on_map/{roadPatrol}', 'showOnMap')->name('showOnMap');
+            });
+        Route::prefix('operator')
+            ->name('operator.')
+            ->controller(App\Http\Controllers\V3\RoadPatrole\OperatorController::class)
+            ->group(function () {
+                Route::get('/province_activity', 'provincePatrolActivity')->name('provincePatrolActivity');
+                Route::get('/province_activity_excel', 'provinceActivityExcel')->name('provinceActivityExcel');
+            });
+        Route::prefix('supervisor')
+            ->name('supervisor.')
+            ->controller(App\Http\Controllers\V3\RoadPatrole\SupervisorController::class)
+            ->group(function () {
+                Route::get('/country_activity', 'countryPatrolActivity')->name('countryPatrolActivity');
+                Route::get('/province_activity_excel', 'provinceActivityExcel')->name('provinceActivityExcel');
+            });
     });
 
+//Route::prefix('road_patrol_reports')
+//    ->name('roadPatrolReports.')
+//    ->controller(RoadPatrolReportController::class)
+//    ->group(function () {
+//        Route::get('/country_activity', 'countryPatrolActivity')->name('countryPatrolActivity');
+//        Route::get('/province_activity', 'provincePatrolActivity')->name('provincePatrolActivity');
+//        Route::get('/country_activity_excel', 'countryActivityExcel')->name('countryActivityExcel');
+//        Route::get('/province_activity_excel', 'provinceActivityExcel')->name('provinceActivityExcel');
+//        Route::get('/activities_on_map', 'activitiesOnMap')->name('activitiesOnMap');
+//        Route::get('/show_on_map/{roadPatrol}', 'showOnMap')->name('showOnMap');
+//    });
+
 Route::prefix('damages')
     ->name('damages.')
     ->middleware('permission:manage-damage')

From a5e5365177a0d79aac88048ec6698f7a45c9850a Mon Sep 17 00:00:00 2001
From: joddyabott <faezehzafarbakhsh@gmail.com>
Date: Mon, 16 Jun 2025 14:40:01 +0330
Subject: [PATCH 05/16] change structure of road patrol and route

---
 .../V3/RoadPatrole/DetailController.php       | 292 ++++++++++++++++++
 .../V3/RoadPatrole/OperatorController.php     |  12 +
 .../V3/RoadPatrole/SupervisorController.php   |  22 ++
 routes/v3.php                                 |  98 +++---
 4 files changed, 388 insertions(+), 36 deletions(-)

diff --git a/app/Http/Controllers/V3/RoadPatrole/DetailController.php b/app/Http/Controllers/V3/RoadPatrole/DetailController.php
index a80483de..77204e6b 100644
--- a/app/Http/Controllers/V3/RoadPatrole/DetailController.php
+++ b/app/Http/Controllers/V3/RoadPatrole/DetailController.php
@@ -2,11 +2,25 @@
 
 namespace App\Http\Controllers\V3\RoadPatrole;
 
+use App\Enums\MissionStates;
+use App\Facades\Sms\Sms;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\V3\RoadPatrol\DeleteRequest;
+use App\Http\Requests\V3\RoadPatrol\StoreRequest;
 use App\Http\Traits\ApiResponse;
+use App\Models\EdarateShahri;
+use App\Models\InfoItem;
+use App\Models\Mission;
+use App\Models\RoadItemsProject;
+use App\Models\RoadObserved;
 use App\Models\RoadPatrol;
+use App\Services\NominatimService;
+use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Validation\ValidationException;
 
 
 class DetailController extends Controller
@@ -33,5 +47,283 @@ class DetailController extends Controller
     {
         return $this->successResponse($roadPatrol->load(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
     }
+    public function delete(DeleteRequest $request, RoadPatrol $roadPatrol): JsonResponse
+    {
+        if ($request->type == 1) {
+            DB::transaction(function () use ($roadPatrol) {
+                $roadPatrol->observedItems()->delete();
+                $roadPatrol->delete();
+            });
+        } else {
+            DB::transaction(function () use ($roadPatrol) {
+                if ($roadPatrol->observedItems) {
+                    foreach ($roadPatrol->observedItems as $index => $observed_item) {
+                        if ($observed_item->roadItemProject) {
+                            $road_item = $observed_item->roadItemProject;
+
+                            if ($road_item->files()->exists()) {
+                                Storage::delete('public/' . $road_item->files[0]->path);
+                                Storage::delete('public/' . $road_item->files[1]->path);
+                                $road_item->files()->delete();
+                            }
+
+                            $road_item->delete();
+                        }
+
+                        $observed_item->delete();
+                    }
+                }
+                auth()->user()->addActivityComplete(1144);
+
+                $roadPatrol->delete();
+            });
+        }
+
+        return $this->successResponse();
+    }
+    public function store(StoreRequest $request, NominatimService $nominatimService): JsonResponse
+    {
+        $user = auth()->user();
+
+        if ($user->edarate_ostani_id || is_null($user->city_id)) {
+            return $this->errorResponse('امکان ثبت فعالیت برای ادارات استانی وجود ندارد!');
+        }
+
+        if (is_null($user->edarate_shahri_id)) {
+            return $this->errorResponse('اداره شهری برای شما در سامانه ثبت نشده است!');
+        }
+
+        $edare_id = $user->edarate_shahri_id ?? $user->edarate_ostani_id;
+        $edare_name = $user->edarate_shahri_id ? $user->edarate_shahri_name : $user->edarate_ostani_name;
+
+        $road_patrol = DB::transaction(function () use ($request, $edare_id,
+            $edare_name, $nominatimService, $user) {
+            $mission = Mission::findOrFail($request->mission_id);
+
+            if ($mission->status !== MissionStates::START_MISSION->value) {
+                throw ValidationException::withMessages([
+                    'mission_id' => 'ماموریت انتخاب شده هنوز شروع نشده است.',
+                ]);
+            }
+
+            $road_patrol = RoadPatrol::query()->create([
+                'operator_id' => $user->id,
+                'operator_name' => $user->name,
+                'province_id' => $user->province_id,
+                'province_fa' => $user->province_fa,
+                'city_id' => $user->city_id,
+                'city_fa' => $user->city_fa,
+                'edare_id' => $edare_id,
+                'edare_name' => $edare_name,
+                'status' => 0,
+                'status_fa' => 'در حال بررسی',
+                'distance' => $request->distance,
+                'start_time' => $request->start_time,
+                'end_time' => $request->end_time,
+                'description' => $request->description ?? null,
+                'fuel_consumption' => $request->fuel_consumption,
+                'vehicle_runtime' => $request->vehicle_runtime,
+                'stop_points' => json_encode($request->stop_points),
+            ]);
+
+            $road_patrol->rahdaran()->attach($request->road_patrol_rahdaran_id);
+            $road_patrol->cmmsMachines()->attach($request->road_patrol_machines_id);
+
+            if ($request->observed_items) {
+                foreach ($request->observed_items as $index => $item) {
+                    $info_item = InfoItem::where('item', $item['item_id'])
+                        ->where('sub_item', $item['sub_item_id'])
+                        ->firstOrFail();
+
+                    $item_start_coordinates = explode(',', $item['start_point']);
+
+                    $observed_item = $road_patrol->observedItems()->create([
+                        'item_id' => $info_item->item,
+                        'item_name' => $info_item->item_str,
+                        'sub_item_id' => $info_item->sub_item,
+                        'sub_item_name' => $info_item->sub_item_str,
+                        'local_name' => $item['local_name'],
+                        'description' => $item['description'] ?? null,
+                        'start_lat' => $item_start_coordinates[0],
+                        'start_lon' => $item_start_coordinates[1],
+                    ]);
+
+                    $item_end_coordinates = null;
+                    if ($item['instant_action'] == 0) {
+                        $priority = [
+                            1 => 'عادی',
+                            2 => 'فوری',
+                            3 => 'آنی',
+                        ];
+                        $observed_item->priority = $item['priority'];
+                        $observed_item->priority_fa = $priority[$item['priority']];
+                        $observed_item->save();
+                    } elseif ($item['instant_action'] == 1) {
+                        if ($info_item->needs_end_point) {
+                            if (!isset($item['end_point'])) {
+                                throw ValidationException::withMessages([
+                                    "observed_items.$index.end_point" => __('validation.required', ['attribute' => 'end_point']),
+                                ]);
+                            }
+
+                            $item_end_coordinates = explode(',', $item['end_point']);
+                        }
+
+                        $before_image = null;
+                        $after_image = null;
+                        if ($info_item->needs_image) {
+                            if (!isset($item['before_image'])) {
+                                throw ValidationException::withMessages([
+                                    "observed_items.$index.before_image" => __('validation.required', ['attribute' => 'before_image']),
+                                ]);
+                            }
+                            if (!isset($item['after_image'])) {
+                                throw ValidationException::withMessages([
+                                    "observed_items.$index.after_image" => __('validation.required', ['attribute' => 'after_image']),
+                                ]);
+                            }
+
+                            $before_image = $item['before_image'];
+                            $after_image = $item['after_image'];
+                        }
+
+                        $start_time = Carbon::createFromFormat('Y-m-d H:i', $request->start_time);
+                        $end_time = Carbon::createFromFormat('Y-m-d H:i', $request->end_time);
+                        $activity_date = $start_time->average($end_time);
+
+                        $attributes = [
+                            'start_lat' => $item_start_coordinates[0],
+                            'start_lng' => $item_start_coordinates[1],
+                            'end_lat' => $item_end_coordinates ? $item_end_coordinates[0] : null,
+                            'end_lng' => $item_end_coordinates ? $item_end_coordinates[1] : null,
+                            'item' => $info_item->item,
+                            'item_fa' => $info_item->item_str,
+                            'sub_item' => $info_item->sub_item,
+                            'sub_item_fa' => $info_item->sub_item_str,
+                            'sub_item_data' => $item['amount'],
+                            'province_id' => $user->province_id,
+                            'province_fa' => $user->province_fa,
+                            'city_id' => $user->city_id,
+                            'city_fa' => $user->city_fa,
+                            'user_name' => $user->name,
+                            'start_way_id' => $nominatimService->get_way_id_from_nominatim($item_start_coordinates[0], $item_start_coordinates[1]),
+                            'end_way_id' => $item_end_coordinates ? $nominatimService->get_way_id_from_nominatim($item_end_coordinates[0], $item_end_coordinates[1]) : null,
+                            'unit_fa' => $info_item->sub_item_unit,
+                            'created_at_fa' => verta(Carbon::now())->format('Y-m-d H:i:s'),
+                            'info_id' => $info_item->id,
+                            'status' => 0,
+                            'status_fa' => 'در حال بررسی',
+                            'edarat_id' => $user->edarate_shahri_id,
+                            'edarat_type' => EdarateShahri::class,
+                            'edarat_name' => $user->edarate_shahri_name,
+                            'activity_date' => $activity_date->format('Y-m-d'),
+                            'activity_time' => $activity_date->format('H:i:s'),
+                        ];
+
+                        $road_item = RoadItemsProject::store($user, $attributes, $before_image, $after_image, $observed_item->id);
+
+                        if ($road_item === -1) {
+                            return $this->errorResponse('اقدام مربوطه قبلا رسیدگی شده است.');
+                        }
+
+                        $road_item->rahdaran()->attach($item['road_item_rahdaran_id']);
+                        $road_item->cmmsMachines()->attach($item['road_item_machines_id']);
+                    }
+                }
+            }
+
+            auth()->user()->addActivityComplete(1147);
+
+            Sms::sendSms($request->officer_phone_number,
+                "گشت راهداری با کد یکتای $road_patrol->id در تاریخ ".verta(\Carbon\Carbon::now())->format('Y-m-d H:i:s')." با شماره شما در سامانه RMS ثبت شد. \n لینک دریافت گزارش : \n https://rms.rmto.ir/v2/road_patrols/operator/report/$road_patrol->id"
+            );
+            return $road_patrol;
+        });
+
+        return $this->successResponse();
+    }
+    public function getReport(RoadPatrol $roadPatrol): JsonResponse
+    {
+        $data = [
+            'serial_no' => $roadPatrol->id,
+            'province_fa' => $roadPatrol->province_fa,
+            'edare_name' => $roadPatrol->edare_name,
+            'start_time' => $roadPatrol->start_time,
+            'end_time' => $roadPatrol->end_time,
+            'officer_name' => $roadPatrol->officer_name,
+            'officer_plaque' => $roadPatrol->officer_plaque,
+            'officer_phone_number' => $roadPatrol->officer_phone_number,
+            'created_at' => $roadPatrol->created_at
+        ];
+
+        $observed_items = array();
+        if($roadPatrol->observedItems) {
+            foreach ($roadPatrol->observedItems as $index => $observed_item) {
+                $observed_items[] = [
+                    'item' => $observed_item->item_name,
+                    'sub_item' => $observed_item->sub_item_name,
+                    'local_name' => $observed_item->local_name,
+                    'description' => $observed_item->description,
+                    'priority_fa' => $observed_item->priority_fa,
+                ];
+            }
+        }
+
+        $data['observed_items'] = $observed_items;
+        return $this->successResponse($data);
+    }
+
+    public function map(Request  $request): JsonResponse
+    {
+        $province = $request->province_id;
+        $edare_shahri = $request->edare_shahri_id;
+        $status = $request->status;
+        $rms_status = $request->rms_status;
+
+        if ($request->from_date && $request->date_to) {
+            $date_from = $request->from_date.' 00:00:00';
+            $date_to = $request->date_to.' 23:59:59';
+        } else {
+            $date_from = Date('Y-m-d');
+            $date_to = new \DateTime('tomorrow');
+            $date_to = $date_to->format('Y-m-d');
+        }
+
+        $projects = RoadObserved::query()->select(['id', 'lng', 'lat','status'])
+            ->whereBetween('created_at', [$date_from, $date_to])
+            ->when($province, function ($query) use ($province) {
+                return $query->where('province_id', '=', $province);
+            })
+            ->when($rms_status, function ($query) use ($rms_status) {
+                if ($rms_status == 2) {
+                    return $query->where('rms_status', '<>', 0);
+                } else {
+                    return $query->where('rms_status', '=', 0);
+                }
+            })
+            ->when($edare_shahri, function ($query) use ($edare_shahri) {
+                return $query->where('edarate_shahri_id', '=', $edare_shahri);
+            })
+            ->when($status, function ($query) use ($status) {
+                return $query->where('status', '=', $status);
+            })
+            ->get();
+        return $this->successResponse($projects);
+    }
+
+    public function show(RoadPatrol $roadPatrol): JsonResponse
+    {
+        return $this->successResponse($roadPatrol);
+    }
+    public function roadPatrolMachine(RoadPatrol $roadPatrol): JsonResponse
+    {
+        return $this->successResponse($roadPatrol->cmmsMachines()->get(['cmms_machines.id', 'cmms_machines.machine_code', 'cmms_machines.car_name', 'cmms_machines.plak_number']));
+    }
+
+    public function roadPatrolRahdar(RoadPatrol $roadPatrol): JsonResponse
+    {
+        return $this->successResponse($roadPatrol->rahdaran()->get(['rahdaran.id', 'rahdaran.name', 'rahdaran.code']));
+    }
+
 
 }
diff --git a/app/Http/Controllers/V3/RoadPatrole/OperatorController.php b/app/Http/Controllers/V3/RoadPatrole/OperatorController.php
index 2978d112..41345113 100644
--- a/app/Http/Controllers/V3/RoadPatrole/OperatorController.php
+++ b/app/Http/Controllers/V3/RoadPatrole/OperatorController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\V3\RoadPatrole;
 
 
+use App\Exports\V3\RoadPatrols\OperatorCartableReport;
 use App\Exports\V3\RoadPatrols\ProvinceActivity;
 use App\Http\Controllers\Controller;
 use App\Http\Traits\ApiResponse;
@@ -43,5 +44,16 @@ class OperatorController extends Controller
             'edarateShahri' => $edarateShahri,
         ]), $name);
     }
+    public function operatorIndex(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
+    {
+        $data = $roadPatrolTableService->operatorCartableReport($request);
+        return response()->json($data);
+    }
+    public function operatorCartableReport(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
+    {
+        $name = 'گزارش از کارتابل عملیات گشت راهداری ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
+        $data = $roadPatrolTableService->operatorCartableReport($request, true);
+        return Excel::download(new OperatorCartableReport($data['data']), $name);
+    }
 
 }
diff --git a/app/Http/Controllers/V3/RoadPatrole/SupervisorController.php b/app/Http/Controllers/V3/RoadPatrole/SupervisorController.php
index 44567a63..d3a60f88 100644
--- a/app/Http/Controllers/V3/RoadPatrole/SupervisorController.php
+++ b/app/Http/Controllers/V3/RoadPatrole/SupervisorController.php
@@ -3,12 +3,14 @@
 namespace App\Http\Controllers\V3\RoadPatrole;
 
 use App\Exports\V3\RoadPatrols\CountryActivity;
+use App\Exports\V3\RoadPatrols\SupervisorCartableReport;
 use App\Http\Controllers\Controller;
 use App\Http\Traits\ApiResponse;
 use App\Models\Province;
 use App\Services\Cartables\RoadPatrolTableService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Gate;
 use Maatwebsite\Excel\Facades\Excel;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 
@@ -38,6 +40,26 @@ class SupervisorController extends Controller
             'provinces' => $provinces,
         ]), $name);
     }
+    public function supervisorIndex(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
+    {
+        $data = $roadPatrolTableService->supervisorCartableReport($request);
+
+        foreach ($data['data'] as $road_patrol) {
+            if (Gate::allows('gate-supervise-road-item', $road_patrol)) {
+                $road_patrol['can_supervise'] = 1;
+            } else {
+                $road_patrol['can_supervise'] = 0;
+            }
+        }
+
+        return response()->json($data);
+    }
+    public function supervisorCartableReport(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
+    {
+        $name = 'گزارش از کارتابل ارزیابی گشت راهداری ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
+        $data = $roadPatrolTableService->supervisorCartableReport($request, true);
+        return Excel::download(new SupervisorCartableReport($data['data']), $name);
+    }
 
 
 
diff --git a/routes/v3.php b/routes/v3.php
index 2f94345b..293df1e7 100644
--- a/routes/v3.php
+++ b/routes/v3.php
@@ -151,42 +151,42 @@ Route::prefix('road_items')
         Route::get('/files/{roadItemsProject}', 'roadItemFile')->name('roadItemFile');
     });
 
-Route::prefix('road_patrols')
-    ->name('road_patrols.')
-    ->controller(RoadPatrolProjectController::class)
-    ->group(function () {
-
-        Route::get('/supervisor_index', 'supervisorIndex')
-            ->middleware(['permission:show-road-patrol-supervise-cartable|show-road-patrol-supervise-cartable-province'])
-            ->name('supervisorIndex');
-
-        Route::post('/delete/{roadPatrol}', 'delete')
-            ->middleware('permission:partial-delete-road-patrol|complete-delete-road-patrol')
-            ->name('delete');
-
-        Route::get('/supervisor_report', 'supervisorCartableReport')
-            ->name('supervisorCartableReport');
-
-        Route::get('/operator_index', 'operatorIndex')
-            ->middleware('permission:add-road-patrol')
-            ->name('operatorIndex');
-
-        Route::post('/store', 'store')
-            ->middleware('permission:add-road-patrol')
-            ->name('store');
-
-        Route::get('/operator_report', 'operatorCartableReport')
-            ->name('operatorCartableReport');
-
-        Route::get('/operator/report/{roadPatrol}', 'getReport')
-            ->name('getReport');
-
-        Route::get('/detail/{roadPatrol}', 'show')
-            ->name('show');
-
-        Route::get('/machines/{roadPatrol}', 'roadPatrolMachine')->name('roadPatrolMachine');
-        Route::get('/rahdaran/{roadPatrol}', 'roadPatrolRahdar')->name('roadPatrolRahdar');
-    });
+//Route::prefix('road_patrols')
+//    ->name('road_patrols.')
+//    ->controller(RoadPatrolProjectController::class)
+//    ->group(function () {
+//
+//        Route::get('/supervisor_index', 'supervisorIndex')
+//            ->middleware(['permission:show-road-patrol-supervise-cartable|show-road-patrol-supervise-cartable-province'])
+//            ->name('supervisorIndex');
+//
+//        Route::post('/delete/{roadPatrol}', 'delete')
+//            ->middleware('permission:partial-delete-road-patrol|complete-delete-road-patrol')
+//            ->name('delete');
+//
+//        Route::get('/supervisor_report', 'supervisorCartableReport')
+//            ->name('supervisorCartableReport');
+//
+//        Route::get('/operator_index', 'operatorIndex')
+//            ->middleware('permission:add-road-patrol')
+//            ->name('operatorIndex');
+//
+//        Route::post('/store', 'store')
+//            ->middleware('permission:add-road-patrol')
+//            ->name('store');
+//
+//        Route::get('/operator_report', 'operatorCartableReport')
+//            ->name('operatorCartableReport');
+//
+//        Route::get('/operator/report/{roadPatrol}', 'getReport')
+//            ->name('getReport');
+//
+//        Route::get('/detail/{roadPatrol}', 'show')
+//            ->name('show');
+//
+//        Route::get('/machines/{roadPatrol}', 'roadPatrolMachine')->name('roadPatrolMachine');
+//        Route::get('/rahdaran/{roadPatrol}', 'roadPatrolRahdar')->name('roadPatrolRahdar');
+//    });
 
 Route::prefix('cmms_machines')
     ->name('cmms_machines.')
@@ -245,6 +245,18 @@ Route::prefix('road_patrol')
             ->group(function () {
                 Route::get('/activities_on_map', 'activitiesOnMap')->name('activitiesOnMap');
                 Route::get('/show_on_map/{roadPatrol}', 'showOnMap')->name('showOnMap');
+                Route::post('/delete/{roadPatrol}', 'delete')
+                    ->middleware('permission:partial-delete-road-patrol|complete-delete-road-patrol')
+                    ->name('delete');
+                Route::post('/store', 'store')
+                    ->middleware('permission:add-road-patrol')
+                    ->name('store');
+                Route::get('report/{roadPatrol}', 'getReport')
+                    ->name('getReport');
+                Route::get('/{roadPatrol}', 'show')
+                    ->name('show');
+                Route::get('/machines/{roadPatrol}', 'roadPatrolMachine')->name('roadPatrolMachine');
+                Route::get('/rahdaran/{roadPatrol}', 'roadPatrolRahdar')->name('roadPatrolRahdar');
             });
         Route::prefix('operator')
             ->name('operator.')
@@ -252,11 +264,25 @@ Route::prefix('road_patrol')
             ->group(function () {
                 Route::get('/province_activity', 'provincePatrolActivity')->name('provincePatrolActivity');
                 Route::get('/province_activity_excel', 'provinceActivityExcel')->name('provinceActivityExcel');
+                Route::get('/index', 'operatorIndex')
+                    ->middleware('permission:add-road-patrol')
+                    ->name('Index');
+
+                Route::get('/report', 'operatorCartableReport')
+                    ->name('cartableReport');
+
+
             });
         Route::prefix('supervisor')
             ->name('supervisor.')
             ->controller(App\Http\Controllers\V3\RoadPatrole\SupervisorController::class)
             ->group(function () {
+                Route::get('/index', 'supervisorIndex')
+                    ->middleware(['permission:show-road-patrol-supervise-cartable|show-road-patrol-supervise-cartable-province'])
+                    ->name('index');
+                Route::get('/report', 'supervisorCartableReport')
+                    ->name('cartableReport');
+
                 Route::get('/country_activity', 'countryPatrolActivity')->name('countryPatrolActivity');
                 Route::get('/province_activity_excel', 'provinceActivityExcel')->name('provinceActivityExcel');
             });

From 3122ea1d2f0cb92dee99e5f19da3a7a08f564692 Mon Sep 17 00:00:00 2001
From: joddyabott <faezehzafarbakhsh@gmail.com>
Date: Tue, 17 Jun 2025 10:57:32 +0330
Subject: [PATCH 06/16] create new postision for report

---
 .../V3/RoadPatrole/DetailController.php       | 246 ------------------
 .../V3/RoadPatrole/OperatorController.php     | 210 +++++++++++++++
 .../V3/RoadPatrole/ReportController.php       |  66 +++++
 routes/v3.php                                 |  28 +-
 4 files changed, 292 insertions(+), 258 deletions(-)
 create mode 100644 app/Http/Controllers/V3/RoadPatrole/ReportController.php

diff --git a/app/Http/Controllers/V3/RoadPatrole/DetailController.php b/app/Http/Controllers/V3/RoadPatrole/DetailController.php
index 77204e6b..cdc1bbb9 100644
--- a/app/Http/Controllers/V3/RoadPatrole/DetailController.php
+++ b/app/Http/Controllers/V3/RoadPatrole/DetailController.php
@@ -26,252 +26,6 @@ use Illuminate\Validation\ValidationException;
 class DetailController extends Controller
 {
     use ApiResponse;
-    public function activitiesOnMap(Request $request): JsonResponse
-    {
-        $date_from = $request->from_date ? $request->from_date .' 00:00:00' : now()->startOfDay()->toDateTimeString();
-        $date_to = $request->date_to ? $request->date_to.' 23:59:59' : now()->addDay()->startOfDay()->toDateTimeString();
-        $provinceId = $request->province_id;
-        $edareId = $request->edare_id;
-
-        $data = RoadPatrol::query()
-            ->when($provinceId, fn($query, $provinceId) => $query->where('province_id', '=', $provinceId))
-            ->when($edareId, fn($query, $edareId) => $query->where('edare_id', '=', $edareId))
-            ->whereBetween('created_at', [$date_from, $date_to])
-            ->select('id', 'start_lat', 'start_lon')
-            ->get();
-
-        return $this->successResponse($data);
-    }
-
-    public function showOnMap(RoadPatrol $roadPatrol): JsonResponse
-    {
-        return $this->successResponse($roadPatrol->load(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
-    }
-    public function delete(DeleteRequest $request, RoadPatrol $roadPatrol): JsonResponse
-    {
-        if ($request->type == 1) {
-            DB::transaction(function () use ($roadPatrol) {
-                $roadPatrol->observedItems()->delete();
-                $roadPatrol->delete();
-            });
-        } else {
-            DB::transaction(function () use ($roadPatrol) {
-                if ($roadPatrol->observedItems) {
-                    foreach ($roadPatrol->observedItems as $index => $observed_item) {
-                        if ($observed_item->roadItemProject) {
-                            $road_item = $observed_item->roadItemProject;
-
-                            if ($road_item->files()->exists()) {
-                                Storage::delete('public/' . $road_item->files[0]->path);
-                                Storage::delete('public/' . $road_item->files[1]->path);
-                                $road_item->files()->delete();
-                            }
-
-                            $road_item->delete();
-                        }
-
-                        $observed_item->delete();
-                    }
-                }
-                auth()->user()->addActivityComplete(1144);
-
-                $roadPatrol->delete();
-            });
-        }
-
-        return $this->successResponse();
-    }
-    public function store(StoreRequest $request, NominatimService $nominatimService): JsonResponse
-    {
-        $user = auth()->user();
-
-        if ($user->edarate_ostani_id || is_null($user->city_id)) {
-            return $this->errorResponse('امکان ثبت فعالیت برای ادارات استانی وجود ندارد!');
-        }
-
-        if (is_null($user->edarate_shahri_id)) {
-            return $this->errorResponse('اداره شهری برای شما در سامانه ثبت نشده است!');
-        }
-
-        $edare_id = $user->edarate_shahri_id ?? $user->edarate_ostani_id;
-        $edare_name = $user->edarate_shahri_id ? $user->edarate_shahri_name : $user->edarate_ostani_name;
-
-        $road_patrol = DB::transaction(function () use ($request, $edare_id,
-            $edare_name, $nominatimService, $user) {
-            $mission = Mission::findOrFail($request->mission_id);
-
-            if ($mission->status !== MissionStates::START_MISSION->value) {
-                throw ValidationException::withMessages([
-                    'mission_id' => 'ماموریت انتخاب شده هنوز شروع نشده است.',
-                ]);
-            }
-
-            $road_patrol = RoadPatrol::query()->create([
-                'operator_id' => $user->id,
-                'operator_name' => $user->name,
-                'province_id' => $user->province_id,
-                'province_fa' => $user->province_fa,
-                'city_id' => $user->city_id,
-                'city_fa' => $user->city_fa,
-                'edare_id' => $edare_id,
-                'edare_name' => $edare_name,
-                'status' => 0,
-                'status_fa' => 'در حال بررسی',
-                'distance' => $request->distance,
-                'start_time' => $request->start_time,
-                'end_time' => $request->end_time,
-                'description' => $request->description ?? null,
-                'fuel_consumption' => $request->fuel_consumption,
-                'vehicle_runtime' => $request->vehicle_runtime,
-                'stop_points' => json_encode($request->stop_points),
-            ]);
-
-            $road_patrol->rahdaran()->attach($request->road_patrol_rahdaran_id);
-            $road_patrol->cmmsMachines()->attach($request->road_patrol_machines_id);
-
-            if ($request->observed_items) {
-                foreach ($request->observed_items as $index => $item) {
-                    $info_item = InfoItem::where('item', $item['item_id'])
-                        ->where('sub_item', $item['sub_item_id'])
-                        ->firstOrFail();
-
-                    $item_start_coordinates = explode(',', $item['start_point']);
-
-                    $observed_item = $road_patrol->observedItems()->create([
-                        'item_id' => $info_item->item,
-                        'item_name' => $info_item->item_str,
-                        'sub_item_id' => $info_item->sub_item,
-                        'sub_item_name' => $info_item->sub_item_str,
-                        'local_name' => $item['local_name'],
-                        'description' => $item['description'] ?? null,
-                        'start_lat' => $item_start_coordinates[0],
-                        'start_lon' => $item_start_coordinates[1],
-                    ]);
-
-                    $item_end_coordinates = null;
-                    if ($item['instant_action'] == 0) {
-                        $priority = [
-                            1 => 'عادی',
-                            2 => 'فوری',
-                            3 => 'آنی',
-                        ];
-                        $observed_item->priority = $item['priority'];
-                        $observed_item->priority_fa = $priority[$item['priority']];
-                        $observed_item->save();
-                    } elseif ($item['instant_action'] == 1) {
-                        if ($info_item->needs_end_point) {
-                            if (!isset($item['end_point'])) {
-                                throw ValidationException::withMessages([
-                                    "observed_items.$index.end_point" => __('validation.required', ['attribute' => 'end_point']),
-                                ]);
-                            }
-
-                            $item_end_coordinates = explode(',', $item['end_point']);
-                        }
-
-                        $before_image = null;
-                        $after_image = null;
-                        if ($info_item->needs_image) {
-                            if (!isset($item['before_image'])) {
-                                throw ValidationException::withMessages([
-                                    "observed_items.$index.before_image" => __('validation.required', ['attribute' => 'before_image']),
-                                ]);
-                            }
-                            if (!isset($item['after_image'])) {
-                                throw ValidationException::withMessages([
-                                    "observed_items.$index.after_image" => __('validation.required', ['attribute' => 'after_image']),
-                                ]);
-                            }
-
-                            $before_image = $item['before_image'];
-                            $after_image = $item['after_image'];
-                        }
-
-                        $start_time = Carbon::createFromFormat('Y-m-d H:i', $request->start_time);
-                        $end_time = Carbon::createFromFormat('Y-m-d H:i', $request->end_time);
-                        $activity_date = $start_time->average($end_time);
-
-                        $attributes = [
-                            'start_lat' => $item_start_coordinates[0],
-                            'start_lng' => $item_start_coordinates[1],
-                            'end_lat' => $item_end_coordinates ? $item_end_coordinates[0] : null,
-                            'end_lng' => $item_end_coordinates ? $item_end_coordinates[1] : null,
-                            'item' => $info_item->item,
-                            'item_fa' => $info_item->item_str,
-                            'sub_item' => $info_item->sub_item,
-                            'sub_item_fa' => $info_item->sub_item_str,
-                            'sub_item_data' => $item['amount'],
-                            'province_id' => $user->province_id,
-                            'province_fa' => $user->province_fa,
-                            'city_id' => $user->city_id,
-                            'city_fa' => $user->city_fa,
-                            'user_name' => $user->name,
-                            'start_way_id' => $nominatimService->get_way_id_from_nominatim($item_start_coordinates[0], $item_start_coordinates[1]),
-                            'end_way_id' => $item_end_coordinates ? $nominatimService->get_way_id_from_nominatim($item_end_coordinates[0], $item_end_coordinates[1]) : null,
-                            'unit_fa' => $info_item->sub_item_unit,
-                            'created_at_fa' => verta(Carbon::now())->format('Y-m-d H:i:s'),
-                            'info_id' => $info_item->id,
-                            'status' => 0,
-                            'status_fa' => 'در حال بررسی',
-                            'edarat_id' => $user->edarate_shahri_id,
-                            'edarat_type' => EdarateShahri::class,
-                            'edarat_name' => $user->edarate_shahri_name,
-                            'activity_date' => $activity_date->format('Y-m-d'),
-                            'activity_time' => $activity_date->format('H:i:s'),
-                        ];
-
-                        $road_item = RoadItemsProject::store($user, $attributes, $before_image, $after_image, $observed_item->id);
-
-                        if ($road_item === -1) {
-                            return $this->errorResponse('اقدام مربوطه قبلا رسیدگی شده است.');
-                        }
-
-                        $road_item->rahdaran()->attach($item['road_item_rahdaran_id']);
-                        $road_item->cmmsMachines()->attach($item['road_item_machines_id']);
-                    }
-                }
-            }
-
-            auth()->user()->addActivityComplete(1147);
-
-            Sms::sendSms($request->officer_phone_number,
-                "گشت راهداری با کد یکتای $road_patrol->id در تاریخ ".verta(\Carbon\Carbon::now())->format('Y-m-d H:i:s')." با شماره شما در سامانه RMS ثبت شد. \n لینک دریافت گزارش : \n https://rms.rmto.ir/v2/road_patrols/operator/report/$road_patrol->id"
-            );
-            return $road_patrol;
-        });
-
-        return $this->successResponse();
-    }
-    public function getReport(RoadPatrol $roadPatrol): JsonResponse
-    {
-        $data = [
-            'serial_no' => $roadPatrol->id,
-            'province_fa' => $roadPatrol->province_fa,
-            'edare_name' => $roadPatrol->edare_name,
-            'start_time' => $roadPatrol->start_time,
-            'end_time' => $roadPatrol->end_time,
-            'officer_name' => $roadPatrol->officer_name,
-            'officer_plaque' => $roadPatrol->officer_plaque,
-            'officer_phone_number' => $roadPatrol->officer_phone_number,
-            'created_at' => $roadPatrol->created_at
-        ];
-
-        $observed_items = array();
-        if($roadPatrol->observedItems) {
-            foreach ($roadPatrol->observedItems as $index => $observed_item) {
-                $observed_items[] = [
-                    'item' => $observed_item->item_name,
-                    'sub_item' => $observed_item->sub_item_name,
-                    'local_name' => $observed_item->local_name,
-                    'description' => $observed_item->description,
-                    'priority_fa' => $observed_item->priority_fa,
-                ];
-            }
-        }
-
-        $data['observed_items'] = $observed_items;
-        return $this->successResponse($data);
-    }
 
     public function map(Request  $request): JsonResponse
     {
diff --git a/app/Http/Controllers/V3/RoadPatrole/OperatorController.php b/app/Http/Controllers/V3/RoadPatrole/OperatorController.php
index 41345113..ca138c1e 100644
--- a/app/Http/Controllers/V3/RoadPatrole/OperatorController.php
+++ b/app/Http/Controllers/V3/RoadPatrole/OperatorController.php
@@ -3,14 +3,27 @@
 namespace App\Http\Controllers\V3\RoadPatrole;
 
 
+use App\Enums\MissionStates;
 use App\Exports\V3\RoadPatrols\OperatorCartableReport;
 use App\Exports\V3\RoadPatrols\ProvinceActivity;
+use App\Facades\Sms\Sms;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\V3\RoadPatrol\DeleteRequest;
+use App\Http\Requests\V3\RoadPatrol\StoreRequest;
 use App\Http\Traits\ApiResponse;
 use App\Models\EdarateShahri;
+use App\Models\InfoItem;
+use App\Models\Mission;
+use App\Models\RoadItemsProject;
+use App\Models\RoadPatrol;
 use App\Services\Cartables\RoadPatrolTableService;
+use App\Services\NominatimService;
+use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Validation\ValidationException;
 use Maatwebsite\Excel\Facades\Excel;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 
@@ -55,5 +68,202 @@ class OperatorController extends Controller
         $data = $roadPatrolTableService->operatorCartableReport($request, true);
         return Excel::download(new OperatorCartableReport($data['data']), $name);
     }
+    public function delete(DeleteRequest $request, RoadPatrol $roadPatrol): JsonResponse
+    {
+        if ($request->type == 1) {
+            DB::transaction(function () use ($roadPatrol) {
+                $roadPatrol->observedItems()->delete();
+                $roadPatrol->delete();
+            });
+        } else {
+            DB::transaction(function () use ($roadPatrol) {
+                if ($roadPatrol->observedItems) {
+                    foreach ($roadPatrol->observedItems as $index => $observed_item) {
+                        if ($observed_item->roadItemProject) {
+                            $road_item = $observed_item->roadItemProject;
+
+                            if ($road_item->files()->exists()) {
+                                Storage::delete('public/' . $road_item->files[0]->path);
+                                Storage::delete('public/' . $road_item->files[1]->path);
+                                $road_item->files()->delete();
+                            }
+
+                            $road_item->delete();
+                        }
+
+                        $observed_item->delete();
+                    }
+                }
+                auth()->user()->addActivityComplete(1144);
+
+                $roadPatrol->delete();
+            });
+        }
+
+        return $this->successResponse();
+    }
+    public function store(StoreRequest $request, NominatimService $nominatimService): JsonResponse
+    {
+        $user = auth()->user();
+
+        if ($user->edarate_ostani_id || is_null($user->city_id)) {
+            return $this->errorResponse('امکان ثبت فعالیت برای ادارات استانی وجود ندارد!');
+        }
+
+        if (is_null($user->edarate_shahri_id)) {
+            return $this->errorResponse('اداره شهری برای شما در سامانه ثبت نشده است!');
+        }
+
+        $edare_id = $user->edarate_shahri_id ?? $user->edarate_ostani_id;
+        $edare_name = $user->edarate_shahri_id ? $user->edarate_shahri_name : $user->edarate_ostani_name;
+
+        $road_patrol = DB::transaction(function () use (
+            $request, $edare_id,
+            $edare_name, $nominatimService, $user
+        ) {
+            $mission = Mission::findOrFail($request->mission_id);
+
+            if ($mission->status !== MissionStates::START_MISSION->value) {
+                throw ValidationException::withMessages([
+                    'mission_id' => 'ماموریت انتخاب شده هنوز شروع نشده است.',
+                ]);
+            }
+
+            $road_patrol = RoadPatrol::query()->create([
+                'operator_id' => $user->id,
+                'operator_name' => $user->name,
+                'province_id' => $user->province_id,
+                'province_fa' => $user->province_fa,
+                'city_id' => $user->city_id,
+                'city_fa' => $user->city_fa,
+                'edare_id' => $edare_id,
+                'edare_name' => $edare_name,
+                'status' => 0,
+                'status_fa' => 'در حال بررسی',
+                'distance' => $request->distance,
+                'start_time' => $request->start_time,
+                'end_time' => $request->end_time,
+                'description' => $request->description ?? null,
+                'fuel_consumption' => $request->fuel_consumption,
+                'vehicle_runtime' => $request->vehicle_runtime,
+                'stop_points' => json_encode($request->stop_points),
+            ]);
+
+            $road_patrol->rahdaran()->attach($request->road_patrol_rahdaran_id);
+            $road_patrol->cmmsMachines()->attach($request->road_patrol_machines_id);
+
+            if ($request->observed_items) {
+                foreach ($request->observed_items as $index => $item) {
+                    $info_item = InfoItem::where('item', $item['item_id'])
+                        ->where('sub_item', $item['sub_item_id'])
+                        ->firstOrFail();
+
+                    $item_start_coordinates = explode(',', $item['start_point']);
+
+                    $observed_item = $road_patrol->observedItems()->create([
+                        'item_id' => $info_item->item,
+                        'item_name' => $info_item->item_str,
+                        'sub_item_id' => $info_item->sub_item,
+                        'sub_item_name' => $info_item->sub_item_str,
+                        'local_name' => $item['local_name'],
+                        'description' => $item['description'] ?? null,
+                        'start_lat' => $item_start_coordinates[0],
+                        'start_lon' => $item_start_coordinates[1],
+                    ]);
+
+                    $item_end_coordinates = null;
+                    if ($item['instant_action'] == 0) {
+                        $priority = [
+                            1 => 'عادی',
+                            2 => 'فوری',
+                            3 => 'آنی',
+                        ];
+                        $observed_item->priority = $item['priority'];
+                        $observed_item->priority_fa = $priority[$item['priority']];
+                        $observed_item->save();
+                    } elseif ($item['instant_action'] == 1) {
+                        if ($info_item->needs_end_point) {
+                            if (!isset($item['end_point'])) {
+                                throw ValidationException::withMessages([
+                                    "observed_items.$index.end_point" => __('validation.required', ['attribute' => 'end_point']),
+                                ]);
+                            }
+
+                            $item_end_coordinates = explode(',', $item['end_point']);
+                        }
+
+                        $before_image = null;
+                        $after_image = null;
+                        if ($info_item->needs_image) {
+                            if (!isset($item['before_image'])) {
+                                throw ValidationException::withMessages([
+                                    "observed_items.$index.before_image" => __('validation.required', ['attribute' => 'before_image']),
+                                ]);
+                            }
+                            if (!isset($item['after_image'])) {
+                                throw ValidationException::withMessages([
+                                    "observed_items.$index.after_image" => __('validation.required', ['attribute' => 'after_image']),
+                                ]);
+                            }
+
+                            $before_image = $item['before_image'];
+                            $after_image = $item['after_image'];
+                        }
+
+                        $start_time = Carbon::createFromFormat('Y-m-d H:i', $request->start_time);
+                        $end_time = Carbon::createFromFormat('Y-m-d H:i', $request->end_time);
+                        $activity_date = $start_time->average($end_time);
+
+                        $attributes = [
+                            'start_lat' => $item_start_coordinates[0],
+                            'start_lng' => $item_start_coordinates[1],
+                            'end_lat' => $item_end_coordinates ? $item_end_coordinates[0] : null,
+                            'end_lng' => $item_end_coordinates ? $item_end_coordinates[1] : null,
+                            'item' => $info_item->item,
+                            'item_fa' => $info_item->item_str,
+                            'sub_item' => $info_item->sub_item,
+                            'sub_item_fa' => $info_item->sub_item_str,
+                            'sub_item_data' => $item['amount'],
+                            'province_id' => $user->province_id,
+                            'province_fa' => $user->province_fa,
+                            'city_id' => $user->city_id,
+                            'city_fa' => $user->city_fa,
+                            'user_name' => $user->name,
+                            'start_way_id' => $nominatimService->get_way_id_from_nominatim($item_start_coordinates[0], $item_start_coordinates[1]),
+                            'end_way_id' => $item_end_coordinates ? $nominatimService->get_way_id_from_nominatim($item_end_coordinates[0], $item_end_coordinates[1]) : null,
+                            'unit_fa' => $info_item->sub_item_unit,
+                            'created_at_fa' => verta(Carbon::now())->format('Y-m-d H:i:s'),
+                            'info_id' => $info_item->id,
+                            'status' => 0,
+                            'status_fa' => 'در حال بررسی',
+                            'edarat_id' => $user->edarate_shahri_id,
+                            'edarat_type' => EdarateShahri::class,
+                            'edarat_name' => $user->edarate_shahri_name,
+                            'activity_date' => $activity_date->format('Y-m-d'),
+                            'activity_time' => $activity_date->format('H:i:s'),
+                        ];
+
+                        $road_item = RoadItemsProject::store($user, $attributes, $before_image, $after_image, $observed_item->id);
+
+                        if ($road_item === -1) {
+                            return $this->errorResponse('اقدام مربوطه قبلا رسیدگی شده است.');
+                        }
+
+                        $road_item->rahdaran()->attach($item['road_item_rahdaran_id']);
+                        $road_item->cmmsMachines()->attach($item['road_item_machines_id']);
+                    }
+                }
+            }
+
+            auth()->user()->addActivityComplete(1147);
+
+            Sms::sendSms($request->officer_phone_number,
+                "گشت راهداری با کد یکتای $road_patrol->id در تاریخ " . verta(\Carbon\Carbon::now())->format('Y-m-d H:i:s') . " با شماره شما در سامانه RMS ثبت شد. \n لینک دریافت گزارش : \n https://rms.rmto.ir/v2/road_patrols/operator/report/$road_patrol->id"
+            );
+            return $road_patrol;
+        });
+
+        return $this->successResponse();
+    }
 
 }
diff --git a/app/Http/Controllers/V3/RoadPatrole/ReportController.php b/app/Http/Controllers/V3/RoadPatrole/ReportController.php
new file mode 100644
index 00000000..b1e4f79c
--- /dev/null
+++ b/app/Http/Controllers/V3/RoadPatrole/ReportController.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Http\Controllers\V3\RoadPatrole;
+
+use App\Http\Controllers\Controller;
+use App\Http\Traits\ApiResponse;
+use App\Models\RoadPatrol;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ReportController extends Controller
+{
+    use ApiResponse;
+    public function activitiesOnMap(Request $request): JsonResponse
+    {
+        $date_from = $request->from_date ? $request->from_date .' 00:00:00' : now()->startOfDay()->toDateTimeString();
+        $date_to = $request->date_to ? $request->date_to.' 23:59:59' : now()->addDay()->startOfDay()->toDateTimeString();
+        $provinceId = $request->province_id;
+        $edareId = $request->edare_id;
+
+        $data = RoadPatrol::query()
+            ->when($provinceId, fn($query, $provinceId) => $query->where('province_id', '=', $provinceId))
+            ->when($edareId, fn($query, $edareId) => $query->where('edare_id', '=', $edareId))
+            ->whereBetween('created_at', [$date_from, $date_to])
+            ->select('id', 'start_lat', 'start_lon')
+            ->get();
+
+        return $this->successResponse($data);
+    }
+
+    public function showOnMap(RoadPatrol $roadPatrol): JsonResponse
+    {
+        return $this->successResponse($roadPatrol->load(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
+    }
+
+    public function getReport(RoadPatrol $roadPatrol): JsonResponse
+    {
+        $data = [
+            'serial_no' => $roadPatrol->id,
+            'province_fa' => $roadPatrol->province_fa,
+            'edare_name' => $roadPatrol->edare_name,
+            'start_time' => $roadPatrol->start_time,
+            'end_time' => $roadPatrol->end_time,
+            'officer_name' => $roadPatrol->officer_name,
+            'officer_plaque' => $roadPatrol->officer_plaque,
+            'officer_phone_number' => $roadPatrol->officer_phone_number,
+            'created_at' => $roadPatrol->created_at
+        ];
+
+        $observed_items = array();
+        if($roadPatrol->observedItems) {
+            foreach ($roadPatrol->observedItems as $index => $observed_item) {
+                $observed_items[] = [
+                    'item' => $observed_item->item_name,
+                    'sub_item' => $observed_item->sub_item_name,
+                    'local_name' => $observed_item->local_name,
+                    'description' => $observed_item->description,
+                    'priority_fa' => $observed_item->priority_fa,
+                ];
+            }
+        }
+
+        $data['observed_items'] = $observed_items;
+        return $this->successResponse($data);
+    }
+}
diff --git a/routes/v3.php b/routes/v3.php
index 293df1e7..1aa3954d 100644
--- a/routes/v3.php
+++ b/routes/v3.php
@@ -243,16 +243,6 @@ Route::prefix('road_patrol')
             ->name('details.')
             ->controller(\App\Http\Controllers\V3\RoadPatrole\DetailController::class)
             ->group(function () {
-                Route::get('/activities_on_map', 'activitiesOnMap')->name('activitiesOnMap');
-                Route::get('/show_on_map/{roadPatrol}', 'showOnMap')->name('showOnMap');
-                Route::post('/delete/{roadPatrol}', 'delete')
-                    ->middleware('permission:partial-delete-road-patrol|complete-delete-road-patrol')
-                    ->name('delete');
-                Route::post('/store', 'store')
-                    ->middleware('permission:add-road-patrol')
-                    ->name('store');
-                Route::get('report/{roadPatrol}', 'getReport')
-                    ->name('getReport');
                 Route::get('/{roadPatrol}', 'show')
                     ->name('show');
                 Route::get('/machines/{roadPatrol}', 'roadPatrolMachine')->name('roadPatrolMachine');
@@ -266,12 +256,26 @@ Route::prefix('road_patrol')
                 Route::get('/province_activity_excel', 'provinceActivityExcel')->name('provinceActivityExcel');
                 Route::get('/index', 'operatorIndex')
                     ->middleware('permission:add-road-patrol')
-                    ->name('Index');
+                    ->name('index');
 
                 Route::get('/report', 'operatorCartableReport')
                     ->name('cartableReport');
+                Route::post('/delete/{roadPatrol}', 'delete')
+                    ->middleware('permission:partial-delete-road-patrol|complete-delete-road-patrol')
+                    ->name('delete');
+                Route::post('/store', 'store')
+                    ->middleware('permission:add-road-patrol')
+                    ->name('store');
+            });
 
-
+        Route::prefix('report')
+            ->name('report.')
+            ->controller(ReportController::class)
+            ->group(function () {
+                Route::get('/activities_on_map', 'activitiesOnMap')->name('activitiesOnMap');
+                Route::get('/show_on_map/{roadPatrol}', 'showOnMap')->name('showOnMap');
+                Route::get('/{roadPatrol}', 'getReport')
+                    ->name('getReport');
             });
         Route::prefix('supervisor')
             ->name('supervisor.')

From c8b66e29860dd06a8ca1b94f2e55381857632958 Mon Sep 17 00:00:00 2001
From: joddyabott <faezehzafarbakhsh@gmail.com>
Date: Tue, 17 Jun 2025 13:12:30 +0330
Subject: [PATCH 07/16] create new postision for report

---
 .../V3/RoadPatrole/OperatorController.php     | 28 +--------
 .../V3/RoadPatrole/ReportController.php       | 58 +++++++++++++++++++
 .../V3/RoadPatrole/SupervisorController.php   | 25 +-------
 routes/v3.php                                 | 13 +++--
 4 files changed, 67 insertions(+), 57 deletions(-)

diff --git a/app/Http/Controllers/V3/RoadPatrole/OperatorController.php b/app/Http/Controllers/V3/RoadPatrole/OperatorController.php
index ca138c1e..c423388c 100644
--- a/app/Http/Controllers/V3/RoadPatrole/OperatorController.php
+++ b/app/Http/Controllers/V3/RoadPatrole/OperatorController.php
@@ -31,33 +31,7 @@ use Symfony\Component\HttpFoundation\BinaryFileResponse;
 class OperatorController extends Controller
 {
     use ApiResponse;
-    public function provincePatrolActivity(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
-    {
-        $request->validate(["province_id" => "required",]);
-
-        $activities = $roadPatrolTableService->provinceActivity($request);
-
-        $edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
-
-        return $this->successResponse([
-            'activities' => $activities['data'],
-            'edarateShahri' => $edarateShahri,
-        ]);
-    }
-
-    public function provinceActivityExcel(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
-    {
-        $activities = $roadPatrolTableService->provinceActivity($request);
-        $edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
-
-        $name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
-
-        return Excel::download(new ProvinceActivity([
-            'activities' => $activities,
-            'edarateShahri' => $edarateShahri,
-        ]), $name);
-    }
-    public function operatorIndex(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
+    public function index(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
     {
         $data = $roadPatrolTableService->operatorCartableReport($request);
         return response()->json($data);
diff --git a/app/Http/Controllers/V3/RoadPatrole/ReportController.php b/app/Http/Controllers/V3/RoadPatrole/ReportController.php
index b1e4f79c..a900029e 100644
--- a/app/Http/Controllers/V3/RoadPatrole/ReportController.php
+++ b/app/Http/Controllers/V3/RoadPatrole/ReportController.php
@@ -2,11 +2,18 @@
 
 namespace App\Http\Controllers\V3\RoadPatrole;
 
+use App\Exports\V3\RoadPatrols\CountryActivity;
+use App\Exports\V3\RoadPatrols\ProvinceActivity;
 use App\Http\Controllers\Controller;
 use App\Http\Traits\ApiResponse;
+use App\Models\EdarateShahri;
+use App\Models\Province;
 use App\Models\RoadPatrol;
+use App\Services\Cartables\RoadPatrolTableService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Maatwebsite\Excel\Facades\Excel;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
 
 class ReportController extends Controller
 {
@@ -63,4 +70,55 @@ class ReportController extends Controller
         $data['observed_items'] = $observed_items;
         return $this->successResponse($data);
     }
+    public function countryPatrolActivity(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
+    {
+        $activities = $roadPatrolTableService->countryActivity($request);
+
+        $provinces = Province::all(['id', 'name_fa']);
+
+        return $this->successResponse([
+            'activities' => $activities['data'],
+            'provinces' => $provinces
+        ]);
+    }
+
+    public function provincePatrolActivity(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
+    {
+        $request->validate(["province_id" => "required",]);
+
+        $activities = $roadPatrolTableService->provinceActivity($request);
+
+        $edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
+
+        return $this->successResponse([
+            'activities' => $activities['data'],
+            'edarateShahri' => $edarateShahri,
+        ]);
+    }
+
+    public function countryActivityExcel(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
+    {
+        $activities = $roadPatrolTableService->countryActivity($request);
+        $provinces = Province::all(['id', 'name_fa']);
+
+        $name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
+
+        return Excel::download(new CountryActivity([
+            'activities' => $activities,
+            'provinces' => $provinces,
+        ]), $name);
+    }
+
+    public function provinceActivityExcel(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
+    {
+        $activities = $roadPatrolTableService->provinceActivity($request);
+        $edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
+
+        $name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
+
+        return Excel::download(new ProvinceActivity([
+            'activities' => $activities,
+            'edarateShahri' => $edarateShahri,
+        ]), $name);
+    }
 }
diff --git a/app/Http/Controllers/V3/RoadPatrole/SupervisorController.php b/app/Http/Controllers/V3/RoadPatrole/SupervisorController.php
index d3a60f88..e5be5893 100644
--- a/app/Http/Controllers/V3/RoadPatrole/SupervisorController.php
+++ b/app/Http/Controllers/V3/RoadPatrole/SupervisorController.php
@@ -17,30 +17,7 @@ use Symfony\Component\HttpFoundation\BinaryFileResponse;
 class SupervisorController extends Controller
 {
     use ApiResponse;
-    public function countryPatrolActivity(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
-    {
-        $activities = $roadPatrolTableService->countryActivity($request);
-
-        $provinces = Province::all(['id', 'name_fa']);
-
-        return $this->successResponse([
-            'activities' => $activities['data'],
-            'provinces' => $provinces
-        ]);
-    }
-    public function countryActivityExcel(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
-    {
-        $activities = $roadPatrolTableService->countryActivity($request);
-        $provinces = Province::all(['id', 'name_fa']);
-
-        $name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
-
-        return Excel::download(new CountryActivity([
-            'activities' => $activities,
-            'provinces' => $provinces,
-        ]), $name);
-    }
-    public function supervisorIndex(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
+    public function index(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
     {
         $data = $roadPatrolTableService->supervisorCartableReport($request);
 
diff --git a/routes/v3.php b/routes/v3.php
index 1aa3954d..edae3210 100644
--- a/routes/v3.php
+++ b/routes/v3.php
@@ -31,6 +31,7 @@ use App\Http\Controllers\V3\NotificationController;
 use App\Http\Controllers\V3\PermissionManagementController;
 use App\Http\Controllers\V3\ProfileController;
 use App\Http\Controllers\V3\RahdaranController;
+use App\Http\Controllers\V3\RoadPatrole\ReportController;
 use Illuminate\Support\Facades\Route;
 
 Route::get('admin/permissions', function () {
@@ -252,9 +253,7 @@ Route::prefix('road_patrol')
             ->name('operator.')
             ->controller(App\Http\Controllers\V3\RoadPatrole\OperatorController::class)
             ->group(function () {
-                Route::get('/province_activity', 'provincePatrolActivity')->name('provincePatrolActivity');
-                Route::get('/province_activity_excel', 'provinceActivityExcel')->name('provinceActivityExcel');
-                Route::get('/index', 'operatorIndex')
+                Route::get('/', 'index')
                     ->middleware('permission:add-road-patrol')
                     ->name('index');
 
@@ -272,6 +271,10 @@ Route::prefix('road_patrol')
             ->name('report.')
             ->controller(ReportController::class)
             ->group(function () {
+                Route::get('/country_activity', 'countryPatrolActivity')->name('countryPatrolActivity');
+                Route::get('/province_activity', 'provincePatrolActivity')->name('provincePatrolActivity');
+                Route::get('/country_activity_excel', 'countryActivityExcel')->name('countryActivityExcel');
+                Route::get('/province_activity_excel', 'provinceActivityExcel')->name('provinceActivityExcel');
                 Route::get('/activities_on_map', 'activitiesOnMap')->name('activitiesOnMap');
                 Route::get('/show_on_map/{roadPatrol}', 'showOnMap')->name('showOnMap');
                 Route::get('/{roadPatrol}', 'getReport')
@@ -281,14 +284,12 @@ Route::prefix('road_patrol')
             ->name('supervisor.')
             ->controller(App\Http\Controllers\V3\RoadPatrole\SupervisorController::class)
             ->group(function () {
-                Route::get('/index', 'supervisorIndex')
+                Route::get('/','index')
                     ->middleware(['permission:show-road-patrol-supervise-cartable|show-road-patrol-supervise-cartable-province'])
                     ->name('index');
                 Route::get('/report', 'supervisorCartableReport')
                     ->name('cartableReport');
 
-                Route::get('/country_activity', 'countryPatrolActivity')->name('countryPatrolActivity');
-                Route::get('/province_activity_excel', 'provinceActivityExcel')->name('provinceActivityExcel');
             });
     });
 

From 9eea764477c2dd39a755ab59a2543d83fd72cb33 Mon Sep 17 00:00:00 2001
From: joddyabott <faezehzafarbakhsh@gmail.com>
Date: Wed, 18 Jun 2025 00:34:30 +0330
Subject: [PATCH 08/16] chenge v3 route

---
 routes/v3.php | 145 ++++++++++++++++----------------------------------
 1 file changed, 45 insertions(+), 100 deletions(-)

diff --git a/routes/v3.php b/routes/v3.php
index edae3210..59e0647a 100644
--- a/routes/v3.php
+++ b/routes/v3.php
@@ -152,42 +152,42 @@ Route::prefix('road_items')
         Route::get('/files/{roadItemsProject}', 'roadItemFile')->name('roadItemFile');
     });
 
-//Route::prefix('road_patrols')
-//    ->name('road_patrols.')
-//    ->controller(RoadPatrolProjectController::class)
-//    ->group(function () {
-//
-//        Route::get('/supervisor_index', 'supervisorIndex')
-//            ->middleware(['permission:show-road-patrol-supervise-cartable|show-road-patrol-supervise-cartable-province'])
-//            ->name('supervisorIndex');
-//
-//        Route::post('/delete/{roadPatrol}', 'delete')
-//            ->middleware('permission:partial-delete-road-patrol|complete-delete-road-patrol')
-//            ->name('delete');
-//
-//        Route::get('/supervisor_report', 'supervisorCartableReport')
-//            ->name('supervisorCartableReport');
-//
-//        Route::get('/operator_index', 'operatorIndex')
-//            ->middleware('permission:add-road-patrol')
-//            ->name('operatorIndex');
-//
-//        Route::post('/store', 'store')
-//            ->middleware('permission:add-road-patrol')
-//            ->name('store');
-//
-//        Route::get('/operator_report', 'operatorCartableReport')
-//            ->name('operatorCartableReport');
-//
-//        Route::get('/operator/report/{roadPatrol}', 'getReport')
-//            ->name('getReport');
-//
-//        Route::get('/detail/{roadPatrol}', 'show')
-//            ->name('show');
-//
-//        Route::get('/machines/{roadPatrol}', 'roadPatrolMachine')->name('roadPatrolMachine');
-//        Route::get('/rahdaran/{roadPatrol}', 'roadPatrolRahdar')->name('roadPatrolRahdar');
-//    });
+Route::prefix('road_patrols')
+    ->name('road_patrols.')
+    ->controller(RoadPatrolProjectController::class)
+    ->group(function () {
+
+        Route::get('/supervisor_index', 'supervisorIndex')
+            ->middleware(['permission:show-road-patrol-supervise-cartable|show-road-patrol-supervise-cartable-province'])
+            ->name('supervisorIndex');
+
+        Route::post('/delete/{roadPatrol}', 'delete')
+            ->middleware('permission:partial-delete-road-patrol|complete-delete-road-patrol')
+            ->name('delete');
+
+        Route::get('/supervisor_report', 'supervisorCartableReport')
+            ->name('supervisorCartableReport');
+
+        Route::get('/operator_index', 'operatorIndex')
+            ->middleware('permission:add-road-patrol')
+            ->name('operatorIndex');
+
+        Route::post('/store', 'store')
+            ->middleware('permission:add-road-patrol')
+            ->name('store');
+
+        Route::get('/operator_report', 'operatorCartableReport')
+            ->name('operatorCartableReport');
+
+        Route::get('/operator/report/{roadPatrol}', 'getReport')
+            ->name('getReport');
+
+        Route::get('/detail/{roadPatrol}', 'show')
+            ->name('show');
+
+        Route::get('/machines/{roadPatrol}', 'roadPatrolMachine')->name('roadPatrolMachine');
+        Route::get('/rahdaran/{roadPatrol}', 'roadPatrolRahdar')->name('roadPatrolRahdar');
+    });
 
 Route::prefix('cmms_machines')
     ->name('cmms_machines.')
@@ -238,73 +238,18 @@ Route::prefix('road_item_reports')
         Route::get('/show_on_map/{roadItemsProject}', 'showOnMap')->name('showOnMap');
     });
 
-Route::prefix('road_patrol')
+Route::prefix('road_patrol_reports')
+    ->name('roadPatrolReports.')
+    ->controller(RoadPatrolReportController::class)
     ->group(function () {
-        Route::prefix('details')
-            ->name('details.')
-            ->controller(\App\Http\Controllers\V3\RoadPatrole\DetailController::class)
-            ->group(function () {
-                Route::get('/{roadPatrol}', 'show')
-                    ->name('show');
-                Route::get('/machines/{roadPatrol}', 'roadPatrolMachine')->name('roadPatrolMachine');
-                Route::get('/rahdaran/{roadPatrol}', 'roadPatrolRahdar')->name('roadPatrolRahdar');
-            });
-        Route::prefix('operator')
-            ->name('operator.')
-            ->controller(App\Http\Controllers\V3\RoadPatrole\OperatorController::class)
-            ->group(function () {
-                Route::get('/', 'index')
-                    ->middleware('permission:add-road-patrol')
-                    ->name('index');
-
-                Route::get('/report', 'operatorCartableReport')
-                    ->name('cartableReport');
-                Route::post('/delete/{roadPatrol}', 'delete')
-                    ->middleware('permission:partial-delete-road-patrol|complete-delete-road-patrol')
-                    ->name('delete');
-                Route::post('/store', 'store')
-                    ->middleware('permission:add-road-patrol')
-                    ->name('store');
-            });
-
-        Route::prefix('report')
-            ->name('report.')
-            ->controller(ReportController::class)
-            ->group(function () {
-                Route::get('/country_activity', 'countryPatrolActivity')->name('countryPatrolActivity');
-                Route::get('/province_activity', 'provincePatrolActivity')->name('provincePatrolActivity');
-                Route::get('/country_activity_excel', 'countryActivityExcel')->name('countryActivityExcel');
-                Route::get('/province_activity_excel', 'provinceActivityExcel')->name('provinceActivityExcel');
-                Route::get('/activities_on_map', 'activitiesOnMap')->name('activitiesOnMap');
-                Route::get('/show_on_map/{roadPatrol}', 'showOnMap')->name('showOnMap');
-                Route::get('/{roadPatrol}', 'getReport')
-                    ->name('getReport');
-            });
-        Route::prefix('supervisor')
-            ->name('supervisor.')
-            ->controller(App\Http\Controllers\V3\RoadPatrole\SupervisorController::class)
-            ->group(function () {
-                Route::get('/','index')
-                    ->middleware(['permission:show-road-patrol-supervise-cartable|show-road-patrol-supervise-cartable-province'])
-                    ->name('index');
-                Route::get('/report', 'supervisorCartableReport')
-                    ->name('cartableReport');
-
-            });
+        Route::get('/country_activity', 'countryPatrolActivity')->name('countryPatrolActivity');
+        Route::get('/province_activity', 'provincePatrolActivity')->name('provincePatrolActivity');
+        Route::get('/country_activity_excel', 'countryActivityExcel')->name('countryActivityExcel');
+        Route::get('/province_activity_excel', 'provinceActivityExcel')->name('provinceActivityExcel');
+        Route::get('/activities_on_map', 'activitiesOnMap')->name('activitiesOnMap');
+        Route::get('/show_on_map/{roadPatrol}', 'showOnMap')->name('showOnMap');
     });
 
-//Route::prefix('road_patrol_reports')
-//    ->name('roadPatrolReports.')
-//    ->controller(RoadPatrolReportController::class)
-//    ->group(function () {
-//        Route::get('/country_activity', 'countryPatrolActivity')->name('countryPatrolActivity');
-//        Route::get('/province_activity', 'provincePatrolActivity')->name('provincePatrolActivity');
-//        Route::get('/country_activity_excel', 'countryActivityExcel')->name('countryActivityExcel');
-//        Route::get('/province_activity_excel', 'provinceActivityExcel')->name('provinceActivityExcel');
-//        Route::get('/activities_on_map', 'activitiesOnMap')->name('activitiesOnMap');
-//        Route::get('/show_on_map/{roadPatrol}', 'showOnMap')->name('showOnMap');
-//    });
-
 Route::prefix('damages')
     ->name('damages.')
     ->middleware('permission:manage-damage')

From dc887a52157fd069518601c70606e327528d2caf Mon Sep 17 00:00:00 2001
From: joddyabott <faezehzafarbakhsh@gmail.com>
Date: Sun, 22 Jun 2025 10:35:58 +0330
Subject: [PATCH 09/16] create new category for Road patrole service

---
 .../Reports/RoadPatrolReportController.php    | 11 ++--
 .../Dashboard/RoadPatrolProjectController.php | 10 +--
 .../V3/RoadPatrole/OperatorController.php     |  7 +-
 .../V3/RoadPatrole/ReportController.php       | 10 +--
 .../V3/RoadPatrole/SupervisorController.php   |  8 +--
 .../Cartables/RoadPatrol/OperatorService.php  | 35 ++++++++++
 .../ReportService.php}                        | 64 +------------------
 .../RoadPatrol/SupervisiorService.php         | 49 ++++++++++++++
 8 files changed, 107 insertions(+), 87 deletions(-)
 create mode 100644 app/Services/Cartables/RoadPatrol/OperatorService.php
 rename app/Services/Cartables/{RoadPatrolTableService.php => RoadPatrol/ReportService.php} (74%)
 create mode 100644 app/Services/Cartables/RoadPatrol/SupervisiorService.php

diff --git a/app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php b/app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php
index d4382427..32f032f0 100644
--- a/app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php
+++ b/app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php
@@ -8,9 +8,8 @@ use App\Http\Controllers\Controller;
 use App\Http\Traits\ApiResponse;
 use App\Models\EdarateShahri;
 use App\Models\Province;
-use App\Models\RoadObserved;
 use App\Models\RoadPatrol;
-use App\Services\Cartables\RoadPatrolTableService;
+use App\Services\Cartables\RoadPatrol\ReportService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Maatwebsite\Excel\Facades\Excel;
@@ -19,7 +18,7 @@ use Symfony\Component\HttpFoundation\BinaryFileResponse;
 class RoadPatrolReportController extends Controller
 {
     use ApiResponse;
-    public function countryPatrolActivity(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
+    public function countryPatrolActivity(Request $request, ReportService $roadPatrolTableService): JsonResponse
     {
         $activities = $roadPatrolTableService->countryActivity($request);
 
@@ -31,7 +30,7 @@ class RoadPatrolReportController extends Controller
         ]);
     }
 
-    public function provincePatrolActivity(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
+    public function provincePatrolActivity(Request $request, ReportService $roadPatrolTableService): JsonResponse
     {
         $request->validate(["province_id" => "required",]);
 
@@ -45,7 +44,7 @@ class RoadPatrolReportController extends Controller
         ]);
     }
 
-    public function countryActivityExcel(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
+    public function countryActivityExcel(Request $request, ReportService $roadPatrolTableService): BinaryFileResponse
     {
         $activities = $roadPatrolTableService->countryActivity($request);
         $provinces = Province::all(['id', 'name_fa']);
@@ -58,7 +57,7 @@ class RoadPatrolReportController extends Controller
         ]), $name);
     }
 
-    public function provinceActivityExcel(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
+    public function provinceActivityExcel(Request $request, ReportService $roadPatrolTableService): BinaryFileResponse
     {
         $activities = $roadPatrolTableService->provinceActivity($request);
         $edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
diff --git a/app/Http/Controllers/V3/Dashboard/RoadPatrolProjectController.php b/app/Http/Controllers/V3/Dashboard/RoadPatrolProjectController.php
index 3d0de3b9..a8d9fbe1 100644
--- a/app/Http/Controllers/V3/Dashboard/RoadPatrolProjectController.php
+++ b/app/Http/Controllers/V3/Dashboard/RoadPatrolProjectController.php
@@ -16,8 +16,8 @@ use App\Models\Mission;
 use App\Models\RoadItemsProject;
 use App\Models\RoadObserved;
 use App\Models\RoadPatrol;
+use App\Services\Cartables\RoadPatrol\ReportService;
 use App\Services\NominatimService;
-use App\Services\Cartables\RoadPatrolTableService;
 use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -32,7 +32,7 @@ class RoadPatrolProjectController extends Controller
 {
     use ApiResponse;
 
-    public function supervisorIndex(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
+    public function supervisorIndex(Request $request, ReportService $roadPatrolTableService): JsonResponse
     {
         $data = $roadPatrolTableService->supervisorCartableReport($request);
 
@@ -82,14 +82,14 @@ class RoadPatrolProjectController extends Controller
         return $this->successResponse();
     }
 
-    public function supervisorCartableReport(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
+    public function supervisorCartableReport(Request $request, ReportService $roadPatrolTableService): BinaryFileResponse
     {
         $name = 'گزارش از کارتابل ارزیابی گشت راهداری ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
         $data = $roadPatrolTableService->supervisorCartableReport($request, true);
         return Excel::download(new SupervisorCartableReport($data['data']), $name);
     }
 
-    public function operatorIndex(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
+    public function operatorIndex(Request $request, ReportService $roadPatrolTableService): JsonResponse
     {
         $data = $roadPatrolTableService->operatorCartableReport($request);
         return response()->json($data);
@@ -331,7 +331,7 @@ class RoadPatrolProjectController extends Controller
         return $this->successResponse($roadPatrol);
     }
 
-    public function operatorCartableReport(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
+    public function operatorCartableReport(Request $request, ReportService $roadPatrolTableService): BinaryFileResponse
     {
         $name = 'گزارش از کارتابل عملیات گشت راهداری ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
         $data = $roadPatrolTableService->operatorCartableReport($request, true);
diff --git a/app/Http/Controllers/V3/RoadPatrole/OperatorController.php b/app/Http/Controllers/V3/RoadPatrole/OperatorController.php
index c423388c..a61fe47d 100644
--- a/app/Http/Controllers/V3/RoadPatrole/OperatorController.php
+++ b/app/Http/Controllers/V3/RoadPatrole/OperatorController.php
@@ -5,7 +5,6 @@ namespace App\Http\Controllers\V3\RoadPatrole;
 
 use App\Enums\MissionStates;
 use App\Exports\V3\RoadPatrols\OperatorCartableReport;
-use App\Exports\V3\RoadPatrols\ProvinceActivity;
 use App\Facades\Sms\Sms;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\V3\RoadPatrol\DeleteRequest;
@@ -16,7 +15,7 @@ use App\Models\InfoItem;
 use App\Models\Mission;
 use App\Models\RoadItemsProject;
 use App\Models\RoadPatrol;
-use App\Services\Cartables\RoadPatrolTableService;
+use App\Services\Cartables\RoadPatrol\OperatorService;
 use App\Services\NominatimService;
 use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
@@ -31,12 +30,12 @@ use Symfony\Component\HttpFoundation\BinaryFileResponse;
 class OperatorController extends Controller
 {
     use ApiResponse;
-    public function index(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
+    public function index(Request $request, OperatorService $roadPatrolTableService): JsonResponse
     {
         $data = $roadPatrolTableService->operatorCartableReport($request);
         return response()->json($data);
     }
-    public function operatorCartableReport(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
+    public function operatorCartableReport(Request $request, OperatorService $roadPatrolTableService): BinaryFileResponse
     {
         $name = 'گزارش از کارتابل عملیات گشت راهداری ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
         $data = $roadPatrolTableService->operatorCartableReport($request, true);
diff --git a/app/Http/Controllers/V3/RoadPatrole/ReportController.php b/app/Http/Controllers/V3/RoadPatrole/ReportController.php
index a900029e..8d12d301 100644
--- a/app/Http/Controllers/V3/RoadPatrole/ReportController.php
+++ b/app/Http/Controllers/V3/RoadPatrole/ReportController.php
@@ -9,7 +9,7 @@ use App\Http\Traits\ApiResponse;
 use App\Models\EdarateShahri;
 use App\Models\Province;
 use App\Models\RoadPatrol;
-use App\Services\Cartables\RoadPatrolTableService;
+use App\Services\Cartables\RoadPatrol\ReportService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Maatwebsite\Excel\Facades\Excel;
@@ -70,7 +70,7 @@ class ReportController extends Controller
         $data['observed_items'] = $observed_items;
         return $this->successResponse($data);
     }
-    public function countryPatrolActivity(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
+    public function countryPatrolActivity(Request $request, ReportService $roadPatrolTableService): JsonResponse
     {
         $activities = $roadPatrolTableService->countryActivity($request);
 
@@ -82,7 +82,7 @@ class ReportController extends Controller
         ]);
     }
 
-    public function provincePatrolActivity(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
+    public function provincePatrolActivity(Request $request, ReportService $roadPatrolTableService): JsonResponse
     {
         $request->validate(["province_id" => "required",]);
 
@@ -96,7 +96,7 @@ class ReportController extends Controller
         ]);
     }
 
-    public function countryActivityExcel(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
+    public function countryActivityExcel(Request $request, ReportService $roadPatrolTableService): BinaryFileResponse
     {
         $activities = $roadPatrolTableService->countryActivity($request);
         $provinces = Province::all(['id', 'name_fa']);
@@ -109,7 +109,7 @@ class ReportController extends Controller
         ]), $name);
     }
 
-    public function provinceActivityExcel(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
+    public function provinceActivityExcel(Request $request, ReportService $roadPatrolTableService): BinaryFileResponse
     {
         $activities = $roadPatrolTableService->provinceActivity($request);
         $edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
diff --git a/app/Http/Controllers/V3/RoadPatrole/SupervisorController.php b/app/Http/Controllers/V3/RoadPatrole/SupervisorController.php
index e5be5893..ad6bead0 100644
--- a/app/Http/Controllers/V3/RoadPatrole/SupervisorController.php
+++ b/app/Http/Controllers/V3/RoadPatrole/SupervisorController.php
@@ -2,12 +2,10 @@
 
 namespace App\Http\Controllers\V3\RoadPatrole;
 
-use App\Exports\V3\RoadPatrols\CountryActivity;
 use App\Exports\V3\RoadPatrols\SupervisorCartableReport;
 use App\Http\Controllers\Controller;
 use App\Http\Traits\ApiResponse;
-use App\Models\Province;
-use App\Services\Cartables\RoadPatrolTableService;
+use App\Services\Cartables\RoadPatrol\SupervisiorService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Gate;
@@ -17,7 +15,7 @@ use Symfony\Component\HttpFoundation\BinaryFileResponse;
 class SupervisorController extends Controller
 {
     use ApiResponse;
-    public function index(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
+    public function index(Request $request, SupervisiorService $roadPatrolTableService): JsonResponse
     {
         $data = $roadPatrolTableService->supervisorCartableReport($request);
 
@@ -31,7 +29,7 @@ class SupervisorController extends Controller
 
         return response()->json($data);
     }
-    public function supervisorCartableReport(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
+    public function supervisorCartableReport(Request $request, SupervisiorService $roadPatrolTableService): BinaryFileResponse
     {
         $name = 'گزارش از کارتابل ارزیابی گشت راهداری ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
         $data = $roadPatrolTableService->supervisorCartableReport($request, true);
diff --git a/app/Services/Cartables/RoadPatrol/OperatorService.php b/app/Services/Cartables/RoadPatrol/OperatorService.php
new file mode 100644
index 00000000..3fcc0306
--- /dev/null
+++ b/app/Services/Cartables/RoadPatrol/OperatorService.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Services\Cartables\RoadPatrol;
+
+use App\Facades\DataTable\DataTableFacade;
+use App\Models\RoadPatrol;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class OperatorService
+{
+
+
+    public function operatorCartableReport(Request $request, $loadRelations = false)
+    {
+        $allowedFilters = ['*'];
+        $allowedSortings = ['*'];
+
+        $query = RoadPatrol::query()
+            ->select([
+                'province_fa', 'province_id', 'id', 'edare_id', 'edare_name', 'start_time', 'end_time', 'created_at', 'description',
+                'distance', 'vehicle_runtime', 'fuel_consumption', 'stop_points'
+            ])
+            ->where('operator_id', '=', auth()->user()->id)
+            ->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
+
+        $data = DataTableFacade::run(
+            $query,
+            $request,
+            allowedFilters: $allowedFilters,
+            allowedSortings: $allowedSortings);
+
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/app/Services/Cartables/RoadPatrolTableService.php b/app/Services/Cartables/RoadPatrol/ReportService.php
similarity index 74%
rename from app/Services/Cartables/RoadPatrolTableService.php
rename to app/Services/Cartables/RoadPatrol/ReportService.php
index d43a45d7..827648b3 100644
--- a/app/Services/Cartables/RoadPatrolTableService.php
+++ b/app/Services/Cartables/RoadPatrol/ReportService.php
@@ -1,74 +1,14 @@
 <?php
 
-namespace App\Services\Cartables;
+namespace App\Services\Cartables\RoadPatrol;
 
 use App\Facades\DataTable\DataTableFacade;
 use App\Models\RoadPatrol;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class RoadPatrolTableService
+class ReportService
 {
-    public function supervisorCartableReport(Request $request, $loadRelations = false)
-    {
-        $allowedFilters = ['*'];
-        $allowedSortings = ['*'];
-
-        $user = auth()->user();
-        $query = null;
-
-        if ($user->hasPermissionTo('show-road-patrol-supervise-cartable')) {
-            $query = RoadPatrol::query()
-                ->select([
-                    'province_fa', 'province_id', 'id', 'edare_id', 'edare_name', 'start_time', 'end_time', 'created_at', 'description',
-                    'distance', 'vehicle_runtime', 'fuel_consumption', 'stop_points'
-                ])
-                ->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
-        }
-        elseif ($user->hasPermissionTo('show-road-patrol-supervise-cartable-province')) {
-            if (is_null($user->province_id)) {
-                return $this->errorResponse('استانی برای شما در سامانه ثبت نشده است!');
-            }
-            $query = RoadPatrol::query()
-                ->select([
-                    'province_fa', 'province_id', 'id', 'edare_id', 'edare_name', 'start_time', 'end_time', 'created_at', 'description',
-                    'distance', 'vehicle_runtime', 'fuel_consumption', 'stop_points'
-                ])
-                ->where('province_id', '=', $user->province_id)
-                ->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
-        }
-
-        $data = DataTableFacade::run(
-            $query,
-            $request,
-            allowedFilters: $allowedFilters,
-            allowedSortings: $allowedSortings);
-
-        return $data;
-    }
-
-    public function operatorCartableReport(Request $request, $loadRelations = false)
-    {
-        $allowedFilters = ['*'];
-        $allowedSortings = ['*'];
-
-        $query = RoadPatrol::query()
-            ->select([
-                'province_fa', 'province_id', 'id', 'edare_id', 'edare_name', 'start_time', 'end_time', 'created_at', 'description',
-                'distance', 'vehicle_runtime', 'fuel_consumption', 'stop_points'
-            ])
-            ->where('operator_id', '=', auth()->user()->id)
-            ->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
-
-        $data = DataTableFacade::run(
-            $query,
-            $request,
-            allowedFilters: $allowedFilters,
-            allowedSortings: $allowedSortings);
-
-        return $data;
-    }
-
     public function countryActivity(Request $request): array
     {
         $fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString();
diff --git a/app/Services/Cartables/RoadPatrol/SupervisiorService.php b/app/Services/Cartables/RoadPatrol/SupervisiorService.php
new file mode 100644
index 00000000..5fb85820
--- /dev/null
+++ b/app/Services/Cartables/RoadPatrol/SupervisiorService.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Services\Cartables\RoadPatrol;
+
+use App\Facades\DataTable\DataTableFacade;
+use App\Models\RoadPatrol;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class SupervisiorService
+{
+    public function supervisorCartableReport(Request $request, $loadRelations = false)
+    {
+        $allowedFilters = ['*'];
+        $allowedSortings = ['*'];
+
+        $user = auth()->user();
+        $query = null;
+
+        if ($user->hasPermissionTo('show-road-patrol-supervise-cartable')) {
+            $query = RoadPatrol::query()
+                ->select([
+                    'province_fa', 'province_id', 'id', 'edare_id', 'edare_name', 'start_time', 'end_time', 'created_at', 'description',
+                    'distance', 'vehicle_runtime', 'fuel_consumption', 'stop_points'
+                ])
+                ->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
+        }
+        elseif ($user->hasPermissionTo('show-road-patrol-supervise-cartable-province')) {
+            if (is_null($user->province_id)) {
+                return $this->errorResponse('استانی برای شما در سامانه ثبت نشده است!');
+            }
+            $query = RoadPatrol::query()
+                ->select([
+                    'province_fa', 'province_id', 'id', 'edare_id', 'edare_name', 'start_time', 'end_time', 'created_at', 'description',
+                    'distance', 'vehicle_runtime', 'fuel_consumption', 'stop_points'
+                ])
+                ->where('province_id', '=', $user->province_id)
+                ->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
+        }
+
+        $data = DataTableFacade::run(
+            $query,
+            $request,
+            allowedFilters: $allowedFilters,
+            allowedSortings: $allowedSortings);
+
+        return $data;
+    }
+}
\ No newline at end of file

From c9cc74ec487ab97ea828a12587b735b54e983e04 Mon Sep 17 00:00:00 2001
From: amirghasempoor <amirghasempoor79@gmail.com>
Date: Mon, 16 Jun 2025 10:49:04 +0330
Subject: [PATCH 10/16] separate operator from supervisor in road item

---
 .../Dashboard/RoadItem/DetailController.php   |  29 ++++
 .../OperatorController.php}                   | 151 +++++-------------
 .../RoadItem/SupervisorController.php         | 117 ++++++++++++++
 .../StoreRequest.php                          |   2 +-
 .../V3/RoadItem/Supervisor/ConfirmRequest.php |  30 ++++
 .../V3/RoadItem/Supervisor/RejectRequest.php  |  30 ++++
 .../UpdateRequest.php                         |   2 +-
 .../VerifyBySupervisorRequest.php             |   2 +-
 .../Cartables/RoadItem/OperatorService.php    |  30 ++++
 .../Cartables/RoadItem/SupervisorService.php  |  46 ++++++
 ...2407_add_column_to_road_items_projects.php |  28 ++++
 routes/v3.php                                 |  71 ++++----
 12 files changed, 384 insertions(+), 154 deletions(-)
 create mode 100644 app/Http/Controllers/V3/Dashboard/RoadItem/DetailController.php
 rename app/Http/Controllers/V3/Dashboard/{RoadItemsProjectController.php => RoadItem/OperatorController.php} (60%)
 create mode 100644 app/Http/Controllers/V3/Dashboard/RoadItem/SupervisorController.php
 rename app/Http/Requests/V3/{RoadItemsProject => RoadItem}/StoreRequest.php (98%)
 create mode 100644 app/Http/Requests/V3/RoadItem/Supervisor/ConfirmRequest.php
 create mode 100644 app/Http/Requests/V3/RoadItem/Supervisor/RejectRequest.php
 rename app/Http/Requests/V3/{RoadItemsProject => RoadItem}/UpdateRequest.php (96%)
 rename app/Http/Requests/V3/{RoadItemsProject => RoadItem}/VerifyBySupervisorRequest.php (94%)
 create mode 100644 app/Services/Cartables/RoadItem/OperatorService.php
 create mode 100644 app/Services/Cartables/RoadItem/SupervisorService.php
 create mode 100644 database/migrations/2025_06_16_092407_add_column_to_road_items_projects.php

diff --git a/app/Http/Controllers/V3/Dashboard/RoadItem/DetailController.php b/app/Http/Controllers/V3/Dashboard/RoadItem/DetailController.php
new file mode 100644
index 00000000..dc6d3efd
--- /dev/null
+++ b/app/Http/Controllers/V3/Dashboard/RoadItem/DetailController.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Controllers\V3\Dashboard\RoadItem;
+
+use App\Http\Controllers\Controller;
+use App\Http\Traits\ApiResponse;
+use App\Models\RoadItemsProject;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DetailController extends Controller
+{
+    use ApiResponse;
+
+    public function machines(RoadItemsProject $roadItemsProject): JsonResponse
+    {
+        return $this->successResponse($roadItemsProject->cmmsMachines()->get(['cmms_machines.id', 'cmms_machines.machine_code', 'cmms_machines.car_name', 'cmms_machines.plak_number']));
+    }
+
+    public function rahdaran(RoadItemsProject $roadItemsProject): JsonResponse
+    {
+        return $this->successResponse($roadItemsProject->rahdaran()->get(['rahdaran.id', 'rahdaran.name', 'rahdaran.code']));
+    }
+
+    public function files(RoadItemsProject $roadItemsProject): JsonResponse
+    {
+        return $this->successResponse($roadItemsProject->files()->get(['path']));
+    }
+}
diff --git a/app/Http/Controllers/V3/Dashboard/RoadItemsProjectController.php b/app/Http/Controllers/V3/Dashboard/RoadItem/OperatorController.php
similarity index 60%
rename from app/Http/Controllers/V3/Dashboard/RoadItemsProjectController.php
rename to app/Http/Controllers/V3/Dashboard/RoadItem/OperatorController.php
index bcb9e6fb..d3a0a9ab 100644
--- a/app/Http/Controllers/V3/Dashboard/RoadItemsProjectController.php
+++ b/app/Http/Controllers/V3/Dashboard/RoadItem/OperatorController.php
@@ -1,130 +1,51 @@
 <?php
 
-namespace App\Http\Controllers\V3\Dashboard;
+namespace App\Http\Controllers\V3\Dashboard\RoadItem;
 
+use App\Exceptions\ProhibitedAction;
 use App\Exports\V3\RoadItemsProjects\OperatorCartableReport;
-use App\Exports\V3\RoadItemsProjects\SupervisorCartableReport;
 use App\Http\Controllers\Controller;
-use App\Http\Requests\V3\RoadItemsProject\StoreRequest;
-use App\Http\Requests\V3\RoadItemsProject\UpdateRequest;
-use App\Http\Requests\V3\RoadItemsProject\VerifyBySupervisorRequest;
 use App\Http\Traits\ApiResponse;
 use App\Models\EdarateShahri;
 use App\Models\InfoItem;
 use App\Models\RoadItemsProject;
-use App\Services\NominatimService;
+use App\Services\Cartables\RoadItem\OperatorService;
 use App\Services\Cartables\RoadItemTableService;
+use App\Services\NominatimService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Validation\ValidationException;
 use Maatwebsite\Excel\Facades\Excel;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 
-class RoadItemsProjectController extends Controller
+class OperatorController extends Controller
 {
     use ApiResponse;
     /**
      * Display a listing of the resource.
      */
-    public function supervisorIndex(Request $request, RoadItemTableService $roadItemTableService): JsonResponse
+    public function index(Request $request, OperatorService $operatorService): JsonResponse
     {
-        $data = $roadItemTableService->supervisorCartableReport($request);
-
-        foreach ($data['data'] as $road_item) {
-            if (Gate::allows('gate-supervise-road-item', $road_item)) {
-                $road_item['can_supervise'] = 1;
-            } else {
-                $road_item['can_supervise'] = 0;
-            }
-        }
-
+        $data = $operatorService->dataTable($request);
         return response()->json($data);
     }
 
-    public function verifyBySupervisor(VerifyBySupervisorRequest $request, RoadItemsProject $roadItemsProject): JsonResponse
+    public function excel(Request $request, OperatorService $operatorService): BinaryFileResponse
     {
-        $status_fa = $request->verify == 1 ? 'تایید شده' : 'عدم تایید';
-        $user = auth()->user();
-
-        $roadItemsProject->update([
-            'status' => $request->verify,
-            'status_fa' => $status_fa,
-            'supervisor_id' => $user->id,
-            'supervisor_name' => $user->name,
-            'supervisor_description' => $request->description,
-            'supervising_time' => now(),
-        ]);
-
-        $user->addActivityComplete(1149);
-
-        return $this->successResponse();
-    }
-
-    public function restore(RoadItemsProject $roadItemsProject): JsonResponse
-    {
-        if ($roadItemsProject->status == 0) {
-            return $this->errorResponse('امکان بازگردانی وضعیت این فعالیت وجود ندارد!');
-        }
-
-        $roadItemsProject->update([
-            'status' => 0,
-            'status_fa' => 'در حال بررسی',
-            'supervisor_id' => null,
-            'supervisor_description' => null,
-            'supervising_time' => null,
-            'supervisor_name' =>  null,
-        ]);
-        auth()->user()->addActivityComplete(1150);
-
-        return $this->successResponse();
-    }
-
-    public function delete(RoadItemsProject $roadItemsProject): JsonResponse
-    {
-        if ($roadItemsProject->files()->exists()) {
-            Storage::delete('public/'. $roadItemsProject->files[0]->path);
-            Storage::delete('public/'. $roadItemsProject->files[1]->path);
-            $roadItemsProject->files()->delete();
-        }
-        auth()->user()->addActivityComplete(1151);
-
-        $roadItemsProject->delete();
-
-        return $this->successResponse();
-    }
-
-
-    public function supervisorCartableReport(Request $request, RoadItemTableService $roadItemTableService): BinaryFileResponse
-    {
-        $name = 'گزارش از کارتابل ارزیابی فعالیت روزانه ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
-        $data = $roadItemTableService->supervisorCartableReport($request, true);
-        return Excel::download(new SupervisorCartableReport($data['data']), $name);
-    }
-
-    public function operatorIndex(Request $request, RoadItemTableService $roadItemTableService): JsonResponse
-    {
-        $data = $roadItemTableService->operatorCartableReport($request);
-        return response()->json($data);
+        $name = 'گزارش از کارتابل عملیات فعالیت روزانه ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
+        $data = $operatorService->dataTable($request, true);
+        return Excel::download(new OperatorCartableReport($data['data']), $name);
     }
 
     /**
      * Store a newly created resource in storage.
-     * @throws ValidationException
+     * @throws \Throwable
      */
-    public function store(StoreRequest $request, NominatimService $nominatimService): JsonResponse
+    public function store(Request $request, NominatimService $nominatimService): JsonResponse
     {
         $user = auth()->user();
 
-        if ($user->edarate_ostani_id || is_null($user->city_id)) {
-            return $this->errorResponse('امکان ثبت فعالیت برای ادارات استانی و ستادی وجود ندارد!');
-        }
-
-        if (is_null($user->edarate_shahri_id)) {
-            return $this->errorResponse('اداره شهری برای شما در سامانه ثبت نشده است!');
-        }
-
         $info_item = InfoItem::query()->where('item', $request->item_id)
             ->where('sub_item', $request->sub_item_id)
             ->firstOrFail();
@@ -184,9 +105,7 @@ class RoadItemsProjectController extends Controller
 
         $road_item = RoadItemsProject::store($user, $attributes, $before_image, $after_image, $request->observed_item_id);
 
-        if ($road_item === -1) {
-            return $this->errorResponse('اقدام مربوطه قبلا رسیدگی شده است.');
-        }
+        throw_if($road_item === -1, new ProhibitedAction('اقدام مربوطه قبلا رسیدگی شده است.'));
 
         $road_item->rahdaran()->attach($request->rahdaran_id);
         $road_item->cmmsMachines()->attach($request->machines_id);
@@ -197,10 +116,17 @@ class RoadItemsProjectController extends Controller
     }
 
     /**
-     * Update the specified resource in storage.
-     * @throws ValidationException
+     * Display the specified resource.
      */
-    public function update(UpdateRequest $request, RoadItemsProject $roadItemsProject): JsonResponse
+    public function show(RoadItemsProject $roadItemsProject): JsonResponse
+    {
+        return $this->successResponse($roadItemsProject);
+    }
+
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(Request $request, RoadItemsProject $roadItemsProject): JsonResponse
     {
         $info_item = InfoItem::query()->where('item', $roadItemsProject->item)
             ->where('sub_item', $roadItemsProject->sub_item)
@@ -264,25 +190,20 @@ class RoadItemsProjectController extends Controller
         return $this->successResponse();
     }
 
-    public function operatorCartableReport(Request $request, RoadItemTableService $roadItemTableService): BinaryFileResponse
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy(RoadItemsProject $roadItemsProject): JsonResponse
     {
-        $name = 'گزارش از کارتابل عملیات فعالیت روزانه ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
-        $data = $roadItemTableService->operatorCartableReport($request, true);
-        return Excel::download(new OperatorCartableReport($data['data']), $name);
-    }
+        if ($roadItemsProject->files()->exists()) {
+            Storage::delete('public/'. $roadItemsProject->files[0]->path);
+            Storage::delete('public/'. $roadItemsProject->files[1]->path);
+            $roadItemsProject->files()->delete();
+        }
+        auth()->user()->addActivityComplete(1151);
 
-    public function roadItemMachine(RoadItemsProject $roadItemsProject): JsonResponse
-    {
-        return $this->successResponse($roadItemsProject->cmmsMachines()->get(['cmms_machines.id', 'cmms_machines.machine_code', 'cmms_machines.car_name', 'cmms_machines.plak_number']));
-    }
+        $roadItemsProject->delete();
 
-    public function roadItemRahdar(RoadItemsProject $roadItemsProject): JsonResponse
-    {
-        return $this->successResponse($roadItemsProject->rahdaran()->get(['rahdaran.id', 'rahdaran.name', 'rahdaran.code']));
-    }
-
-    public function roadItemFile(RoadItemsProject $roadItemsProject): JsonResponse
-    {
-        return $this->successResponse($roadItemsProject->files()->get(['path']));
+        return $this->successResponse();
     }
 }
diff --git a/app/Http/Controllers/V3/Dashboard/RoadItem/SupervisorController.php b/app/Http/Controllers/V3/Dashboard/RoadItem/SupervisorController.php
new file mode 100644
index 00000000..42cdb28c
--- /dev/null
+++ b/app/Http/Controllers/V3/Dashboard/RoadItem/SupervisorController.php
@@ -0,0 +1,117 @@
+<?php
+
+namespace App\Http\Controllers\V3\Dashboard\RoadItem;
+
+use App\Exceptions\ProhibitedAction;
+use App\Exports\V3\RoadItemsProjects\SupervisorCartableReport;
+use App\Http\Controllers\Controller;
+use App\Http\Requests\V3\RoadItem\Supervisor\ConfirmRequest;
+use App\Http\Requests\V3\RoadItem\Supervisor\RejectRequest;
+use App\Http\Requests\V3\RoadItem\VerifyBySupervisorRequest;
+use App\Http\Traits\ApiResponse;
+use App\Models\RoadItemsProject;
+use App\Services\Cartables\RoadItem\SupervisorService;
+use App\Services\Cartables\RoadItemTableService;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Gate;
+use Maatwebsite\Excel\Facades\Excel;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Throwable;
+
+class SupervisorController extends Controller
+{
+    use ApiResponse;
+
+    /**
+     * @throws Throwable
+     */
+    public function index(Request $request, SupervisorService $supervisorService): JsonResponse
+    {
+        $data = $supervisorService->dataTable($request);
+
+        foreach ($data['data'] as $road_item) {
+            if (Gate::allows('gate-supervise-road-item', $road_item)) {
+                $road_item['can_supervise'] = 1;
+            } else {
+                $road_item['can_supervise'] = 0;
+            }
+        }
+
+        return response()->json($data);
+    }
+
+    /**
+     * @throws Throwable
+     */
+    public function excel(Request $request, SupervisorService $supervisorService): BinaryFileResponse
+    {
+        $name = 'گزارش از کارتابل ارزیابی فعالیت روزانه ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
+        $data = $supervisorService->dataTable($request, true);
+        return Excel::download(new SupervisorCartableReport($data['data']), $name);
+    }
+
+    public function confirm(ConfirmRequest $request, RoadItemsProject $roadItemsProject): JsonResponse
+    {
+        $user = auth()->user();
+
+        DB::transaction(function () use ($request, $roadItemsProject, $user) {
+            $roadItemsProject->update([
+                'status' => 1,
+                'status_fa' => 'تایید شده',
+                'supervisor_id' => $user->id,
+                'supervisor_name' => $user->name,
+                'supervisor_description' => $request->description,
+                'supervising_time' => now(),
+            ]);
+
+            $user->addActivityComplete(1149);
+        });
+
+        return $this->successResponse();
+    }
+
+    public function reject(RejectRequest $request, RoadItemsProject $roadItemsProject): JsonResponse
+    {
+        $user = auth()->user();
+
+        DB::transaction(function () use ($request, $roadItemsProject, $user) {
+            $roadItemsProject->update([
+                'status' => 2,
+                'status_fa' => 'عدم تایید',
+                'supervisor_id' => $user->id,
+                'supervisor_name' => $user->name,
+                'supervisor_description' => $request->description,
+                'supervising_time' => now(),
+            ]);
+
+            $user->addActivityComplete(1149);
+        });
+
+        return $this->successResponse();
+    }
+
+    /**
+     * @throws Throwable
+     */
+    public function restore(RoadItemsProject $roadItemsProject): JsonResponse
+    {
+
+        throw_if($roadItemsProject->status == 0, new ProhibitedAction('امکان بازگردانی وضعیت این فعالیت وجود ندارد!'));
+
+        DB::transaction(function () use ($roadItemsProject) {
+            $roadItemsProject->update([
+                'status' => 0,
+                'status_fa' => 'در حال بررسی',
+                'supervisor_id' => null,
+                'supervisor_description' => null,
+                'supervising_time' => null,
+                'supervisor_name' =>  null,
+            ]);
+            auth()->user()->addActivityComplete(1150);
+        });
+
+        return $this->successResponse();
+    }
+}
diff --git a/app/Http/Requests/V3/RoadItemsProject/StoreRequest.php b/app/Http/Requests/V3/RoadItem/StoreRequest.php
similarity index 98%
rename from app/Http/Requests/V3/RoadItemsProject/StoreRequest.php
rename to app/Http/Requests/V3/RoadItem/StoreRequest.php
index 03b3fb46..612026ec 100644
--- a/app/Http/Requests/V3/RoadItemsProject/StoreRequest.php
+++ b/app/Http/Requests/V3/RoadItem/StoreRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\V3\RoadItemsProject;
+namespace App\Http\Requests\V3\RoadItem;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Validator;
diff --git a/app/Http/Requests/V3/RoadItem/Supervisor/ConfirmRequest.php b/app/Http/Requests/V3/RoadItem/Supervisor/ConfirmRequest.php
new file mode 100644
index 00000000..56f26ba5
--- /dev/null
+++ b/app/Http/Requests/V3/RoadItem/Supervisor/ConfirmRequest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Requests\V3\RoadItem\Supervisor;
+
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Gate;
+
+class ConfirmRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return Gate::allows('gate-supervise-road-item', $this->roadItemsProject);
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, ValidationRule|array|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'description' => 'string',
+        ];
+    }
+}
diff --git a/app/Http/Requests/V3/RoadItem/Supervisor/RejectRequest.php b/app/Http/Requests/V3/RoadItem/Supervisor/RejectRequest.php
new file mode 100644
index 00000000..d6af0596
--- /dev/null
+++ b/app/Http/Requests/V3/RoadItem/Supervisor/RejectRequest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Requests\V3\RoadItem\Supervisor;
+
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Gate;
+
+class RejectRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return Gate::allows('gate-supervise-road-item', $this->roadItemsProject);
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, ValidationRule|array|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'description' => 'string',
+        ];
+    }
+}
diff --git a/app/Http/Requests/V3/RoadItemsProject/UpdateRequest.php b/app/Http/Requests/V3/RoadItem/UpdateRequest.php
similarity index 96%
rename from app/Http/Requests/V3/RoadItemsProject/UpdateRequest.php
rename to app/Http/Requests/V3/RoadItem/UpdateRequest.php
index 6f80951f..865c9101 100644
--- a/app/Http/Requests/V3/RoadItemsProject/UpdateRequest.php
+++ b/app/Http/Requests/V3/RoadItem/UpdateRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\V3\RoadItemsProject;
+namespace App\Http\Requests\V3\RoadItem;
 
 use App\Models\InfoItem;
 use App\Models\User;
diff --git a/app/Http/Requests/V3/RoadItemsProject/VerifyBySupervisorRequest.php b/app/Http/Requests/V3/RoadItem/VerifyBySupervisorRequest.php
similarity index 94%
rename from app/Http/Requests/V3/RoadItemsProject/VerifyBySupervisorRequest.php
rename to app/Http/Requests/V3/RoadItem/VerifyBySupervisorRequest.php
index 6d0a19a3..e8c0560d 100644
--- a/app/Http/Requests/V3/RoadItemsProject/VerifyBySupervisorRequest.php
+++ b/app/Http/Requests/V3/RoadItem/VerifyBySupervisorRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\V3\RoadItemsProject;
+namespace App\Http\Requests\V3\RoadItem;
 
 use App\Models\InfoItem;
 use App\Models\User;
diff --git a/app/Services/Cartables/RoadItem/OperatorService.php b/app/Services/Cartables/RoadItem/OperatorService.php
new file mode 100644
index 00000000..cba4699a
--- /dev/null
+++ b/app/Services/Cartables/RoadItem/OperatorService.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Services\Cartables\RoadItem;
+
+use App\Facades\DataTable\DataTableFacade;
+use App\Models\RoadItemsProject;
+use Illuminate\Http\Request;
+
+class OperatorService
+{
+    public function dataTable(Request $request, $loadRelations = false)
+    {
+        $query = RoadItemsProject::query()
+            ->where('is_new', '=', 1)
+            ->where('user_id', '=', auth()->user()->id)
+            ->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
+
+        return DataTableFacade::run(
+            $query,
+            $request,
+            allowedFilters: ['*'],
+            allowedSortings: ['*'],
+            allowedSelects: [
+                'id', 'province_fa', 'edarat_name', 'supervisor_description', 'item', 'item_fa',
+                'sub_item', 'sub_item_fa', 'sub_item_data', 'unit_fa', 'start_lat', 'start_lng',
+                'end_lat', 'end_lng', 'activity_date_time', 'created_at', 'status_fa', 'status'
+            ],
+        );
+    }
+}
\ No newline at end of file
diff --git a/app/Services/Cartables/RoadItem/SupervisorService.php b/app/Services/Cartables/RoadItem/SupervisorService.php
new file mode 100644
index 00000000..ee7510fb
--- /dev/null
+++ b/app/Services/Cartables/RoadItem/SupervisorService.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Services\Cartables\RoadItem;
+
+use App\Exceptions\ProhibitedAction;
+use App\Facades\DataTable\DataTableFacade;
+use App\Models\RoadItemsProject;
+use Illuminate\Http\Request;
+use Throwable;
+
+class SupervisorService
+{
+    /**
+     * @throws Throwable
+     */
+    public function dataTable(Request $request, $loadRelations = false)
+    {
+        $user = auth()->user();
+        $query = null;
+
+        if ($user->hasPermissionTo('show-road-item-supervise-cartable')) {
+            $query = RoadItemsProject::query()
+                ->where('is_new', 1)
+                ->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
+        }
+        elseif ($user->hasPermissionTo('show-road-item-supervise-cartable-province')) {
+            throw_if(is_null($user->province_id), new ProhibitedAction('استانی برای شما در سامانه ثبت نشده است!'));
+            $query = RoadItemsProject::query()
+                ->where('is_new', 1)
+                ->where('province_id', auth()->user()->province_id)
+                ->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
+        }
+
+        return DataTableFacade::run(
+            $query,
+            $request,
+            allowedFilters: ['*'],
+            allowedSortings: ['*'],
+            allowedSelects: [
+                'id', 'province_fa', 'edarat_name', 'item', 'item_fa', 'sub_item',
+                'sub_item_fa', 'sub_item_data', 'unit_fa', 'start_lat', 'start_lng',
+                'end_lat', 'end_lng', 'activity_date_time', 'created_at', 'status_fa', 'status'
+            ]
+        );
+    }
+}
\ No newline at end of file
diff --git a/database/migrations/2025_06_16_092407_add_column_to_road_items_projects.php b/database/migrations/2025_06_16_092407_add_column_to_road_items_projects.php
new file mode 100644
index 00000000..3630d6f9
--- /dev/null
+++ b/database/migrations/2025_06_16_092407_add_column_to_road_items_projects.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('road_items_projects', function (Blueprint $table) {
+            $table->foreignId('mission_id')->constrained('missions');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('road_items_projects', function (Blueprint $table) {
+            $table->dropColumn('mission_id');
+        });
+    }
+};
diff --git a/routes/v3.php b/routes/v3.php
index 59e0647a..9dce4324 100644
--- a/routes/v3.php
+++ b/routes/v3.php
@@ -17,9 +17,7 @@ use App\Http\Controllers\V3\Dashboard\ObservedItemController;
 use App\Http\Controllers\V3\Dashboard\OtpManagementController;
 use App\Http\Controllers\V3\Dashboard\Reports\RoadItemsReportController;
 use App\Http\Controllers\V3\Dashboard\Reports\RoadPatrolReportController;
-use App\Http\Controllers\V3\Dashboard\RoadItemsProjectController;
 use App\Http\Controllers\V3\Dashboard\RoadMaintenanceStationController;
-use App\Http\Controllers\V3\Dashboard\RoadObservation\RoadObservationController;
 use App\Http\Controllers\V3\Dashboard\RoadPatrolProjectController;
 use App\Http\Controllers\V3\Dashboard\SafetyAndPrivacy\OperatorController;
 use App\Http\Controllers\V3\Dashboard\SafetyAndPrivacy\OperatorReportController;
@@ -116,40 +114,41 @@ Route::prefix('road_items')
     ->controller(RoadItemsProjectController::class)
     ->group(function () {
 
-        Route::get('/supervisor_index', 'supervisorIndex')
+        Route::prefix('operator')
+            ->name('operator.')
+            ->controller(\App\Http\Controllers\V3\Dashboard\RoadItem\OperatorController::class)
+            ->group(function () {
+                Route::get('/', 'index')->middleware('permission:create-road-item')->name('index');
+                Route::get('/excel', 'excel')->name('excel');
+                Route::post('/', 'store')
+                    ->middleware(['permission:create-road-item', 'validate-store-access'])
+                    ->name('store');
+                Route::get('/{roadItemsProject}', 'show')->name('show');
+                Route::get('/{roadItemsProject}', 'show')->name('show');
+                Route::post('/{roadItemsProject}', 'update')->name('update');
+                Route::delete('/{roadItemsProject}', 'destroy')->middleware('permission:delete-road-item')->name('destroy');
+            });
+
+        Route::prefix('supervisor')
+            ->name('supervisor.')
+            ->controller(\App\Http\Controllers\V3\Dashboard\RoadItem\SupervisorController::class)
             ->middleware(['permission:show-road-item-supervise-cartable|show-road-item-supervise-cartable-province'])
-            ->name('supervisorIndex');
+            ->group(function () {
+                Route::get('/', 'index')->name('index');
+                Route::get('/excel', 'excel')->name('excel');
+                Route::post('/confirm/{roadItemsProject}', 'confirm')->name('confirm');
+                Route::post('/reject/{roadItemsProject}', 'reject')->name('reject');
+                Route::post('/restore/{roadItemsProject}', 'restore')->middleware('permission:restore-road-item')->name('restore');
+            });
 
-        Route::post('/verify_by_supervisor/{roadItemsProject}', 'VerifyBySupervisor')
-            ->name('VerifyBySupervisor');
-
-        Route::post('/restore/{roadItemsProject}', 'restore')
-            ->middleware('permission:restore-road-item')
-            ->name('restore');
-
-        Route::post('/delete/{roadItemsProject}', 'delete')
-            ->middleware('permission:delete-road-item')
-            ->name('delete');
-
-        Route::get('/supervisor_report', 'supervisorCartableReport')
-            ->name('supervisorCartableReport');
-
-        Route::get('/operator_index', 'operatorIndex')
-            ->middleware('permission:create-road-item')
-            ->name('operatorIndex');
-
-        Route::post('/store', 'store')
-            ->middleware('permission:create-road-item')
-            ->name('store');
-
-        Route::post('/update/{roadItemsProject}', 'update')->name('update');
-
-        Route::get('/operator_report', 'operatorCartableReport')
-            ->name('operatorCartableReport');
-
-        Route::get('/machines/{roadItemsProject}', 'roadItemMachine')->name('roadItemMachine');
-        Route::get('/rahdaran/{roadItemsProject}', 'roadItemRahdar')->name('roadItemRahdar');
-        Route::get('/files/{roadItemsProject}', 'roadItemFile')->name('roadItemFile');
+        Route::prefix('details')
+            ->name('details.')
+            ->controller(\App\Http\Controllers\V3\Dashboard\RoadItem\DetailController::class)
+            ->group(function () {
+                Route::get('/machines/{roadItemsProject}', 'machines')->name('machines');
+                Route::get('/rahdaran/{roadItemsProject}', 'rahdaran')->name('rahdaran');
+                Route::get('/files/{roadItemsProject}', 'files')->name('files');
+            });
     });
 
 Route::prefix('road_patrols')
@@ -470,8 +469,8 @@ Route::prefix('missions')
             ->controller(ControlUnitController::class)
             ->group(function () {
                 Route::get('/', 'index')->name('index');
-                Route::get('/start', 'start')->name('start');
-                Route::get('/finish', 'finish')->name('finish');
+                Route::post('/start/{mission}', 'start')->name('start');
+                Route::post('/finish/{mission}', 'finish')->name('finish');
             });
         Route::prefix('details')
             ->name('details.')

From 6df79c320e5be6df140449edb42f3abed4f31531 Mon Sep 17 00:00:00 2001
From: amirghasempoor <amirghasempoor79@gmail.com>
Date: Mon, 16 Jun 2025 12:06:35 +0330
Subject: [PATCH 11/16] add mission id to road item

---
 .../Dashboard/RoadItem/OperatorController.php | 172 +++++++++---------
 .../V3/RoadItem/Operator/StoreRequest.php     |  51 ++++++
 .../RoadItem/{ => Operator}/UpdateRequest.php |  25 ++-
 .../Requests/V3/RoadItem/StoreRequest.php     |  77 --------
 .../V3/RoadItem/VerifyBySupervisorRequest.php |  35 ----
 ...2407_add_column_to_road_items_projects.php |   2 +-
 routes/v3.php                                 |   4 -
 7 files changed, 161 insertions(+), 205 deletions(-)
 create mode 100644 app/Http/Requests/V3/RoadItem/Operator/StoreRequest.php
 rename app/Http/Requests/V3/RoadItem/{ => Operator}/UpdateRequest.php (53%)
 delete mode 100644 app/Http/Requests/V3/RoadItem/StoreRequest.php
 delete mode 100644 app/Http/Requests/V3/RoadItem/VerifyBySupervisorRequest.php

diff --git a/app/Http/Controllers/V3/Dashboard/RoadItem/OperatorController.php b/app/Http/Controllers/V3/Dashboard/RoadItem/OperatorController.php
index d3a0a9ab..067f2fd3 100644
--- a/app/Http/Controllers/V3/Dashboard/RoadItem/OperatorController.php
+++ b/app/Http/Controllers/V3/Dashboard/RoadItem/OperatorController.php
@@ -4,20 +4,25 @@ namespace App\Http\Controllers\V3\Dashboard\RoadItem;
 
 use App\Exceptions\ProhibitedAction;
 use App\Exports\V3\RoadItemsProjects\OperatorCartableReport;
+use App\Facades\File\FileFacade;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\V3\RoadItem\Operator\StoreRequest;
+use App\Http\Requests\V3\RoadItem\Operator\UpdateRequest;
 use App\Http\Traits\ApiResponse;
 use App\Models\EdarateShahri;
 use App\Models\InfoItem;
+use App\Models\ObservedItem;
 use App\Models\RoadItemsProject;
 use App\Services\Cartables\RoadItem\OperatorService;
-use App\Services\Cartables\RoadItemTableService;
 use App\Services\NominatimService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Validation\ValidationException;
 use Maatwebsite\Excel\Facades\Excel;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Throwable;
 
 class OperatorController extends Controller
 {
@@ -40,12 +45,10 @@ class OperatorController extends Controller
 
     /**
      * Store a newly created resource in storage.
-     * @throws \Throwable
+     * @throws Throwable
      */
-    public function store(Request $request, NominatimService $nominatimService): JsonResponse
+    public function store(StoreRequest $request, NominatimService $nominatimService): JsonResponse
     {
-        $user = auth()->user();
-
         $info_item = InfoItem::query()->where('item', $request->item_id)
             ->where('sub_item', $request->sub_item_id)
             ->firstOrFail();
@@ -66,51 +69,63 @@ class OperatorController extends Controller
         $start_coordinates = explode(',', $request->start_point);
         $end_coordinates = $info_item->needs_end_point ? explode(',', $request->end_point) : null;
 
-        $attributes = [
-            'start_lat' => $start_coordinates[0],
-            'start_lng' => $start_coordinates[1],
-            'end_lat' => $end_coordinates ? $end_coordinates[0] : null,
-            'end_lng' => $end_coordinates ? $end_coordinates[1] : null,
-            'item' => $info_item->item,
-            'item_fa' => $info_item->item_str,
-            'sub_item' => $info_item->sub_item,
-            'sub_item_fa' => $info_item->sub_item_str,
-            'sub_item_data' => $request->amount,
-            'province_id' => $user->province_id,
-            'province_fa' => $user->province_fa,
-            'city_id' => $user->city_id,
-            'city_fa' => $user->city_fa,
-            'user_name' => $user->name,
-            'start_way_id' => $nominatimService->get_way_id_from_nominatim($start_coordinates[0], $start_coordinates[1]),
-            'end_way_id' => $end_coordinates ? $nominatimService->get_way_id_from_nominatim($end_coordinates[0], $end_coordinates[1]) : null,
-            'unit_fa' => $info_item->sub_item_unit,
-            'created_at_fa' => verta(\Carbon\Carbon::now())->format('Y-m-d H:i:s'),
-            'info_id' => $info_item->id,
-            'status' => 0,
-            'status_fa' => 'در حال بررسی',
-            'edarat_id' => $user->edarate_shahri_id,
-            'edarat_type' => EdarateShahri::class,
-            'edarat_name' => $user->edarate_shahri_name,
-            'activity_date' => $request->activity_date,
-            'activity_time' => $request->activity_time,
-        ];
+        DB::transaction(function () use ($request, $nominatimService, $start_coordinates, $end_coordinates, $info_item) {
+            $user = auth()->user();
+            $road_item = RoadItemsProject::query()->create([
+                'user_id' => $user->id,
+                'mission_id' => $request->mission_id,
+                'start_lat' => $start_coordinates[0],
+                'start_lng' => $start_coordinates[1],
+                'end_lat' => $end_coordinates ? $end_coordinates[0] : null,
+                'end_lng' => $end_coordinates ? $end_coordinates[1] : null,
+                'item' => $info_item->item,
+                'item_fa' => $info_item->item_str,
+                'sub_item' => $info_item->sub_item,
+                'sub_item_fa' => $info_item->sub_item_str,
+                'sub_item_data' => $request->amount,
+                'province_id' => $user->province_id,
+                'province_fa' => $user->province_fa,
+                'city_id' => $user->city_id,
+                'city_fa' => $user->city_fa,
+                'user_name' => $user->name,
+                'start_way_id' => $nominatimService->get_way_id_from_nominatim($start_coordinates[0], $start_coordinates[1]),
+                'end_way_id' => $end_coordinates ? $nominatimService->get_way_id_from_nominatim($end_coordinates[0], $end_coordinates[1]) : null,
+                'unit_fa' => $info_item->sub_item_unit,
+                'created_at_fa' => verta(\Carbon\Carbon::now())->format('Y-m-d H:i:s'),
+                'info_id' => $info_item->id,
+                'status' => 0,
+                'status_fa' => 'در حال بررسی',
+                'edarat_id' => $user->edarate_shahri_id,
+                'edarat_type' => EdarateShahri::class,
+                'edarat_name' => $user->edarate_shahri_name,
+                'activity_date' => $request->activity_date,
+                'activity_time' => $request->activity_time,
+                'activity_date_time' => $request->activity_date." ".$request->activity_time,
+                'is_new' => 1,
+            ]);
 
-        $after_image = ($request->has('after_image') && $info_item->needs_image) ?
-            $request->file('after_image') :
-            null;
+            if ($request->has('after_image')) {
+                $road_item->files()->create([
+                    'path' => FileFacade::save($request->file('after_image'),
+                        "/road_items_projects_new/{$road_item->id}/after")
+                ]);
+            }
+            if ($request->has('before_image')) {
+                $road_item->files()->create([
+                    'path' => FileFacade::save($request->file('before_image'),
+                        "/road_items_projects_new/{$road_item->id}/before")
+                ]);
+            }
 
-        $before_image = ($request->has('before_image') && $info_item->needs_image) ?
-            $request->file('before_image') :
-            null;
+            throw_if(ObservedItem::query()->where('id', $request->observed_item_id)->whereNotNull('road_item_id')->exists(),
+                new ProhibitedAction('اقدام مربوطه قبلا رسیدگی شده است.')
+            );
 
-        $road_item = RoadItemsProject::store($user, $attributes, $before_image, $after_image, $request->observed_item_id);
+            $road_item->rahdaran()->attach($request->rahdaran_id);
+            $road_item->cmmsMachines()->attach($request->machines_id);
 
-        throw_if($road_item === -1, new ProhibitedAction('اقدام مربوطه قبلا رسیدگی شده است.'));
-
-        $road_item->rahdaran()->attach($request->rahdaran_id);
-        $road_item->cmmsMachines()->attach($request->machines_id);
-
-        auth()->user()->addActivityComplete(1154);
+            $user->addActivityComplete(1154);
+        });
 
         return $this->successResponse();
     }
@@ -126,7 +141,7 @@ class OperatorController extends Controller
     /**
      * Update the specified resource in storage.
      */
-    public function update(Request $request, RoadItemsProject $roadItemsProject): JsonResponse
+    public function update(UpdateRequest $request, RoadItemsProject $roadItemsProject): JsonResponse
     {
         $info_item = InfoItem::query()->where('item', $roadItemsProject->item)
             ->where('sub_item', $roadItemsProject->sub_item)
@@ -147,45 +162,39 @@ class OperatorController extends Controller
 
         if ($info_item->needs_image) {
             if ($request->has('after_image')) {
-
-                Storage::delete('public/'. $roadItemsProject->files[0]->path);
-
-                $after = $request->file('after_image')->store('road_items_projects_new/after', 'public');
+                FileFacade::delete($roadItemsProject->files[0]->path, true);
                 $roadItemsProject->files[0]->update([
-                    'path' => $after
+                    'path' => FileFacade::save($request->file('after_image'),
+                        "/road_items_projects_new/{$roadItemsProject->id}/after")
                 ]);
-                // $roadItemsProject->files()->create(['path' => $after]);
-                $urlAfter = "/var/www/rms/public/storage/{$after}";
-                // \App\Helpers\Compress::resize($urlAfter);
             }
             if ($request->has('before_image')) {
-                Storage::delete('public/'. $roadItemsProject->files[1]->path);
-
-                $before = $request->file('before_image')->store('/road_items_projects_new/before', 'public');
+                FileFacade::delete($roadItemsProject->files[1]->path, true);
                 $roadItemsProject->files[1]->update([
-                    'path' => $before
+                    'path' => FileFacade::save($request->file('before_image'),
+                        "/road_items_projects_new/{$roadItemsProject->id}/before")
                 ]);
-                // $roadItemsProject->files()->create(['path' => $before]);
-                $urlBefore = "/var/www/rms/public/storage/{$before}";
-                // \App\Helpers\Compress::resize($urlBefore);
             }
         }
 
-        $roadItemsProject->update([
-            'start_lat' => $start_coordinates[0],
-            'start_lng' => $start_coordinates[1],
-            'end_lat' => $end_coordinates ? $end_coordinates[0] : null,
-            'end_lng' => $end_coordinates ? $end_coordinates[1] : null,
-            'sub_item_data' => $request->amount,
-            'status' => 0,
-            'status_fa' => 'در حال بررسی',
-        ]);
+        DB::transaction(function () use ($roadItemsProject, $start_coordinates, $end_coordinates, $request) {
+            $roadItemsProject->update([
+                'mission_id' => $request->mission_id,
+                'start_lat' => $start_coordinates[0],
+                'start_lng' => $start_coordinates[1],
+                'end_lat' => $end_coordinates ? $end_coordinates[0] : null,
+                'end_lng' => $end_coordinates ? $end_coordinates[1] : null,
+                'sub_item_data' => $request->amount,
+                'status' => 0,
+                'status_fa' => 'در حال بررسی',
+            ]);
 
-        $roadItemsProject->rahdaran()->sync($request->rahdaran_id);
-        $roadItemsProject->cmmsMachines()->sync($request->machines_id);
+            $roadItemsProject->rahdaran()->sync($request->rahdaran_id);
+            $roadItemsProject->cmmsMachines()->sync($request->machines_id);
 
 
-        auth()->user()->addActivityComplete(1155);
+            auth()->user()->addActivityComplete(1155);
+        });
 
         return $this->successResponse();
     }
@@ -195,14 +204,15 @@ class OperatorController extends Controller
      */
     public function destroy(RoadItemsProject $roadItemsProject): JsonResponse
     {
-        if ($roadItemsProject->files()->exists()) {
-            Storage::delete('public/'. $roadItemsProject->files[0]->path);
-            Storage::delete('public/'. $roadItemsProject->files[1]->path);
-            $roadItemsProject->files()->delete();
-        }
-        auth()->user()->addActivityComplete(1151);
+        DB::transaction(function () use ($roadItemsProject) {
+            if ($roadItemsProject->files()->exists()) {
+                FileFacade::deleteDirectory("/road_items_projects_new/{$roadItemsProject->id}");
+                $roadItemsProject->files()->delete();
+            }
+            auth()->user()->addActivityComplete(1151);
 
-        $roadItemsProject->delete();
+            $roadItemsProject->delete();
+        });
 
         return $this->successResponse();
     }
diff --git a/app/Http/Requests/V3/RoadItem/Operator/StoreRequest.php b/app/Http/Requests/V3/RoadItem/Operator/StoreRequest.php
new file mode 100644
index 00000000..67a6c4ec
--- /dev/null
+++ b/app/Http/Requests/V3/RoadItem/Operator/StoreRequest.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Http\Requests\V3\RoadItem\Operator;
+
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+
+class StoreRequest 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 [
+            'mission_id' => 'required|integer|exists:missions,id',
+            'start_point' => 'required',
+            'item_id' => 'required|integer',
+            'sub_item_id' => 'required|integer',
+            'amount' => 'required|numeric',
+            'observed_item_id' => 'integer|exists:observed_items,id',
+            'activity_date' => 'required|date_format:Y-m-d',
+            'activity_time' => 'required|date_format:H:i',
+            'before_image' => 'image|max:4096',
+            'after_image' => 'image|max:4096',
+            'machines_id' => 'required|array',
+            'machines_id.*' => 'required|exists:cmms_machines,id',
+            'rahdaran_id' => 'required|array',
+            'rahdaran_id.*' => 'required|exists:rahdaran,id',
+        ];
+    }
+
+    public function attributes(): array
+    {
+        return [
+            'activity_date' => 'تاریخ فعالیت',
+            'activity_time' => 'ساعت فعالیت',
+        ];
+    }
+}
diff --git a/app/Http/Requests/V3/RoadItem/UpdateRequest.php b/app/Http/Requests/V3/RoadItem/Operator/UpdateRequest.php
similarity index 53%
rename from app/Http/Requests/V3/RoadItem/UpdateRequest.php
rename to app/Http/Requests/V3/RoadItem/Operator/UpdateRequest.php
index 865c9101..51986ff5 100644
--- a/app/Http/Requests/V3/RoadItem/UpdateRequest.php
+++ b/app/Http/Requests/V3/RoadItem/Operator/UpdateRequest.php
@@ -1,13 +1,10 @@
 <?php
 
-namespace App\Http\Requests\V3\RoadItem;
+namespace App\Http\Requests\V3\RoadItem\Operator;
 
-use App\Models\InfoItem;
-use App\Models\User;
-use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
-use Symfony\Component\Finder\Exception\AccessDeniedException;
 
 class UpdateRequest extends FormRequest
 {
@@ -16,19 +13,25 @@ class UpdateRequest extends FormRequest
      */
     public function authorize(): bool
     {
-        return !($this->roadItemsProject->user_id != auth()->user()->id || $this->roadItemsProject->status != 2);
+        return true;
     }
 
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     * @return array<string, ValidationRule|array|string>
      */
     public function rules(): array
     {
         return [
+            'mission_id' => 'required|integer|exists:missions,id',
             'start_point' => 'required',
+            'item_id' => 'required|integer',
+            'sub_item_id' => 'required|integer',
             'amount' => 'required|numeric',
+            'observed_item_id' => 'integer|exists:observed_items,id',
+            'activity_date' => 'required|date_format:Y-m-d',
+            'activity_time' => 'required|date_format:H:i',
             'before_image' => 'image|max:4096',
             'after_image' => 'image|max:4096',
             'machines_id' => 'required|array',
@@ -37,4 +40,12 @@ class UpdateRequest extends FormRequest
             'rahdaran_id.*' => 'required|exists:rahdaran,id',
         ];
     }
+
+    public function attributes(): array
+    {
+        return [
+            'activity_date' => 'تاریخ فعالیت',
+            'activity_time' => 'ساعت فعالیت',
+        ];
+    }
 }
diff --git a/app/Http/Requests/V3/RoadItem/StoreRequest.php b/app/Http/Requests/V3/RoadItem/StoreRequest.php
deleted file mode 100644
index 612026ec..00000000
--- a/app/Http/Requests/V3/RoadItem/StoreRequest.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-namespace App\Http\Requests\V3\RoadItem;
-
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Validator;
-
-class StoreRequest 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, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
-     */
-    public function rules(): array
-    {
-        return [
-            'start_point' => 'required',
-            'item_id' => 'required|integer',
-            'sub_item_id' => 'required|integer',
-            'amount' => 'required|numeric',
-            'observed_item_id' => 'integer|exists:observed_items,id',
-            'activity_date' => 'required|date_format:Y-m-d',
-            'activity_time' => 'required|date_format:H:i',
-            'before_image' => 'image|max:4096',
-            'after_image' => 'image|max:4096',
-            'machines_id' => 'required|array',
-            'machines_id.*' => 'required|exists:cmms_machines,id',
-            'rahdaran_id' => 'required|array',
-            'rahdaran_id.*' => 'required|exists:rahdaran,id',
-        ];
-    }
-
-    public function attributes(): array
-    {
-        return [
-            'activity_date' => 'تاریخ فعالیت',
-            'activity_time' => 'ساعت فعالیت',
-        ];
-    }
-
-//    public function after(): array
-//    {
-//        return [
-//            function (Validator $validator) {
-//                if ($this->has(['item_id', 'sub_item_id'])) {
-//
-//                    $info_item = InfoItem::query()
-//                        ->where('item', $this->item_id)
-//                        ->where('sub_item', $this->sub_item_id)
-//                        ->firstOrFail();
-//
-//                    if ($info_item->needs_end_point && !$this->filled('end_point')) {
-//                        $validator->errors()->add('end_point', __('validation.required'));
-//                    }
-//
-//                    if ($info_item->needs_image) {
-//                        if (!$this->hasFile('before_image')) {
-//                            $validator->errors()->add('before_image', __('validation.required'));
-//                        }
-//                        if (!$this->hasFile('after_image')) {
-//                            $validator->errors()->add('after_image', __('validation.required'));
-//                        }
-//                    }
-//                }
-//            }
-//        ];
-//    }
-}
diff --git a/app/Http/Requests/V3/RoadItem/VerifyBySupervisorRequest.php b/app/Http/Requests/V3/RoadItem/VerifyBySupervisorRequest.php
deleted file mode 100644
index e8c0560d..00000000
--- a/app/Http/Requests/V3/RoadItem/VerifyBySupervisorRequest.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Http\Requests\V3\RoadItem;
-
-use App\Models\InfoItem;
-use App\Models\User;
-use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Gate;
-use Illuminate\Validation\Rule;
-use Symfony\Component\Finder\Exception\AccessDeniedException;
-
-class VerifyBySupervisorRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     */
-    public function authorize(): bool
-    {
-        return Gate::allows('gate-supervise-road-item', $this->roadItemsProject);
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
-     */
-    public function rules(): array
-    {
-        return [
-            'verify' => 'required|in:1,2',
-            'description' => 'nullable|string',
-        ];
-    }
-}
diff --git a/database/migrations/2025_06_16_092407_add_column_to_road_items_projects.php b/database/migrations/2025_06_16_092407_add_column_to_road_items_projects.php
index 3630d6f9..71d062d1 100644
--- a/database/migrations/2025_06_16_092407_add_column_to_road_items_projects.php
+++ b/database/migrations/2025_06_16_092407_add_column_to_road_items_projects.php
@@ -12,7 +12,7 @@ return new class extends Migration
     public function up(): void
     {
         Schema::table('road_items_projects', function (Blueprint $table) {
-            $table->foreignId('mission_id')->constrained('missions');
+            $table->foreignId('mission_id')->nullable()->constrained('missions');
         });
     }
 
diff --git a/routes/v3.php b/routes/v3.php
index 9dce4324..393fb548 100644
--- a/routes/v3.php
+++ b/routes/v3.php
@@ -111,9 +111,7 @@ Route::post('logout', LogoutController::class)->name('logout');
 
 Route::prefix('road_items')
     ->name('road_items.')
-    ->controller(RoadItemsProjectController::class)
     ->group(function () {
-
         Route::prefix('operator')
             ->name('operator.')
             ->controller(\App\Http\Controllers\V3\Dashboard\RoadItem\OperatorController::class)
@@ -128,7 +126,6 @@ Route::prefix('road_items')
                 Route::post('/{roadItemsProject}', 'update')->name('update');
                 Route::delete('/{roadItemsProject}', 'destroy')->middleware('permission:delete-road-item')->name('destroy');
             });
-
         Route::prefix('supervisor')
             ->name('supervisor.')
             ->controller(\App\Http\Controllers\V3\Dashboard\RoadItem\SupervisorController::class)
@@ -140,7 +137,6 @@ Route::prefix('road_items')
                 Route::post('/reject/{roadItemsProject}', 'reject')->name('reject');
                 Route::post('/restore/{roadItemsProject}', 'restore')->middleware('permission:restore-road-item')->name('restore');
             });
-
         Route::prefix('details')
             ->name('details.')
             ->controller(\App\Http\Controllers\V3\Dashboard\RoadItem\DetailController::class)

From d643edebee799ea448de0bd4bab872778a4eb0b4 Mon Sep 17 00:00:00 2001
From: amirghasempoor <amirghasempoor79@gmail.com>
Date: Mon, 16 Jun 2025 13:12:39 +0330
Subject: [PATCH 12/16] add report for road item

---
 .../ReportController.php}                     | 39 +++++------
 .../ReportService.php}                        | 65 +------------------
 routes/v3.php                                 |  2 +-
 3 files changed, 23 insertions(+), 83 deletions(-)
 rename app/Http/Controllers/V3/Dashboard/{Reports/RoadItemsReportController.php => RoadItem/ReportController.php} (82%)
 rename app/Services/Cartables/{RoadItemTableService.php => RoadItem/ReportService.php} (67%)

diff --git a/app/Http/Controllers/V3/Dashboard/Reports/RoadItemsReportController.php b/app/Http/Controllers/V3/Dashboard/RoadItem/ReportController.php
similarity index 82%
rename from app/Http/Controllers/V3/Dashboard/Reports/RoadItemsReportController.php
rename to app/Http/Controllers/V3/Dashboard/RoadItem/ReportController.php
index 46b47699..448ec873 100644
--- a/app/Http/Controllers/V3/Dashboard/Reports/RoadItemsReportController.php
+++ b/app/Http/Controllers/V3/Dashboard/RoadItem/ReportController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V3\Dashboard\Reports;
+namespace App\Http\Controllers\V3\Dashboard\RoadItem;
 
 use App\Exports\V3\RoadItemsProjects\CountryActivityPerItemReport;
 use App\Exports\V3\RoadItemsProjects\CountryActivityPerSubItemReport;
@@ -12,15 +12,16 @@ use App\Models\EdarateShahri;
 use App\Models\InfoItem;
 use App\Models\Province;
 use App\Models\RoadItemsProject;
-use App\Services\Cartables\RoadItemTableService;
+use App\Services\Cartables\RoadItem\ReportService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Maatwebsite\Excel\Facades\Excel;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 
-class RoadItemsReportController extends Controller
+class ReportController extends Controller
 {
     use ApiResponse;
+
     public function getSubItems(): JsonResponse
     {
         $data = InfoItem::all();
@@ -32,9 +33,9 @@ class RoadItemsReportController extends Controller
         ]);
     }
 
-    public function countryActivityPerSubItem(Request $request, RoadItemTableService $roadItemTableService): JsonResponse
+    public function countryActivityPerSubItem(Request $request, ReportService $reportService): JsonResponse
     {
-        $activities = $roadItemTableService->countryActivityPerSubItem($request);
+        $activities = $reportService->countryActivityPerSubItem($request);
         $provinces = Province::all(['id', 'name_fa']);
         $subItems = InfoItem::query()
             ->where('item', $request->item)
@@ -47,9 +48,9 @@ class RoadItemsReportController extends Controller
         ]);
     }
 
-    public function provinceActivityPerSubItem(Request $request, RoadItemTableService $roadItemTableService): JsonResponse
+    public function provinceActivityPerSubItem(Request $request, ReportService $reportService): JsonResponse
     {
-        $activities = $roadItemTableService->provinceActivityPerSubItem($request);
+        $activities = $reportService->provinceActivityPerSubItem($request);
 
         $edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
 
@@ -64,13 +65,13 @@ class RoadItemsReportController extends Controller
         ]);
     }
 
-    public function countryActivityPerItem(Request $request, RoadItemTableService $roadItemTableService): JsonResponse
+    public function countryActivityPerItem(Request $request, ReportService $reportService): JsonResponse
     {
         if (auth()->check()) {
             auth()->user()->addActivityComplete(1033);
         }
 
-        $activities = $roadItemTableService->countryActivityPerItem($request);
+        $activities = $reportService->countryActivityPerItem($request);
         $provinces = Province::all(['id', 'name_fa']);
 
         return $this->successResponse([
@@ -79,9 +80,9 @@ class RoadItemsReportController extends Controller
         ]);
     }
 
-    public function provinceActivityPerItem(Request $request, RoadItemTableService $roadItemTableService): JsonResponse
+    public function provinceActivityPerItem(Request $request, ReportService $reportService): JsonResponse
     {
-        $activities = $roadItemTableService->provinceActivityPerItem($request);
+        $activities = $reportService->provinceActivityPerItem($request);
         $edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
 
         return $this->successResponse([
@@ -90,11 +91,11 @@ class RoadItemsReportController extends Controller
         ]);
     }
 
-    public function countryActivityExcelPerItem(Request $request, RoadItemTableService $roadItemTableService): BinaryFileResponse
+    public function countryActivityExcelPerItem(Request $request, ReportService $reportService): BinaryFileResponse
     {
         auth()->user()->addActivityComplete(1034);
         $name = 'گزارش کشوری از فعالیت روزانه و جاری - جدول 1 ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
-        $activities = $roadItemTableService->countryActivityPerItem($request);
+        $activities = $reportService->countryActivityPerItem($request);
         return Excel::download(new CountryActivityPerItemReport([
             'activities' => $activities,
             'provinces' => Province::all(['id', 'name_fa']),
@@ -102,11 +103,11 @@ class RoadItemsReportController extends Controller
         ]), $name);
     }
 
-    public function provinceActivityExcelPerItem(Request $request, RoadItemTableService $roadItemTableService): BinaryFileResponse
+    public function provinceActivityExcelPerItem(Request $request, ReportService $reportService): BinaryFileResponse
     {
         auth()->user()->addActivityComplete(1034);
         $name = 'گزارش استانی از فعالیت روزانه و جاری - جدول 1 ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
-        $activities = $roadItemTableService->provinceActivityPerItem($request);
+        $activities = $reportService->provinceActivityPerItem($request);
         return Excel::download(new ProvinceActivityPerItemReport([
             'activities' => $activities,
             'edarateShahri' => EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']),
@@ -114,11 +115,11 @@ class RoadItemsReportController extends Controller
         ]), $name);
     }
 
-    public function countryActivityExcelPerSubItem(Request $request, RoadItemTableService $roadItemTableService): BinaryFileResponse
+    public function countryActivityExcelPerSubItem(Request $request, ReportService $reportService): BinaryFileResponse
     {
         auth()->user()->addActivityComplete(1034);
         $name = "گزارش کشوری از فعالیت روزانه و جاری - جدول 2 " . verta()->now()->format('Y-m-d H-i') . '.xlsx';
-        $activities = $roadItemTableService->countryActivityPerSubItem($request);
+        $activities = $reportService->countryActivityPerSubItem($request);
         $subItems = InfoItem::query()
             ->where('item', $request->item)
             ->get(['id', 'item', 'item_str', 'sub_item_str', 'sub_item_unit', 'sub_item']);
@@ -130,10 +131,10 @@ class RoadItemsReportController extends Controller
         ]), $name);
     }
 
-    public function provinceActivityExcelPerSubItem(Request $request, RoadItemTableService $roadItemTableService): BinaryFileResponse
+    public function provinceActivityExcelPerSubItem(Request $request, ReportService $reportService): BinaryFileResponse
     {
         auth()->user()->addActivityComplete(1034);
-        $activities = $roadItemTableService->provinceActivityPerSubItem($request);
+        $activities = $reportService->provinceActivityPerSubItem($request);
         $name = "گزارش استانی از فعالیت روزانه و جاری - جدول 2 " . verta()->now()->format('Y-m-d H-i') . '.xlsx';
         $subItems = InfoItem::query()
             ->where('item', $request->item)
diff --git a/app/Services/Cartables/RoadItemTableService.php b/app/Services/Cartables/RoadItem/ReportService.php
similarity index 67%
rename from app/Services/Cartables/RoadItemTableService.php
rename to app/Services/Cartables/RoadItem/ReportService.php
index 2638e5c5..7b3916ff 100644
--- a/app/Services/Cartables/RoadItemTableService.php
+++ b/app/Services/Cartables/RoadItem/ReportService.php
@@ -1,73 +1,12 @@
 <?php
 
-namespace App\Services\Cartables;
+namespace App\Services\Cartables\RoadItem;
 
-use App\Facades\DataTable\DataTableFacade;
-use App\Models\InfoItem;
 use App\Models\RoadItemsProject;
 use Illuminate\Http\Request;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\DB;
 
-class RoadItemTableService
+class ReportService
 {
-    public function supervisorCartableReport(Request $request, $loadRelations = false)
-    {
-        $allowedFilters = ['*'];
-        $allowedSortings = ['*'];
-
-        $user = auth()->user();
-        $query = null;
-
-        if ($user->hasPermissionTo('show-road-item-supervise-cartable')) {
-            $query = RoadItemsProject::query()
-                ->select(['id', 'province_fa', 'edarat_name', 'item', 'item_fa', 'sub_item', 'sub_item_fa', 'sub_item_data', 'unit_fa', 'start_lat', 'start_lng',
-                    'end_lat', 'end_lng', 'activity_date_time', 'created_at', 'status_fa', 'status'])
-                ->where('is_new', 1)
-                ->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
-        }
-        elseif ($user->hasPermissionTo('show-road-item-supervise-cartable-province')) {
-            if (is_null($user->province_id)) {
-                return $this->errorResponse('استانی برای شما در سامانه ثبت نشده است!');
-            }
-            $query = RoadItemsProject::query()
-                ->select(['id', 'province_fa', 'edarat_name', 'item', 'item_fa', 'sub_item', 'sub_item_fa', 'sub_item_data', 'unit_fa', 'start_lat', 'start_lng',
-                    'end_lat', 'end_lng', 'activity_date_time', 'created_at', 'status_fa', 'status'])
-                ->where('is_new', 1)
-                ->where('province_id', auth()->user()->province_id)
-                ->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
-        }
-
-        $data = DataTableFacade::run(
-            $query,
-            $request,
-            allowedFilters: $allowedFilters,
-            allowedSortings: $allowedSortings);
-
-        return $data;
-    }
-
-    public function operatorCartableReport(Request $request, $loadRelations = false)
-    {
-        $allowedFilters = ['*'];
-        $allowedSortings = ['*'];
-
-        $query = RoadItemsProject::query()
-            ->select(['id', 'province_fa', 'edarat_name', 'supervisor_description', 'item', 'item_fa', 'sub_item', 'sub_item_fa', 'sub_item_data', 'unit_fa', 'start_lat', 'start_lng',
-                'end_lat', 'end_lng', 'activity_date_time', 'created_at', 'status_fa', 'status'])
-            ->where('is_new', 1)
-            ->where('user_id', auth()->user()->id)
-            ->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));;
-
-        $data = DataTableFacade::run(
-            $query,
-            $request,
-            allowedFilters: $allowedFilters,
-            allowedSortings: $allowedSortings);
-
-        return $data;
-    }
-
     public function countryActivityPerSubItem(Request $request): array
     {
         $fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString();
diff --git a/routes/v3.php b/routes/v3.php
index 393fb548..39821598 100644
--- a/routes/v3.php
+++ b/routes/v3.php
@@ -218,7 +218,7 @@ Route::prefix('observed_items')
 
 Route::prefix('road_item_reports')
     ->name('roadItemReports.')
-    ->controller(RoadItemsReportController::class)
+    ->controller(\App\Http\Controllers\V3\Dashboard\RoadItem\ReportController::class)
     ->group(function () {
         Route::get('/get_sub_items', 'getSubItems')->name('getSubItems');
         Route::get('/country_activity_per_sub_item', 'countryActivityPerSubItem')->name('countryActivityPerSubItem');

From 98650362691c18ae11671e530fea8bea548c4c86 Mon Sep 17 00:00:00 2001
From: joddyabott <faezehzafarbakhsh@gmail.com>
Date: Sun, 22 Jun 2025 12:20:07 +0330
Subject: [PATCH 13/16] change structure of road patrol and route

# Conflicts:
#	app/Http/Controllers/V3/RoadPatrole/DetailController.php
#	app/Http/Controllers/V3/RoadPatrole/OperatorController.php
#	app/Http/Controllers/V3/RoadPatrole/SupervisorController.php
#	routes/v3.php
---
 .../V3/RoadPatrole/DetailController.php       | 14 ---
 routes/v3.php                                 | 99 ++++++++++---------
 2 files changed, 52 insertions(+), 61 deletions(-)

diff --git a/app/Http/Controllers/V3/RoadPatrole/DetailController.php b/app/Http/Controllers/V3/RoadPatrole/DetailController.php
index cdc1bbb9..1e389022 100644
--- a/app/Http/Controllers/V3/RoadPatrole/DetailController.php
+++ b/app/Http/Controllers/V3/RoadPatrole/DetailController.php
@@ -2,25 +2,12 @@
 
 namespace App\Http\Controllers\V3\RoadPatrole;
 
-use App\Enums\MissionStates;
-use App\Facades\Sms\Sms;
 use App\Http\Controllers\Controller;
-use App\Http\Requests\V3\RoadPatrol\DeleteRequest;
-use App\Http\Requests\V3\RoadPatrol\StoreRequest;
 use App\Http\Traits\ApiResponse;
-use App\Models\EdarateShahri;
-use App\Models\InfoItem;
-use App\Models\Mission;
-use App\Models\RoadItemsProject;
 use App\Models\RoadObserved;
 use App\Models\RoadPatrol;
-use App\Services\NominatimService;
-use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Storage;
-use Illuminate\Validation\ValidationException;
 
 
 class DetailController extends Controller
@@ -79,5 +66,4 @@ class DetailController extends Controller
         return $this->successResponse($roadPatrol->rahdaran()->get(['rahdaran.id', 'rahdaran.name', 'rahdaran.code']));
     }
 
-
 }
diff --git a/routes/v3.php b/routes/v3.php
index 39821598..bb147a78 100644
--- a/routes/v3.php
+++ b/routes/v3.php
@@ -16,7 +16,6 @@ use App\Http\Controllers\V3\Dashboard\Mission\TransportationUnitController;
 use App\Http\Controllers\V3\Dashboard\ObservedItemController;
 use App\Http\Controllers\V3\Dashboard\OtpManagementController;
 use App\Http\Controllers\V3\Dashboard\Reports\RoadItemsReportController;
-use App\Http\Controllers\V3\Dashboard\Reports\RoadPatrolReportController;
 use App\Http\Controllers\V3\Dashboard\RoadMaintenanceStationController;
 use App\Http\Controllers\V3\Dashboard\RoadPatrolProjectController;
 use App\Http\Controllers\V3\Dashboard\SafetyAndPrivacy\OperatorController;
@@ -147,42 +146,7 @@ Route::prefix('road_items')
             });
     });
 
-Route::prefix('road_patrols')
-    ->name('road_patrols.')
-    ->controller(RoadPatrolProjectController::class)
-    ->group(function () {
 
-        Route::get('/supervisor_index', 'supervisorIndex')
-            ->middleware(['permission:show-road-patrol-supervise-cartable|show-road-patrol-supervise-cartable-province'])
-            ->name('supervisorIndex');
-
-        Route::post('/delete/{roadPatrol}', 'delete')
-            ->middleware('permission:partial-delete-road-patrol|complete-delete-road-patrol')
-            ->name('delete');
-
-        Route::get('/supervisor_report', 'supervisorCartableReport')
-            ->name('supervisorCartableReport');
-
-        Route::get('/operator_index', 'operatorIndex')
-            ->middleware('permission:add-road-patrol')
-            ->name('operatorIndex');
-
-        Route::post('/store', 'store')
-            ->middleware('permission:add-road-patrol')
-            ->name('store');
-
-        Route::get('/operator_report', 'operatorCartableReport')
-            ->name('operatorCartableReport');
-
-        Route::get('/operator/report/{roadPatrol}', 'getReport')
-            ->name('getReport');
-
-        Route::get('/detail/{roadPatrol}', 'show')
-            ->name('show');
-
-        Route::get('/machines/{roadPatrol}', 'roadPatrolMachine')->name('roadPatrolMachine');
-        Route::get('/rahdaran/{roadPatrol}', 'roadPatrolRahdar')->name('roadPatrolRahdar');
-    });
 
 Route::prefix('cmms_machines')
     ->name('cmms_machines.')
@@ -232,19 +196,60 @@ Route::prefix('road_item_reports')
         Route::get('/activities_on_map', 'activitiesOnMap')->name('activitiesOnMap');
         Route::get('/show_on_map/{roadItemsProject}', 'showOnMap')->name('showOnMap');
     });
-
-Route::prefix('road_patrol_reports')
-    ->name('roadPatrolReports.')
-    ->controller(RoadPatrolReportController::class)
+Route::prefix('road_patrol')
     ->group(function () {
-        Route::get('/country_activity', 'countryPatrolActivity')->name('countryPatrolActivity');
-        Route::get('/province_activity', 'provincePatrolActivity')->name('provincePatrolActivity');
-        Route::get('/country_activity_excel', 'countryActivityExcel')->name('countryActivityExcel');
-        Route::get('/province_activity_excel', 'provinceActivityExcel')->name('provinceActivityExcel');
-        Route::get('/activities_on_map', 'activitiesOnMap')->name('activitiesOnMap');
-        Route::get('/show_on_map/{roadPatrol}', 'showOnMap')->name('showOnMap');
-    });
+        Route::prefix('details')
+            ->name('details.')
+            ->controller(\App\Http\Controllers\V3\RoadPatrole\DetailController::class)
+            ->group(function () {
+                Route::get('/{roadPatrol}', 'show')
+                    ->name('show');
+                Route::get('/machines/{roadPatrol}', 'roadPatrolMachine')->name('roadPatrolMachine');
+                Route::get('/rahdaran/{roadPatrol}', 'roadPatrolRahdar')->name('roadPatrolRahdar');
+            });
+        Route::prefix('operator')
+            ->name('operator.')
+            ->controller(App\Http\Controllers\V3\RoadPatrole\OperatorController::class)
+            ->group(function () {
+                Route::get('/', 'index')
+                    ->middleware('permission:add-road-patrol')
+                    ->name('index');
 
+                Route::get('/report', 'operatorCartableReport')
+                    ->name('cartableReport');
+                Route::post('/delete/{roadPatrol}', 'delete')
+                    ->middleware('permission:partial-delete-road-patrol|complete-delete-road-patrol')
+                    ->name('delete');
+                Route::post('/store', 'store')
+                    ->middleware('permission:add-road-patrol')
+                    ->name('store');
+            });
+
+        Route::prefix('report')
+            ->name('report.')
+            ->controller(ReportController::class)
+            ->group(function () {
+                Route::get('/country_activity', 'countryPatrolActivity')->name('countryPatrolActivity');
+                Route::get('/province_activity', 'provincePatrolActivity')->name('provincePatrolActivity');
+                Route::get('/country_activity_excel', 'countryActivityExcel')->name('countryActivityExcel');
+                Route::get('/province_activity_excel', 'provinceActivityExcel')->name('provinceActivityExcel');
+                Route::get('/activities_on_map', 'activitiesOnMap')->name('activitiesOnMap');
+                Route::get('/show_on_map/{roadPatrol}', 'showOnMap')->name('showOnMap');
+                Route::get('/{roadPatrol}', 'getReport')
+                    ->name('getReport');
+            });
+        Route::prefix('supervisor')
+            ->name('supervisor.')
+            ->controller(App\Http\Controllers\V3\RoadPatrole\SupervisorController::class)
+            ->group(function () {
+                Route::get('/','index')
+                    ->middleware(['permission:show-road-patrol-supervise-cartable|show-road-patrol-supervise-cartable-province'])
+                    ->name('index');
+                Route::get('/report', 'supervisorCartableReport')
+                    ->name('cartableReport');
+
+            });
+    });
 Route::prefix('damages')
     ->name('damages.')
     ->middleware('permission:manage-damage')

From 4e463de0d33e4e9f413e758926b3c1ee27d6927a Mon Sep 17 00:00:00 2001
From: joddyabott <faezehzafarbakhsh@gmail.com>
Date: Sun, 22 Jun 2025 12:23:55 +0330
Subject: [PATCH 14/16] chenge v3 route

# Conflicts:
#	routes/v3.php
---
 routes/v3.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/routes/v3.php b/routes/v3.php
index bb147a78..0cb7db30 100644
--- a/routes/v3.php
+++ b/routes/v3.php
@@ -250,6 +250,7 @@ Route::prefix('road_patrol')
 
             });
     });
+
 Route::prefix('damages')
     ->name('damages.')
     ->middleware('permission:manage-damage')

From 47dd5afb477b4ef428726877e70897c27e858a53 Mon Sep 17 00:00:00 2001
From: amirghasempoor <amirghasempoor79@gmail.com>
Date: Mon, 23 Jun 2025 10:12:08 +0330
Subject: [PATCH 15/16] change the bundle and fix the bugs

---
 .../Reports/RoadPatrolReportController.php    |  94 -----
 .../RoadPatrol}/DetailController.php          |   8 +-
 .../RoadPatrol}/OperatorController.php        |  88 ++---
 .../RoadPatrol}/ReportController.php          |  18 +-
 .../RoadPatrol}/SupervisorController.php      |  24 +-
 .../Dashboard/RoadPatrolProjectController.php | 350 ------------------
 .../Cartables/RoadPatrol/OperatorService.php  |  25 +-
 .../RoadPatrol/SupervisiorService.php         |  49 ---
 .../RoadPatrol/SupervisorService.php          |  47 +++
 routes/v3.php                                 |  31 +-
 10 files changed, 138 insertions(+), 596 deletions(-)
 delete mode 100644 app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php
 rename app/Http/Controllers/V3/{RoadPatrole => Dashboard/RoadPatrol}/DetailController.php (91%)
 rename app/Http/Controllers/V3/{RoadPatrole => Dashboard/RoadPatrol}/OperatorController.php (92%)
 rename app/Http/Controllers/V3/{RoadPatrole => Dashboard/RoadPatrol}/ReportController.php (88%)
 rename app/Http/Controllers/V3/{RoadPatrole => Dashboard/RoadPatrol}/SupervisorController.php (64%)
 delete mode 100644 app/Http/Controllers/V3/Dashboard/RoadPatrolProjectController.php
 delete mode 100644 app/Services/Cartables/RoadPatrol/SupervisiorService.php
 create mode 100644 app/Services/Cartables/RoadPatrol/SupervisorService.php

diff --git a/app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php b/app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php
deleted file mode 100644
index 32f032f0..00000000
--- a/app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\V3\Dashboard\Reports;
-
-use App\Exports\V3\RoadPatrols\CountryActivity;
-use App\Exports\V3\RoadPatrols\ProvinceActivity;
-use App\Http\Controllers\Controller;
-use App\Http\Traits\ApiResponse;
-use App\Models\EdarateShahri;
-use App\Models\Province;
-use App\Models\RoadPatrol;
-use App\Services\Cartables\RoadPatrol\ReportService;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Maatwebsite\Excel\Facades\Excel;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;
-
-class RoadPatrolReportController extends Controller
-{
-    use ApiResponse;
-    public function countryPatrolActivity(Request $request, ReportService $roadPatrolTableService): JsonResponse
-    {
-        $activities = $roadPatrolTableService->countryActivity($request);
-
-        $provinces = Province::all(['id', 'name_fa']);
-
-        return $this->successResponse([
-            'activities' => $activities['data'],
-            'provinces' => $provinces
-        ]);
-    }
-
-    public function provincePatrolActivity(Request $request, ReportService $roadPatrolTableService): JsonResponse
-    {
-        $request->validate(["province_id" => "required",]);
-
-        $activities = $roadPatrolTableService->provinceActivity($request);
-
-        $edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
-
-        return $this->successResponse([
-            'activities' => $activities['data'],
-            'edarateShahri' => $edarateShahri,
-        ]);
-    }
-
-    public function countryActivityExcel(Request $request, ReportService $roadPatrolTableService): BinaryFileResponse
-    {
-        $activities = $roadPatrolTableService->countryActivity($request);
-        $provinces = Province::all(['id', 'name_fa']);
-
-        $name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
-
-        return Excel::download(new CountryActivity([
-            'activities' => $activities,
-            'provinces' => $provinces,
-        ]), $name);
-    }
-
-    public function provinceActivityExcel(Request $request, ReportService $roadPatrolTableService): BinaryFileResponse
-    {
-        $activities = $roadPatrolTableService->provinceActivity($request);
-        $edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
-
-        $name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
-
-        return Excel::download(new ProvinceActivity([
-            'activities' => $activities,
-            'edarateShahri' => $edarateShahri,
-        ]), $name);
-    }
-
-    public function activitiesOnMap(Request $request): JsonResponse
-    {
-        $date_from = $request->from_date ? $request->from_date .' 00:00:00' : now()->startOfDay()->toDateTimeString();
-        $date_to = $request->date_to ? $request->date_to.' 23:59:59' : now()->addDay()->startOfDay()->toDateTimeString();
-        $provinceId = $request->province_id;
-        $edareId = $request->edare_id;
-
-        $data = RoadPatrol::query()
-            ->when($provinceId, fn($query, $provinceId) => $query->where('province_id', '=', $provinceId))
-            ->when($edareId, fn($query, $edareId) => $query->where('edare_id', '=', $edareId))
-            ->whereBetween('created_at', [$date_from, $date_to])
-            ->select('id', 'start_lat', 'start_lon')
-            ->get();
-
-        return $this->successResponse($data);
-    }
-
-    public function showOnMap(RoadPatrol $roadPatrol): JsonResponse
-    {
-        return $this->successResponse($roadPatrol->load(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
-    }
-}
diff --git a/app/Http/Controllers/V3/RoadPatrole/DetailController.php b/app/Http/Controllers/V3/Dashboard/RoadPatrol/DetailController.php
similarity index 91%
rename from app/Http/Controllers/V3/RoadPatrole/DetailController.php
rename to app/Http/Controllers/V3/Dashboard/RoadPatrol/DetailController.php
index 1e389022..e3b6ac5a 100644
--- a/app/Http/Controllers/V3/RoadPatrole/DetailController.php
+++ b/app/Http/Controllers/V3/Dashboard/RoadPatrol/DetailController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V3\RoadPatrole;
+namespace App\Http\Controllers\V3\Dashboard\RoadPatrol;
 
 use App\Http\Controllers\Controller;
 use App\Http\Traits\ApiResponse;
@@ -56,14 +56,14 @@ class DetailController extends Controller
     {
         return $this->successResponse($roadPatrol);
     }
-    public function roadPatrolMachine(RoadPatrol $roadPatrol): JsonResponse
+
+    public function machines(RoadPatrol $roadPatrol): JsonResponse
     {
         return $this->successResponse($roadPatrol->cmmsMachines()->get(['cmms_machines.id', 'cmms_machines.machine_code', 'cmms_machines.car_name', 'cmms_machines.plak_number']));
     }
 
-    public function roadPatrolRahdar(RoadPatrol $roadPatrol): JsonResponse
+    public function rahdaran(RoadPatrol $roadPatrol): JsonResponse
     {
         return $this->successResponse($roadPatrol->rahdaran()->get(['rahdaran.id', 'rahdaran.name', 'rahdaran.code']));
     }
-
 }
diff --git a/app/Http/Controllers/V3/RoadPatrole/OperatorController.php b/app/Http/Controllers/V3/Dashboard/RoadPatrol/OperatorController.php
similarity index 92%
rename from app/Http/Controllers/V3/RoadPatrole/OperatorController.php
rename to app/Http/Controllers/V3/Dashboard/RoadPatrol/OperatorController.php
index a61fe47d..bdb4964a 100644
--- a/app/Http/Controllers/V3/RoadPatrole/OperatorController.php
+++ b/app/Http/Controllers/V3/Dashboard/RoadPatrol/OperatorController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V3\RoadPatrole;
+namespace App\Http\Controllers\V3\Dashboard\RoadPatrol;
 
 
 use App\Enums\MissionStates;
@@ -30,63 +30,23 @@ use Symfony\Component\HttpFoundation\BinaryFileResponse;
 class OperatorController extends Controller
 {
     use ApiResponse;
-    public function index(Request $request, OperatorService $roadPatrolTableService): JsonResponse
+
+    public function index(Request $request, OperatorService $operatorService): JsonResponse
     {
-        $data = $roadPatrolTableService->operatorCartableReport($request);
+        $data = $operatorService->dataTable($request);
         return response()->json($data);
     }
-    public function operatorCartableReport(Request $request, OperatorService $roadPatrolTableService): BinaryFileResponse
+    public function excel(Request $request, OperatorService $operatorService): BinaryFileResponse
     {
         $name = 'گزارش از کارتابل عملیات گشت راهداری ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
-        $data = $roadPatrolTableService->operatorCartableReport($request, true);
+        $data = $operatorService->dataTable($request, true);
         return Excel::download(new OperatorCartableReport($data['data']), $name);
     }
-    public function delete(DeleteRequest $request, RoadPatrol $roadPatrol): JsonResponse
-    {
-        if ($request->type == 1) {
-            DB::transaction(function () use ($roadPatrol) {
-                $roadPatrol->observedItems()->delete();
-                $roadPatrol->delete();
-            });
-        } else {
-            DB::transaction(function () use ($roadPatrol) {
-                if ($roadPatrol->observedItems) {
-                    foreach ($roadPatrol->observedItems as $index => $observed_item) {
-                        if ($observed_item->roadItemProject) {
-                            $road_item = $observed_item->roadItemProject;
 
-                            if ($road_item->files()->exists()) {
-                                Storage::delete('public/' . $road_item->files[0]->path);
-                                Storage::delete('public/' . $road_item->files[1]->path);
-                                $road_item->files()->delete();
-                            }
-
-                            $road_item->delete();
-                        }
-
-                        $observed_item->delete();
-                    }
-                }
-                auth()->user()->addActivityComplete(1144);
-
-                $roadPatrol->delete();
-            });
-        }
-
-        return $this->successResponse();
-    }
     public function store(StoreRequest $request, NominatimService $nominatimService): JsonResponse
     {
         $user = auth()->user();
 
-        if ($user->edarate_ostani_id || is_null($user->city_id)) {
-            return $this->errorResponse('امکان ثبت فعالیت برای ادارات استانی وجود ندارد!');
-        }
-
-        if (is_null($user->edarate_shahri_id)) {
-            return $this->errorResponse('اداره شهری برای شما در سامانه ثبت نشده است!');
-        }
-
         $edare_id = $user->edarate_shahri_id ?? $user->edarate_ostani_id;
         $edare_name = $user->edarate_shahri_id ? $user->edarate_shahri_name : $user->edarate_ostani_name;
 
@@ -94,7 +54,7 @@ class OperatorController extends Controller
             $request, $edare_id,
             $edare_name, $nominatimService, $user
         ) {
-            $mission = Mission::findOrFail($request->mission_id);
+            $mission = Mission::query()->findOrFail($request->mission_id);
 
             if ($mission->status !== MissionStates::START_MISSION->value) {
                 throw ValidationException::withMessages([
@@ -239,4 +199,38 @@ class OperatorController extends Controller
         return $this->successResponse();
     }
 
+    public function delete(DeleteRequest $request, RoadPatrol $roadPatrol): JsonResponse
+    {
+        if ($request->type == 1) {
+            DB::transaction(function () use ($roadPatrol) {
+                $roadPatrol->observedItems()->delete();
+                $roadPatrol->delete();
+            });
+        } else {
+            DB::transaction(function () use ($roadPatrol) {
+                if ($roadPatrol->observedItems) {
+                    foreach ($roadPatrol->observedItems as $index => $observed_item) {
+                        if ($observed_item->roadItemProject) {
+                            $road_item = $observed_item->roadItemProject;
+
+                            if ($road_item->files()->exists()) {
+                                Storage::delete('public/' . $road_item->files[0]->path);
+                                Storage::delete('public/' . $road_item->files[1]->path);
+                                $road_item->files()->delete();
+                            }
+
+                            $road_item->delete();
+                        }
+
+                        $observed_item->delete();
+                    }
+                }
+                auth()->user()->addActivityComplete(1144);
+
+                $roadPatrol->delete();
+            });
+        }
+
+        return $this->successResponse();
+    }
 }
diff --git a/app/Http/Controllers/V3/RoadPatrole/ReportController.php b/app/Http/Controllers/V3/Dashboard/RoadPatrol/ReportController.php
similarity index 88%
rename from app/Http/Controllers/V3/RoadPatrole/ReportController.php
rename to app/Http/Controllers/V3/Dashboard/RoadPatrol/ReportController.php
index 8d12d301..a4fd027f 100644
--- a/app/Http/Controllers/V3/RoadPatrole/ReportController.php
+++ b/app/Http/Controllers/V3/Dashboard/RoadPatrol/ReportController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V3\RoadPatrole;
+namespace App\Http\Controllers\V3\Dashboard\RoadPatrol;
 
 use App\Exports\V3\RoadPatrols\CountryActivity;
 use App\Exports\V3\RoadPatrols\ProvinceActivity;
@@ -70,9 +70,9 @@ class ReportController extends Controller
         $data['observed_items'] = $observed_items;
         return $this->successResponse($data);
     }
-    public function countryPatrolActivity(Request $request, ReportService $roadPatrolTableService): JsonResponse
+    public function countryPatrolActivity(Request $request, ReportService $reportService): JsonResponse
     {
-        $activities = $roadPatrolTableService->countryActivity($request);
+        $activities = $reportService->countryActivity($request);
 
         $provinces = Province::all(['id', 'name_fa']);
 
@@ -82,11 +82,11 @@ class ReportController extends Controller
         ]);
     }
 
-    public function provincePatrolActivity(Request $request, ReportService $roadPatrolTableService): JsonResponse
+    public function provincePatrolActivity(Request $request, ReportService $reportService): JsonResponse
     {
         $request->validate(["province_id" => "required",]);
 
-        $activities = $roadPatrolTableService->provinceActivity($request);
+        $activities = $reportService->provinceActivity($request);
 
         $edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
 
@@ -96,9 +96,9 @@ class ReportController extends Controller
         ]);
     }
 
-    public function countryActivityExcel(Request $request, ReportService $roadPatrolTableService): BinaryFileResponse
+    public function countryActivityExcel(Request $request, ReportService $reportService): BinaryFileResponse
     {
-        $activities = $roadPatrolTableService->countryActivity($request);
+        $activities = $reportService->countryActivity($request);
         $provinces = Province::all(['id', 'name_fa']);
 
         $name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
@@ -109,9 +109,9 @@ class ReportController extends Controller
         ]), $name);
     }
 
-    public function provinceActivityExcel(Request $request, ReportService $roadPatrolTableService): BinaryFileResponse
+    public function provinceActivityExcel(Request $request, ReportService $reportService): BinaryFileResponse
     {
-        $activities = $roadPatrolTableService->provinceActivity($request);
+        $activities = $reportService->provinceActivity($request);
         $edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
 
         $name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
diff --git a/app/Http/Controllers/V3/RoadPatrole/SupervisorController.php b/app/Http/Controllers/V3/Dashboard/RoadPatrol/SupervisorController.php
similarity index 64%
rename from app/Http/Controllers/V3/RoadPatrole/SupervisorController.php
rename to app/Http/Controllers/V3/Dashboard/RoadPatrol/SupervisorController.php
index ad6bead0..6b5a9a91 100644
--- a/app/Http/Controllers/V3/RoadPatrole/SupervisorController.php
+++ b/app/Http/Controllers/V3/Dashboard/RoadPatrol/SupervisorController.php
@@ -1,23 +1,28 @@
 <?php
 
-namespace App\Http\Controllers\V3\RoadPatrole;
+namespace App\Http\Controllers\V3\Dashboard\RoadPatrol;
 
 use App\Exports\V3\RoadPatrols\SupervisorCartableReport;
 use App\Http\Controllers\Controller;
 use App\Http\Traits\ApiResponse;
-use App\Services\Cartables\RoadPatrol\SupervisiorService;
+use App\Services\Cartables\RoadPatrol\SupervisorService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Gate;
 use Maatwebsite\Excel\Facades\Excel;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Throwable;
 
 class SupervisorController extends Controller
 {
     use ApiResponse;
-    public function index(Request $request, SupervisiorService $roadPatrolTableService): JsonResponse
+
+    /**
+     * @throws Throwable
+     */
+    public function index(Request $request, SupervisorService $supervisorService): JsonResponse
     {
-        $data = $roadPatrolTableService->supervisorCartableReport($request);
+        $data = $supervisorService->dataTable($request);
 
         foreach ($data['data'] as $road_patrol) {
             if (Gate::allows('gate-supervise-road-item', $road_patrol)) {
@@ -29,13 +34,14 @@ class SupervisorController extends Controller
 
         return response()->json($data);
     }
-    public function supervisorCartableReport(Request $request, SupervisiorService $roadPatrolTableService): BinaryFileResponse
+
+    /**
+     * @throws Throwable
+     */
+    public function excel(Request $request, SupervisorService $supervisorService): BinaryFileResponse
     {
         $name = 'گزارش از کارتابل ارزیابی گشت راهداری ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
-        $data = $roadPatrolTableService->supervisorCartableReport($request, true);
+        $data = $supervisorService->dataTable($request, true);
         return Excel::download(new SupervisorCartableReport($data['data']), $name);
     }
-
-
-
 }
diff --git a/app/Http/Controllers/V3/Dashboard/RoadPatrolProjectController.php b/app/Http/Controllers/V3/Dashboard/RoadPatrolProjectController.php
deleted file mode 100644
index a8d9fbe1..00000000
--- a/app/Http/Controllers/V3/Dashboard/RoadPatrolProjectController.php
+++ /dev/null
@@ -1,350 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\V3\Dashboard;
-
-use App\Enums\MissionStates;
-use App\Exports\V3\RoadPatrols\OperatorCartableReport;
-use App\Exports\V3\RoadPatrols\SupervisorCartableReport;
-use App\Facades\Sms\Sms;
-use App\Http\Controllers\Controller;
-use App\Http\Requests\V3\RoadPatrol\DeleteRequest;
-use App\Http\Requests\V3\RoadPatrol\StoreRequest;
-use App\Http\Traits\ApiResponse;
-use App\Models\EdarateShahri;
-use App\Models\InfoItem;
-use App\Models\Mission;
-use App\Models\RoadItemsProject;
-use App\Models\RoadObserved;
-use App\Models\RoadPatrol;
-use App\Services\Cartables\RoadPatrol\ReportService;
-use App\Services\NominatimService;
-use Carbon\Carbon;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Gate;
-use Illuminate\Support\Facades\Storage;
-use Illuminate\Validation\ValidationException;
-use Maatwebsite\Excel\Facades\Excel;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;
-
-class RoadPatrolProjectController extends Controller
-{
-    use ApiResponse;
-
-    public function supervisorIndex(Request $request, ReportService $roadPatrolTableService): JsonResponse
-    {
-        $data = $roadPatrolTableService->supervisorCartableReport($request);
-
-        foreach ($data['data'] as $road_patrol) {
-            if (Gate::allows('gate-supervise-road-item', $road_patrol)) {
-                $road_patrol['can_supervise'] = 1;
-            } else {
-                $road_patrol['can_supervise'] = 0;
-            }
-        }
-
-        return response()->json($data);
-    }
-
-    public function delete(DeleteRequest $request, RoadPatrol $roadPatrol): JsonResponse
-    {
-        if ($request->type == 1) {
-            DB::transaction(function () use ($roadPatrol) {
-                $roadPatrol->observedItems()->delete();
-                $roadPatrol->delete();
-            });
-        } else {
-            DB::transaction(function () use ($roadPatrol) {
-                if ($roadPatrol->observedItems) {
-                    foreach ($roadPatrol->observedItems as $index => $observed_item) {
-                        if ($observed_item->roadItemProject) {
-                            $road_item = $observed_item->roadItemProject;
-
-                            if ($road_item->files()->exists()) {
-                                Storage::delete('public/'. $road_item->files[0]->path);
-                                Storage::delete('public/'. $road_item->files[1]->path);
-                                $road_item->files()->delete();
-                            }
-
-                            $road_item->delete();
-                        }
-
-                        $observed_item->delete();
-                    }
-                }
-                auth()->user()->addActivityComplete(1144);
-
-                $roadPatrol->delete();
-            });
-        }
-
-        return $this->successResponse();
-    }
-
-    public function supervisorCartableReport(Request $request, ReportService $roadPatrolTableService): BinaryFileResponse
-    {
-        $name = 'گزارش از کارتابل ارزیابی گشت راهداری ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
-        $data = $roadPatrolTableService->supervisorCartableReport($request, true);
-        return Excel::download(new SupervisorCartableReport($data['data']), $name);
-    }
-
-    public function operatorIndex(Request $request, ReportService $roadPatrolTableService): JsonResponse
-    {
-        $data = $roadPatrolTableService->operatorCartableReport($request);
-        return response()->json($data);
-    }
-
-    public function store(StoreRequest $request, NominatimService $nominatimService): JsonResponse
-    {
-        $user = auth()->user();
-
-        if ($user->edarate_ostani_id || is_null($user->city_id)) {
-            return $this->errorResponse('امکان ثبت فعالیت برای ادارات استانی وجود ندارد!');
-        }
-
-        if (is_null($user->edarate_shahri_id)) {
-            return $this->errorResponse('اداره شهری برای شما در سامانه ثبت نشده است!');
-        }
-
-        $edare_id = $user->edarate_shahri_id ?? $user->edarate_ostani_id;
-        $edare_name = $user->edarate_shahri_id ? $user->edarate_shahri_name : $user->edarate_ostani_name;
-
-        $road_patrol = DB::transaction(function () use ($request, $edare_id,
-            $edare_name, $nominatimService, $user) {
-            $mission = Mission::findOrFail($request->mission_id);
-
-            if ($mission->status !== MissionStates::START_MISSION->value) {
-                throw ValidationException::withMessages([
-                    'mission_id' => 'ماموریت انتخاب شده هنوز شروع نشده است.',
-                ]);
-            }
-
-            $road_patrol = RoadPatrol::query()->create([
-                'operator_id' => $user->id,
-                'operator_name' => $user->name,
-                'province_id' => $user->province_id,
-                'province_fa' => $user->province_fa,
-                'city_id' => $user->city_id,
-                'city_fa' => $user->city_fa,
-                'edare_id' => $edare_id,
-                'edare_name' => $edare_name,
-                'status' => 0,
-                'status_fa' => 'در حال بررسی',
-                'distance' => $request->distance,
-                'start_time' => $request->start_time,
-                'end_time' => $request->end_time,
-                'description' => $request->description ?? null,
-                'fuel_consumption' => $request->fuel_consumption,
-                'vehicle_runtime' => $request->vehicle_runtime,
-                'stop_points' => json_encode($request->stop_points),
-            ]);
-
-            $road_patrol->rahdaran()->attach($request->road_patrol_rahdaran_id);
-            $road_patrol->cmmsMachines()->attach($request->road_patrol_machines_id);
-
-            if ($request->observed_items) {
-                foreach ($request->observed_items as $index => $item) {
-                    $info_item = InfoItem::where('item', $item['item_id'])
-                        ->where('sub_item', $item['sub_item_id'])
-                        ->firstOrFail();
-
-                    $item_start_coordinates = explode(',', $item['start_point']);
-
-                    $observed_item = $road_patrol->observedItems()->create([
-                        'item_id' => $info_item->item,
-                        'item_name' => $info_item->item_str,
-                        'sub_item_id' => $info_item->sub_item,
-                        'sub_item_name' => $info_item->sub_item_str,
-                        'local_name' => $item['local_name'],
-                        'description' => $item['description'] ?? null,
-                        'start_lat' => $item_start_coordinates[0],
-                        'start_lon' => $item_start_coordinates[1],
-                    ]);
-
-                    $item_end_coordinates = null;
-                    if ($item['instant_action'] == 0) {
-                        $priority = [
-                            1 => 'عادی',
-                            2 => 'فوری',
-                            3 => 'آنی',
-                        ];
-                        $observed_item->priority = $item['priority'];
-                        $observed_item->priority_fa = $priority[$item['priority']];
-                        $observed_item->save();
-                    } elseif ($item['instant_action'] == 1) {
-                        if ($info_item->needs_end_point) {
-                            if (!isset($item['end_point'])) {
-                                throw ValidationException::withMessages([
-                                    "observed_items.$index.end_point" => __('validation.required', ['attribute' => 'end_point']),
-                                ]);
-                            }
-
-                            $item_end_coordinates = explode(',', $item['end_point']);
-                        }
-
-                        $before_image = null;
-                        $after_image = null;
-                        if ($info_item->needs_image) {
-                            if (!isset($item['before_image'])) {
-                                throw ValidationException::withMessages([
-                                    "observed_items.$index.before_image" => __('validation.required', ['attribute' => 'before_image']),
-                                ]);
-                            }
-                            if (!isset($item['after_image'])) {
-                                throw ValidationException::withMessages([
-                                    "observed_items.$index.after_image" => __('validation.required', ['attribute' => 'after_image']),
-                                ]);
-                            }
-
-                            $before_image = $item['before_image'];
-                            $after_image = $item['after_image'];
-                        }
-
-                        $start_time = Carbon::createFromFormat('Y-m-d H:i', $request->start_time);
-                        $end_time = Carbon::createFromFormat('Y-m-d H:i', $request->end_time);
-                        $activity_date = $start_time->average($end_time);
-
-                        $attributes = [
-                            'start_lat' => $item_start_coordinates[0],
-                            'start_lng' => $item_start_coordinates[1],
-                            'end_lat' => $item_end_coordinates ? $item_end_coordinates[0] : null,
-                            'end_lng' => $item_end_coordinates ? $item_end_coordinates[1] : null,
-                            'item' => $info_item->item,
-                            'item_fa' => $info_item->item_str,
-                            'sub_item' => $info_item->sub_item,
-                            'sub_item_fa' => $info_item->sub_item_str,
-                            'sub_item_data' => $item['amount'],
-                            'province_id' => $user->province_id,
-                            'province_fa' => $user->province_fa,
-                            'city_id' => $user->city_id,
-                            'city_fa' => $user->city_fa,
-                            'user_name' => $user->name,
-                            'start_way_id' => $nominatimService->get_way_id_from_nominatim($item_start_coordinates[0], $item_start_coordinates[1]),
-                            'end_way_id' => $item_end_coordinates ? $nominatimService->get_way_id_from_nominatim($item_end_coordinates[0], $item_end_coordinates[1]) : null,
-                            'unit_fa' => $info_item->sub_item_unit,
-                            'created_at_fa' => verta(Carbon::now())->format('Y-m-d H:i:s'),
-                            'info_id' => $info_item->id,
-                            'status' => 0,
-                            'status_fa' => 'در حال بررسی',
-                            'edarat_id' => $user->edarate_shahri_id,
-                            'edarat_type' => EdarateShahri::class,
-                            'edarat_name' => $user->edarate_shahri_name,
-                            'activity_date' => $activity_date->format('Y-m-d'),
-                            'activity_time' => $activity_date->format('H:i:s'),
-                        ];
-
-                        $road_item = RoadItemsProject::store($user, $attributes, $before_image, $after_image, $observed_item->id);
-
-                        if ($road_item === -1) {
-                            return $this->errorResponse('اقدام مربوطه قبلا رسیدگی شده است.');
-                        }
-
-                        $road_item->rahdaran()->attach($item['road_item_rahdaran_id']);
-                        $road_item->cmmsMachines()->attach($item['road_item_machines_id']);
-                    }
-                }
-            }
-
-            auth()->user()->addActivityComplete(1147);
-
-            Sms::sendSms($request->officer_phone_number,
-                "گشت راهداری با کد یکتای $road_patrol->id در تاریخ ".verta(\Carbon\Carbon::now())->format('Y-m-d H:i:s')." با شماره شما در سامانه RMS ثبت شد. \n لینک دریافت گزارش : \n https://rms.rmto.ir/v2/road_patrols/operator/report/$road_patrol->id"
-            );
-            return $road_patrol;
-        });
-
-        return $this->successResponse();
-    }
-
-    public function getReport(RoadPatrol $roadPatrol): JsonResponse
-    {
-        $data = [
-            'serial_no' => $roadPatrol->id,
-            'province_fa' => $roadPatrol->province_fa,
-            'edare_name' => $roadPatrol->edare_name,
-            'start_time' => $roadPatrol->start_time,
-            'end_time' => $roadPatrol->end_time,
-            'officer_name' => $roadPatrol->officer_name,
-            'officer_plaque' => $roadPatrol->officer_plaque,
-            'officer_phone_number' => $roadPatrol->officer_phone_number,
-            'created_at' => $roadPatrol->created_at
-        ];
-
-        $observed_items = array();
-        if($roadPatrol->observedItems) {
-            foreach ($roadPatrol->observedItems as $index => $observed_item) {
-                $observed_items[] = [
-                    'item' => $observed_item->item_name,
-                    'sub_item' => $observed_item->sub_item_name,
-                    'local_name' => $observed_item->local_name,
-                    'description' => $observed_item->description,
-                    'priority_fa' => $observed_item->priority_fa,
-                ];
-            }
-        }
-
-        $data['observed_items'] = $observed_items;
-        return $this->successResponse($data);
-    }
-
-    public function map(Request  $request): JsonResponse
-    {
-        $province = $request->province_id;
-        $edare_shahri = $request->edare_shahri_id;
-        $status = $request->status;
-        $rms_status = $request->rms_status;
-
-        if ($request->from_date && $request->date_to) {
-            $date_from = $request->from_date.' 00:00:00';
-            $date_to = $request->date_to.' 23:59:59';
-        } else {
-            $date_from = Date('Y-m-d');
-            $date_to = new \DateTime('tomorrow');
-            $date_to = $date_to->format('Y-m-d');
-        }
-
-        $projects = RoadObserved::query()->select(['id', 'lng', 'lat','status'])
-            ->whereBetween('created_at', [$date_from, $date_to])
-            ->when($province, function ($query) use ($province) {
-                return $query->where('province_id', '=', $province);
-            })
-            ->when($rms_status, function ($query) use ($rms_status) {
-                if ($rms_status == 2) {
-                    return $query->where('rms_status', '<>', 0);
-                } else {
-                    return $query->where('rms_status', '=', 0);
-                }
-            })
-            ->when($edare_shahri, function ($query) use ($edare_shahri) {
-                return $query->where('edarate_shahri_id', '=', $edare_shahri);
-            })
-            ->when($status, function ($query) use ($status) {
-                return $query->where('status', '=', $status);
-            })
-            ->get();
-        return $this->successResponse($projects);
-    }
-
-    public function show(RoadPatrol $roadPatrol): JsonResponse
-    {
-        return $this->successResponse($roadPatrol);
-    }
-
-    public function operatorCartableReport(Request $request, ReportService $roadPatrolTableService): BinaryFileResponse
-    {
-        $name = 'گزارش از کارتابل عملیات گشت راهداری ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
-        $data = $roadPatrolTableService->operatorCartableReport($request, true);
-        return Excel::download(new OperatorCartableReport($data['data']), $name);
-    }
-
-    public function roadPatrolMachine(RoadPatrol $roadPatrol): JsonResponse
-    {
-        return $this->successResponse($roadPatrol->cmmsMachines()->get(['cmms_machines.id', 'cmms_machines.machine_code', 'cmms_machines.car_name', 'cmms_machines.plak_number']));
-    }
-
-    public function roadPatrolRahdar(RoadPatrol $roadPatrol): JsonResponse
-    {
-        return $this->successResponse($roadPatrol->rahdaran()->get(['rahdaran.id', 'rahdaran.name', 'rahdaran.code']));
-    }
-}
diff --git a/app/Services/Cartables/RoadPatrol/OperatorService.php b/app/Services/Cartables/RoadPatrol/OperatorService.php
index 3fcc0306..ce754c57 100644
--- a/app/Services/Cartables/RoadPatrol/OperatorService.php
+++ b/app/Services/Cartables/RoadPatrol/OperatorService.php
@@ -9,27 +9,22 @@ use Illuminate\Support\Facades\DB;
 
 class OperatorService
 {
-
-
-    public function operatorCartableReport(Request $request, $loadRelations = false)
+    public function dataTable(Request $request, $loadRelations = false)
     {
-        $allowedFilters = ['*'];
-        $allowedSortings = ['*'];
-
         $query = RoadPatrol::query()
-            ->select([
-                'province_fa', 'province_id', 'id', 'edare_id', 'edare_name', 'start_time', 'end_time', 'created_at', 'description',
-                'distance', 'vehicle_runtime', 'fuel_consumption', 'stop_points'
-            ])
             ->where('operator_id', '=', auth()->user()->id)
             ->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
 
-        $data = DataTableFacade::run(
+        return DataTableFacade::run(
             $query,
             $request,
-            allowedFilters: $allowedFilters,
-            allowedSortings: $allowedSortings);
-
-        return $data;
+            allowedFilters: ['*'],
+            allowedSortings: ['*'],
+            allowedSelects: [
+                'province_fa', 'province_id', 'id', 'edare_id', 'edare_name',
+                'start_time', 'end_time', 'created_at', 'description',
+                'distance', 'vehicle_runtime', 'fuel_consumption', 'stop_points'
+            ],
+        );
     }
 }
\ No newline at end of file
diff --git a/app/Services/Cartables/RoadPatrol/SupervisiorService.php b/app/Services/Cartables/RoadPatrol/SupervisiorService.php
deleted file mode 100644
index 5fb85820..00000000
--- a/app/Services/Cartables/RoadPatrol/SupervisiorService.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace App\Services\Cartables\RoadPatrol;
-
-use App\Facades\DataTable\DataTableFacade;
-use App\Models\RoadPatrol;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class SupervisiorService
-{
-    public function supervisorCartableReport(Request $request, $loadRelations = false)
-    {
-        $allowedFilters = ['*'];
-        $allowedSortings = ['*'];
-
-        $user = auth()->user();
-        $query = null;
-
-        if ($user->hasPermissionTo('show-road-patrol-supervise-cartable')) {
-            $query = RoadPatrol::query()
-                ->select([
-                    'province_fa', 'province_id', 'id', 'edare_id', 'edare_name', 'start_time', 'end_time', 'created_at', 'description',
-                    'distance', 'vehicle_runtime', 'fuel_consumption', 'stop_points'
-                ])
-                ->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
-        }
-        elseif ($user->hasPermissionTo('show-road-patrol-supervise-cartable-province')) {
-            if (is_null($user->province_id)) {
-                return $this->errorResponse('استانی برای شما در سامانه ثبت نشده است!');
-            }
-            $query = RoadPatrol::query()
-                ->select([
-                    'province_fa', 'province_id', 'id', 'edare_id', 'edare_name', 'start_time', 'end_time', 'created_at', 'description',
-                    'distance', 'vehicle_runtime', 'fuel_consumption', 'stop_points'
-                ])
-                ->where('province_id', '=', $user->province_id)
-                ->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
-        }
-
-        $data = DataTableFacade::run(
-            $query,
-            $request,
-            allowedFilters: $allowedFilters,
-            allowedSortings: $allowedSortings);
-
-        return $data;
-    }
-}
\ No newline at end of file
diff --git a/app/Services/Cartables/RoadPatrol/SupervisorService.php b/app/Services/Cartables/RoadPatrol/SupervisorService.php
new file mode 100644
index 00000000..e726dbc2
--- /dev/null
+++ b/app/Services/Cartables/RoadPatrol/SupervisorService.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Services\Cartables\RoadPatrol;
+
+use App\Exceptions\ProhibitedAction;
+use App\Facades\DataTable\DataTableFacade;
+use App\Models\RoadPatrol;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Throwable;
+
+class SupervisorService
+{
+    /**
+     * @throws Throwable
+     */
+    public function dataTable(Request $request, $loadRelations = false)
+    {
+        $user = auth()->user();
+        $query = null;
+
+        if ($user->hasPermissionTo('show-road-patrol-supervise-cartable')) {
+            $query = RoadPatrol::query()
+                ->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
+        }
+        elseif ($user->hasPermissionTo('show-road-patrol-supervise-cartable-province'))
+        {
+            throw_if(is_null($user->province_id), new ProhibitedAction('استانی برای شما در سامانه ثبت نشده است!'));
+
+            $query = RoadPatrol::query()
+                ->where('province_id', '=', $user->province_id)
+                ->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
+        }
+
+        return DataTableFacade::run(
+            $query,
+            $request,
+            allowedFilters: ['*'],
+            allowedSortings: ['*'],
+            allowedSelects: [
+                'province_fa', 'province_id', 'id', 'edare_id', 'edare_name',
+                'start_time', 'end_time', 'created_at', 'description',
+                'distance', 'vehicle_runtime', 'fuel_consumption', 'stop_points'
+            ]
+        );
+    }
+}
\ No newline at end of file
diff --git a/routes/v3.php b/routes/v3.php
index 0cb7db30..fbe5ea0a 100644
--- a/routes/v3.php
+++ b/routes/v3.php
@@ -17,7 +17,7 @@ use App\Http\Controllers\V3\Dashboard\ObservedItemController;
 use App\Http\Controllers\V3\Dashboard\OtpManagementController;
 use App\Http\Controllers\V3\Dashboard\Reports\RoadItemsReportController;
 use App\Http\Controllers\V3\Dashboard\RoadMaintenanceStationController;
-use App\Http\Controllers\V3\Dashboard\RoadPatrolProjectController;
+use App\Http\Controllers\V3\Dashboard\RoadPatrol\ReportController;
 use App\Http\Controllers\V3\Dashboard\SafetyAndPrivacy\OperatorController;
 use App\Http\Controllers\V3\Dashboard\SafetyAndPrivacy\OperatorReportController;
 use App\Http\Controllers\V3\Dashboard\SafetyAndPrivacy\SupervisorController;
@@ -28,7 +28,6 @@ use App\Http\Controllers\V3\NotificationController;
 use App\Http\Controllers\V3\PermissionManagementController;
 use App\Http\Controllers\V3\ProfileController;
 use App\Http\Controllers\V3\RahdaranController;
-use App\Http\Controllers\V3\RoadPatrole\ReportController;
 use Illuminate\Support\Facades\Route;
 
 Route::get('admin/permissions', function () {
@@ -200,28 +199,24 @@ Route::prefix('road_patrol')
     ->group(function () {
         Route::prefix('details')
             ->name('details.')
-            ->controller(\App\Http\Controllers\V3\RoadPatrole\DetailController::class)
+            ->controller(\App\Http\Controllers\V3\Dashboard\RoadPatrol\DetailController::class)
             ->group(function () {
-                Route::get('/{roadPatrol}', 'show')
-                    ->name('show');
+                Route::get('/{roadPatrol}', 'show')->name('show');
                 Route::get('/machines/{roadPatrol}', 'roadPatrolMachine')->name('roadPatrolMachine');
                 Route::get('/rahdaran/{roadPatrol}', 'roadPatrolRahdar')->name('roadPatrolRahdar');
             });
+
         Route::prefix('operator')
             ->name('operator.')
-            ->controller(App\Http\Controllers\V3\RoadPatrole\OperatorController::class)
+            ->controller(\App\Http\Controllers\V3\Dashboard\RoadPatrol\OperatorController::class)
             ->group(function () {
-                Route::get('/', 'index')
-                    ->middleware('permission:add-road-patrol')
-                    ->name('index');
-
-                Route::get('/report', 'operatorCartableReport')
-                    ->name('cartableReport');
+                Route::get('/', 'index')->middleware('permission:add-road-patrol')->name('index');
+                Route::get('/excel', 'excel')->name('excel');
                 Route::post('/delete/{roadPatrol}', 'delete')
                     ->middleware('permission:partial-delete-road-patrol|complete-delete-road-patrol')
                     ->name('delete');
                 Route::post('/store', 'store')
-                    ->middleware('permission:add-road-patrol')
+                    ->middleware(['permission:add-road-patrol', 'validate-store-access'])
                     ->name('store');
             });
 
@@ -235,19 +230,17 @@ Route::prefix('road_patrol')
                 Route::get('/province_activity_excel', 'provinceActivityExcel')->name('provinceActivityExcel');
                 Route::get('/activities_on_map', 'activitiesOnMap')->name('activitiesOnMap');
                 Route::get('/show_on_map/{roadPatrol}', 'showOnMap')->name('showOnMap');
-                Route::get('/{roadPatrol}', 'getReport')
-                    ->name('getReport');
+                Route::get('/{roadPatrol}', 'getReport')->name('getReport');
             });
+
         Route::prefix('supervisor')
             ->name('supervisor.')
-            ->controller(App\Http\Controllers\V3\RoadPatrole\SupervisorController::class)
+            ->controller(\App\Http\Controllers\V3\Dashboard\RoadPatrol\SupervisorController::class)
             ->group(function () {
                 Route::get('/','index')
                     ->middleware(['permission:show-road-patrol-supervise-cartable|show-road-patrol-supervise-cartable-province'])
                     ->name('index');
-                Route::get('/report', 'supervisorCartableReport')
-                    ->name('cartableReport');
-
+                Route::get('/excel', 'excel')->name('excel');
             });
     });
 

From 7769133bc3e0c2e74b604a18b43f270e650b4883 Mon Sep 17 00:00:00 2001
From: amirghasempoor <amirghasempoor79@gmail.com>
Date: Sat, 28 Jun 2025 08:54:15 +0330
Subject: [PATCH 16/16] add form request to start and finish api

---
 .../Mission/ControlUnitController.php         |  6 ++--
 .../V3/Mission/ControlUnit/FinishRequest.php  | 30 +++++++++++++++++++
 .../V3/Mission/ControlUnit/StartRequest.php   | 30 +++++++++++++++++++
 .../Cartables/Mission/ControlUnitService.php  | 16 +++++-----
 .../Mission/RequestPortalService.php          | 11 ++++---
 .../Mission/TransportationUnitService.php     | 12 ++++----
 routes/v3.php                                 |  4 +--
 7 files changed, 84 insertions(+), 25 deletions(-)
 create mode 100644 app/Http/Requests/V3/Mission/ControlUnit/FinishRequest.php
 create mode 100644 app/Http/Requests/V3/Mission/ControlUnit/StartRequest.php

diff --git a/app/Http/Controllers/V3/Dashboard/Mission/ControlUnitController.php b/app/Http/Controllers/V3/Dashboard/Mission/ControlUnitController.php
index 16d7ffe3..0043ed3f 100644
--- a/app/Http/Controllers/V3/Dashboard/Mission/ControlUnitController.php
+++ b/app/Http/Controllers/V3/Dashboard/Mission/ControlUnitController.php
@@ -4,6 +4,8 @@ namespace App\Http\Controllers\V3\Dashboard\Mission;
 
 use App\Enums\MissionStates;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\V3\Mission\ControlUnit\FinishRequest;
+use App\Http\Requests\V3\Mission\ControlUnit\StartRequest;
 use App\Http\Traits\ApiResponse;
 use App\Models\Mission;
 use App\Services\Cartables\Mission\ControlUnitService;
@@ -19,7 +21,7 @@ class ControlUnitController extends Controller
         return response()->json($controlUnitService->datatable($request));
     }
 
-    public function start(Request $request, Mission $mission): JsonResponse
+    public function start(StartRequest $request, Mission $mission): JsonResponse
     {
         DB::transaction(function () use ($request, $mission) {
             $mission->histories()->create([
@@ -38,7 +40,7 @@ class ControlUnitController extends Controller
         return $this->successResponse();
     }
 
-    public function finish(Request $request, Mission $mission): JsonResponse
+    public function finish(FinishRequest $request, Mission $mission): JsonResponse
     {
         DB::transaction(function () use ($request, $mission) {
             $mission->histories()->create([
diff --git a/app/Http/Requests/V3/Mission/ControlUnit/FinishRequest.php b/app/Http/Requests/V3/Mission/ControlUnit/FinishRequest.php
new file mode 100644
index 00000000..c6b48b09
--- /dev/null
+++ b/app/Http/Requests/V3/Mission/ControlUnit/FinishRequest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Requests\V3\Mission\ControlUnit;
+
+use App\Enums\MissionStates;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+
+class FinishRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return $this->mission->state_id == MissionStates::START_MISSION->value;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, ValidationRule|array|string>
+     */
+    public function rules(): array
+    {
+        return [
+            //
+        ];
+    }
+}
diff --git a/app/Http/Requests/V3/Mission/ControlUnit/StartRequest.php b/app/Http/Requests/V3/Mission/ControlUnit/StartRequest.php
new file mode 100644
index 00000000..f932510c
--- /dev/null
+++ b/app/Http/Requests/V3/Mission/ControlUnit/StartRequest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Requests\V3\Mission\ControlUnit;
+
+use App\Enums\MissionStates;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+
+class StartRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return $this->mission->state_id == MissionStates::PENDING_CONFIRMATION->value;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, ValidationRule|array|string>
+     */
+    public function rules(): array
+    {
+        return [
+            //
+        ];
+    }
+}
diff --git a/app/Services/Cartables/Mission/ControlUnitService.php b/app/Services/Cartables/Mission/ControlUnitService.php
index 57fdd05b..68bd4656 100644
--- a/app/Services/Cartables/Mission/ControlUnitService.php
+++ b/app/Services/Cartables/Mission/ControlUnitService.php
@@ -16,14 +16,10 @@ class ControlUnitService
 
     public function dataTable(Request $request)
     {
-        $fields = [
-            'id', 'user_id', 'username', 'state_name', 'province_name', 'edare_shahri_name',
-            'description', 'requested_machines', 'type', 'type_fa', 'start_date',
-            'end_date', 'request_date', 'end_point', 'area', 'zone', 'zone_fa'
-        ];
-
         $query = Mission::query()
-            ->where('state_id', '=', MissionStates::PENDING_CONFIRMATION->value)
+            ->whereIn('state_id', [
+                MissionStates::PENDING_CONFIRMATION->value,  MissionStates::START_MISSION->value
+            ])
             ->where('edare_shahri_name', '=', Auth::user()->edarate_shahri_id);
 
         return DataTableFacade::run(
@@ -31,7 +27,11 @@ class ControlUnitService
             $request,
             allowedFilters: ['*'],
             allowedSortings: ['*'],
-            allowedSelects: $fields
+            allowedSelects: [
+                'id', 'user_id', 'username', 'state_name', 'province_name', 'edare_shahri_name',
+                'description', 'requested_machines', 'type', 'type_fa', 'start_date', 'state_id',
+                'end_date', 'request_date', 'end_point', 'area', 'zone', 'zone_fa'
+            ]
         );
     }
 }
\ No newline at end of file
diff --git a/app/Services/Cartables/Mission/RequestPortalService.php b/app/Services/Cartables/Mission/RequestPortalService.php
index 4fe32dac..b90bed61 100644
--- a/app/Services/Cartables/Mission/RequestPortalService.php
+++ b/app/Services/Cartables/Mission/RequestPortalService.php
@@ -15,11 +15,6 @@ class RequestPortalService
     public function datatable(Request $request)
     {
         $user = auth()->user();
-        $fields = [
-            'id', 'user_id', 'username', 'state_name', 'province_name', 'edare_shahri_name',
-            'description', 'requested_machines', 'type', 'type_fa', 'start_date',
-            'end_date', 'request_date', 'end_point', 'area', 'zone', 'zone_fa'
-        ];
         $query = Mission::query();
 
         if ($user->hasPermissionTo('manage-request-portal-city')) {
@@ -34,7 +29,11 @@ class RequestPortalService
             $request,
             allowedFilters: ['*'],
             allowedSortings: ['*'],
-            allowedSelects: $fields
+            allowedSelects: [
+                'id', 'user_id', 'username', 'state_name', 'province_name', 'edare_shahri_name',
+                'description', 'requested_machines', 'type', 'type_fa', 'start_date', 'state_id',
+                'end_date', 'request_date', 'end_point', 'area', 'zone', 'zone_fa'
+            ]
         );
     }
 }
\ No newline at end of file
diff --git a/app/Services/Cartables/Mission/TransportationUnitService.php b/app/Services/Cartables/Mission/TransportationUnitService.php
index d21b8424..fa75da4f 100644
--- a/app/Services/Cartables/Mission/TransportationUnitService.php
+++ b/app/Services/Cartables/Mission/TransportationUnitService.php
@@ -12,12 +12,6 @@ class TransportationUnitService
 {
     public function dataTable(Request $request)
     {
-        $fields = [
-            'id', 'user_id', 'username', 'state_name', 'province_name', 'edare_shahri_name',
-            'description', 'requested_machines', 'type', 'type_fa', 'start_date',
-            'end_date', 'request_date', 'end_point', 'area', 'zone', 'zone_fa'
-        ];
-
         $query = Mission::query()
             ->where('state_id', '=', MissionStates::REQUEST_CREATED->value)
             ->where('edare_shahri_name', '=', Auth::user()->edarate_shahri_id);
@@ -27,7 +21,11 @@ class TransportationUnitService
             $request,
             allowedFilters: ['*'],
             allowedSortings: ['*'],
-            allowedSelects: $fields
+            allowedSelects: [
+                'id', 'user_id', 'username', 'state_name', 'province_name', 'edare_shahri_name',
+                'description', 'requested_machines', 'type', 'type_fa', 'start_date', 'state_id',
+                'end_date', 'request_date', 'end_point', 'area', 'zone', 'zone_fa'
+            ]
         );
     }
 }
\ No newline at end of file
diff --git a/routes/v3.php b/routes/v3.php
index fbe5ea0a..7f1ffa3e 100644
--- a/routes/v3.php
+++ b/routes/v3.php
@@ -202,8 +202,8 @@ Route::prefix('road_patrol')
             ->controller(\App\Http\Controllers\V3\Dashboard\RoadPatrol\DetailController::class)
             ->group(function () {
                 Route::get('/{roadPatrol}', 'show')->name('show');
-                Route::get('/machines/{roadPatrol}', 'roadPatrolMachine')->name('roadPatrolMachine');
-                Route::get('/rahdaran/{roadPatrol}', 'roadPatrolRahdar')->name('roadPatrolRahdar');
+                Route::get('/machines/{roadPatrol}', 'machines')->name('machines');
+                Route::get('/rahdaran/{roadPatrol}', 'rahdaran')->name('rahdaran');
             });
 
         Route::prefix('operator')