Merge pull request 'create two record for report' (#20) from feature/MachineTypesDetails into develop

Reviewed-on: #20

app/Console/Commands/EncodePolyLineCommand.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Mission;
+use App\Services\PolylineEncoder;
+use Illuminate\Console\Command;
+
+class EncodePolyLineCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'app:encode-poly-line-command';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'encode all missions that have poly line';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(PolylineEncoder $polylineEncoder): void
+    {
+        Mission::query()->whereNotNull('area')->each(function ($mission)  use ($polylineEncoder) {
+            $area = json_decode($mission->area, true);
+            $encodedValue = $polylineEncoder->encodePolyLine($area['coordinates'], lng_lat_format:true);
+            $mission->update([
+                'encoded_route' => $encodedValue,
+            ]);
+        });
+
+        $this->info("updated successfully");
+    }
+}

app/Enums/CmmsMachineStatus.php

@@ -18,7 +18,7 @@ enum CmmsMachineStatus: int
             self::AMADE => 'آماده',
             self::RESERVE => 'رزرو',
             self::DAR_MAMORIAT => 'در ماموریت',
-            self::KHAREGE_AZ_RADE => 'خارج از محدوده',
+            self::KHAREGE_AZ_RADE => 'خارج از رده',
             self::DAR_TAMIR => 'در تعمیر',
             self::FOROKHTEH_SHODE => ' فروخته شده',
             self::NIZE_BE_TAMIR => 'نیاز به تعمیر',

app/Enums/MissionViolationStatus.php

@@ -2,16 +2,20 @@
 
 namespace App\Enums;
 
+use function Symfony\Component\String\s;
+
 enum MissionViolationStatus: int
 {
     case BEDON_EGHDAM = 0;
     case EGHDAM_SHODE = 1;
+    case SABT_SHODE = 2;
 
     public function label(): string
     {
         return match ($this) {
             self::BEDON_EGHDAM => "بدون اقدام",
             self::EGHDAM_SHODE => "اقدام شده",
+            self::SABT_SHODE => "ثبت شده توسط حراست"
         };
     }
 }

app/Http/Controllers/V3/Dashboard/Mission/ControlUnitController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\V3\Dashboard\Mission;
 
+use App\Enums\CmmsMachineStatus;
 use App\Enums\FMSResultCode;
 use App\Enums\MissionStates;
 use App\Events\V3\Dashboard\Mission\SendDataToFMSEvent;
@@ -39,6 +40,10 @@ class ControlUnitController extends Controller
 //                'previous_state_name' => $mission->state_name,
 //            ]);
 
+            $mission->machine()->update([
+                'status' => CmmsMachineStatus::DAR_MAMORIAT->value
+            ]);
+
             $mission->update([
                 'state_id' => MissionStates::START_MISSION->value,
                 'state_name' => MissionStates::START_MISSION->label(),
@@ -62,25 +67,26 @@ class ControlUnitController extends Controller
 //                'previous_state_name' => $mission->state_name,
 //            ]);
 
-            $mission->update([
-                'state_id' => MissionStates::END_MISSION->value,
-                'state_name' => MissionStates::END_MISSION->label(),
-                'finish_time' => $request->time,
-                'mission_duration' => strtotime($request->time) - strtotime($mission->start_time),
-                'end_km' => $request->end_km,
+            $mission->machine()->update([
+                'status' => CmmsMachineStatus::AMADE->value
             ]);
 
 //            $getErrorRateService->setInputParameters($mission);
 //            $responseData = $getErrorRateService->run();
-//
-//            $mission->update([
+
+            $mission->update([
 //                'in_area_duration' => $responseData['timeInAreaSeconds'],
 //                'first_enter' => $responseData['firstEnter'],
 //                'last_exit' => $responseData['lastExit'],
 //                'point_number_sent' => $responseData['noOfPointsInMission'],
 //                'fms_result_code' => $responseData['resultCode'],
 //                'fms_result_message' => FMSResultCode::name($responseData['resultCode']),
-//            ]);
+                'state_id' => MissionStates::END_MISSION->value,
+                'state_name' => MissionStates::END_MISSION->label(),
+                'finish_time' => $request->time,
+                'mission_duration' => strtotime($request->time) - strtotime($mission->start_time),
+                'end_km' => $request->end_km,
+            ]);
         });
 
 //        if ($mission->category_id == 2) {

app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php

@@ -3,13 +3,17 @@
 namespace App\Http\Controllers\V3\Dashboard\Mission\Report;
 
 use App\Exports\V3\Mission\Report\Machine\machineReport;
+use App\Facades\DataTable\DataTableFacade;
 use App\Http\Controllers\Controller;
 use App\Http\Traits\ApiResponse;
 use App\Models\City;
+use App\Models\CMMSMachine;
+use App\Models\Mission;
 use App\Models\Province;
 use App\Services\Cartables\Mission\Report\ReportMachineService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 use Maatwebsite\Excel\Facades\Excel;
 use PhpOffice\PhpSpreadsheet\Exception;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
@@ -98,6 +102,20 @@ class ReportMachineController extends Controller
         ]);
     }
 
+    public function machineDetailsReport(Request $request)
+    {
+        return DataTableFacade::run(
+            Mission::query()->where('machine_id', '=', $request->query('machine_id')),
+            $request,
+            allowedFilters: ['*'],
+            allowedSortings: ['*'],
+            allowedSelects: [
+                'id', 'province_id', 'province_name', 'city_id', 'city_name',
+                'end_km', 'km', 'driver_name', 'state_id', 'station_name'
+            ]
+        );
+    }
+
     /**
      * @throws Exception
      * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
@@ -109,4 +127,55 @@ class ReportMachineController extends Controller
 
         return Excel::download(new machineReport($data), $name);
     }
+
+    public function countryMachineDriversActivity(Request $request, ReportMachineService $reportMachineService)
+    {
+        return $this->successResponse([
+            'activities' => $reportMachineService->countryMachineDriversActivity($request),
+//            'provinces' => Province::all(['id', 'name_fa']),
+        ]);
+    }
+
+    public function provinceMachineDriversActivity(Request $request, ReportMachineService $reportMachineService)
+    {
+        return $this->successResponse([
+            'activities' => $reportMachineService->provinceMachineDriversActivity($request),
+//            'city' => City::query()
+//                ->where('province_id', $request->province_id)
+//                ->where(function ($query) {
+//                    $query->where('type_id', 1)
+//                        ->orWhereIn('name_fa', ['اداره ماشين‌آلات', 'اداره نقلیه']);
+//                })
+//                ->get(['id', 'name_fa'])
+        ]);
+    }
+
+    public function machineTypeDetailsReport(Request $request)
+    {
+        $machineIds = CMMSMachine::query()->where('car_type', '=', $request->query('car_type'))->pluck('machine_id');
+        return DataTableFacade::run(
+        Mission::query()->whereIn('machine_id', $machineIds),
+        $request,
+        allowedFilters: ['*'],
+        allowedSortings: ['*'],
+        allowedSelects: [
+            'id', 'province_id', 'province_name', 'city_id', 'city_name',
+            'end_km', 'km', 'driver_name', 'state_name', 'station_name'
+        ]
+    );
+    }
+
+    public function machineDriverDetailsReport(Request $request)
+    {
+        return DataTableFacade::run(
+            Mission::query()->where('driver_id', '=', $request->query('driver_id')),
+            $request,
+            allowedFilters: ['*'],
+            allowedSortings: ['*'],
+            allowedSelects: [
+                'id', 'province_id', 'province_name', 'city_id', 'city_name',
+                'end_km', 'km', 'driver_name', 'state_id', 'station_name'
+            ]
+        );
+    }
 }

app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php

@@ -6,10 +6,13 @@ use App\Enums\FMSResultCode;
 use App\Enums\MissionCategory;
 use App\Enums\MissionStates;
 use App\Enums\MissionTypes;
+use App\Enums\MissionViolationStatus;
 use App\Enums\MissionZones;
+use App\Facades\DataTable\DataTableFacade;
 use App\Http\Controllers\Controller;
 use App\Http\Controllers\V3\Dashboard\RoadPatrol\OperatorController;
 use App\Http\Requests\V3\Mission\RequestPortal\ChangeStateRequest;
+use App\Http\Requests\V3\Mission\RequestPortal\ClarifyUnauthorizedExitRequest;
 use App\Http\Requests\V3\Mission\RequestPortal\ContinueMissionRequest;
 use App\Http\Requests\V3\Mission\RequestPortal\NoProcessRequest;
 use App\Http\Requests\V3\Mission\RequestPortal\StoreRequest;
@@ -17,6 +20,7 @@ use App\Http\Requests\V3\Mission\RequestPortal\UpdateRequest;
 use App\Http\Traits\ApiResponse;
 use App\Models\CMMSMachine;
 use App\Models\Mission;
+use App\Models\MissionViolation;
 use App\Models\Rahdaran;
 use App\Models\RahdariPoint;
 use App\Models\RoadObserved;
@@ -37,6 +41,21 @@ class RequestPortalController extends Controller
         return response()->json($requestPortalService->datatable($request));
     }
 
+    public function violations(Request $request): array
+    {
+        $query = MissionViolation::query()->where([
+            ['status', '=', MissionViolationStatus::BEDON_EGHDAM->value],
+            ['station_id', '=', auth()->user()->station_id]
+        ]);
+
+        return DataTableFacade::run(
+            $query,
+            $request,
+            allowedFilters: ['*'],
+            allowedSortings: ['*'],
+        );
+    }
+
     /**
      * @throws Throwable
      */
@@ -66,7 +85,7 @@ class RequestPortalController extends Controller
                 'request_date' => now(),
                 'description' => $request->description,
                 'end_point' => $request->end_point,
-                'area' => json_encode($request->area),
+                'encoded_route' => $request->encoded_route,
                 'category_id' => $request->category_id,
                 'category_name' => MissionCategory::name($request->category_id),
                 'explanation' => $request->explanation,
@@ -136,7 +155,7 @@ class RequestPortalController extends Controller
                 'request_date' => now(),
                 'description' => $request->description,
                 'end_point' => $request->end_point,
-                'area' => json_encode($request->area),
+                'encoded_route' => $request->encoded_route,
                 'category_id' => $request->category_id,
                 'category_name' => MissionCategory::name($request->category_id),
                 'explanation' => $request->explanation,
@@ -174,7 +193,7 @@ class RequestPortalController extends Controller
                 'end_date' => $request->end_date,
                 'description' => $request->description,
                 'end_point' => $request->end_point,
-                'area' => json_encode($request->area),
+                'encoded_route' => $request->encoded_route,
                 'category_id' => $request->category_id,
                 'category_name' => MissionCategory::name($request->category_id),
                 'explanation' => $request->explanation,
@@ -203,10 +222,73 @@ class RequestPortalController extends Controller
     public function changeState(ChangeStateRequest $request, Mission $mission): JsonResponse
     {
         $mission->update([
-            'state' => $request->state_id,
-            'state_name' => MissionStates::name($request->status_id),
+            'state_id' => $request->state_id,
+            'state_name' => MissionStates::name($request->state_id),
         ]);
 
         return $this->successResponse($mission);
     }
+
+    /**
+     * @throws Throwable
+     */
+    public function clarifyUnauthorizedExit(ClarifyUnauthorizedExitRequest $request, MissionViolation $violation): JsonResponse
+    {
+        DB::transaction(function () use ($request, $violation) {
+
+            $start = Carbon::parse($violation->exit_station);
+            $end = Carbon::parse($violation->enter_station);
+            $type = $start->diffInMinutes($end) > 480 ? MissionTypes::NO_PROCESS_ROZANE->value : MissionTypes::NO_PROCESS_SAATY->value;
+            $user = auth()->user();
+            $zone = $request->zone;
+            $machine = CMMSMachine::query()->where('machine_code', '=', $violation->machine_code)->first(['id', 'machine_code']);
+
+            $mission = Mission::query()->create([
+                'user_id' => $user->id,
+                'username' => $user->username,
+                'province_id' => $user->province_id,
+                'province_name' => $user->province_fa,
+                'city_id' => $user->city_id ?? null,
+                'city_name' => $user->city_fa ?? null,
+                'edare_shahri_id' => $user->edarate_shahri_id ?? null,
+                'edare_shahri_name' => $user->edarate_shahri_name ?? null,
+                'zone' => $zone,
+                'zone_fa' => MissionZones::name($zone),
+                'encoded_route' => $request->encoded_route,
+                'type' => $type,
+                'type_fa' => MissionTypes::name($type),
+                'start_date' => $violation->exit_station,
+                'end_date' => $violation->enter_station,
+                'end_point' => $request->end_point,
+                'category_id' => $request->category_id,
+                'category_name' => MissionCategory::name($request->category_id),
+                'start_time' => $violation->exit_station,
+                'finish_time' => $violation->enter_station,
+                'mission_duration' => strtotime($violation->enter_station) - strtotime($violation->exit_station),
+                'state_id' => MissionStates::END_MISSION->value,
+                'state_name' => MissionStates::END_MISSION->label(),
+                'explanation' => $request->explanation,
+                'request_date' => now(),
+                'machine_id' => $machine->id,
+                'machine_code' => $machine->machine_code,
+                'requested_machines' => $machine->car_type,
+                'station_id' => $user->station_id,
+                'station_name' => RahdariPoint::query()->find($user->station_id)->name,
+                'km' => $violation->km ?? null,
+                'driver_id' => $request->driver,
+                'driver_name' => Rahdaran::query()->find($request->driver)->name,
+            ]);
+
+            $mission->rahdaran()->sync($request->rahdaran);
+
+            $violation->update(['status' => 1]);
+
+//            if ($mission->category_id == 2) {
+//                $rpc = new OperatorController;
+//                $rpc->store($mission);
+//            }
+        });
+
+        return $this->successResponse();
+    }
 }

app/Http/Controllers/V3/Dashboard/Mission/TransportationUnitController.php

@@ -50,6 +50,10 @@ class TransportationUnitController extends Controller
                 'driver_id' => $request->driver_id,
                 'driver_name' => Rahdaran::query()->find($request->driver)->name,
             ]);
+
+            $machine->update([
+                'status' => CmmsMachineStatus::RESERVE->value
+            ]);
         });
 
         return $this->successResponse();
@@ -71,6 +75,10 @@ class TransportationUnitController extends Controller
 
             $state = MissionStates::REJECT_BY_TRANSPORTATION->value;
 
+            $mission->machine()->update([
+                'status' => CmmsMachineStatus::AMADE->value
+            ]);
+
             $mission->update([
                 'state_id' => $state,
                 'state_name' => MissionStates::name($state),

app/Http/Controllers/V3/Dashboard/Mission/ViolationManagementController.php

@@ -36,65 +36,6 @@ class ViolationManagementController extends Controller
         return response()->json($data);
     }
 
-    /**
-     * @throws Throwable
-     */
-    public function noProcess(NoProcessRequest $request, MissionViolation $violation): JsonResponse
-    {
-        DB::transaction(function () use ($request, $violation) {
-
-            $start = Carbon::parse($request->start_date);
-            $end = Carbon::parse($request->end_date);
-            $type = $start->diffInMinutes($end) > 480 ? MissionTypes::NO_PROCESS_ROZANE->value : MissionTypes::NO_PROCESS_SAATY->value;
-            $user = auth()->user();
-            $zone = $request->zone;
-            $machine = CMMSMachine::query()->where('machine_code', '=', $violation->machine_code)->first(['id', 'machine_code']);
-
-            $mission = Mission::query()->create([
-                'user_id' => $user->id,
-                'username' => $user->username,
-                'province_id' => $user->province_id,
-                'province_name' => $user->province_fa,
-                'city_id' => $user->city_id ?? null,
-                'city_name' => $user->city_fa ?? null,
-                'edare_shahri_id' => $user->edarate_shahri_id ?? null,
-                'edare_shahri_name' => $user->edarate_shahri_name ?? null,
-                'zone' => $zone,
-                'zone_fa' => MissionZones::name($zone),
-                'type' => $type,
-                'type_fa' => MissionTypes::name($type),
-                'start_date' => $request->start_date,
-                'end_date' => $request->end_date,
-                'end_point' => $request->end_point,
-                'category_id' => $request->category_id,
-                'category_name' => MissionCategory::name($request->category_id),
-                'start_time' => $request->start_date,
-                'finish_time' => $request->end_date,
-                'state_id' => MissionStates::END_MISSION->value,
-                'state_name' => MissionStates::END_MISSION->label(),
-                'explanation' => $request->explanation,
-                'request_date' => now(),
-                'machine_id' => $machine->id,
-                'machine_code' => $machine->machine_code,
-                'station_id' => $user->station_id,
-                'station_name' => RahdariPoint::query()->find( $user->station_id)->name,
-                'km' => $violation->km ?? null,
-                'driver_id' => $request->driver,
-                'driver_name' => Rahdaran::query()->find($request->driver)->name,
-            ]);
-
-            $mission->rahdaran()->sync($request->rahdaran);
-
-            $violation->update(['status' => 1]);
-
-//            if ($mission->category_id == 2) {
-//                $rpc = new OperatorController;
-//                $rpc->store($mission);
-//            }
-        });
-
-        return $this->successResponse();
-    }
     public function store(StoreRequest $request): JsonResponse
     {
         $user = auth()->user();
@@ -103,7 +44,7 @@ class ViolationManagementController extends Controller
             'machine_id'=> CMMSMachine::query()->where('machine_code', '=', $request->machine_code)->value('id'),
             'machine_code'=> $request->machine_code,
             'type'=> MissionViolationType::KHOROJ_BEDONE_MOGAVEZ->value,
-            'status' => MissionViolationStatus::BEDON_EGHDAM->value,
+            'status' => MissionViolationStatus::SABT_SHODE->value,
             'request_date' => now(),
             'km' => $request->km,
             'gps' => 0,
@@ -111,6 +52,9 @@ class ViolationManagementController extends Controller
             'province_name' => $user->province_fa,
             'city_id' => $user->city_id,
             'city_name' => $user->city_fa,
+            'station_id' => $user->station_id,
+            'station_name' => RahdariPoint::query()->find($user->station_id)->name,
+            'exit_station' => $request->exit_station,
         ]);
 
         return $this->successResponse();
@@ -124,8 +68,8 @@ class ViolationManagementController extends Controller
     public function update(UpdateRequest $request, MissionViolation $violation): JsonResponse
     {
         $violation->update([
-            'enter_time' => $request->enter_time,
-            'exit_time' => $request->exit_time,
+            'enter_station' => $request->enter_station,
+            'status' => MissionViolationStatus::BEDON_EGHDAM->value,
         ]);
 
         return $this->successResponse();

app/Http/Requests/V3/Mission/RequestPortal/ClarifyUnauthorizedExitRequest.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Http\Requests\V3\Mission\RequestPortal;
+
+use Carbon\Carbon;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Validator;
+
+class ClarifyUnauthorizedExitRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return $this->violation->status === 0 && $this->violation->type === 1;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, ValidationRule|array|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'rahdaran' => 'array',
+            'rahdaran.*' => 'exists:rahdaran,id',
+            'driver' => 'required|integer|exists:rahdaran,id',
+            'zone' => 'required|in:1,2,3',
+            'end_point' => 'required|string',
+            'encoded_route' => 'required|string',
+            'category_id' => 'required|in:1,2,3',
+            'explanation' => 'required|string',
+        ];
+    }
+}

app/Http/Requests/V3/Mission/RequestPortal/ContinueMissionRequest.php

@@ -35,12 +35,9 @@ class ContinueMissionRequest extends FormRequest
             'end_date' => 'required|date',
             'description' => 'string',
             'end_point' => 'required|string',
-            'area' => 'required|array',
-            'area.type' => 'required|string',
-            'area.coordinates' => 'required|array',
+            'encoded_route' => 'required|string',
             'explanation' => 'required|string',
             'category_id' => 'required|in:1,2,3',
-            'road_observed_id' => 'required_if:category_id,3|exists:road_observeds,id',
         ];
     }
 

app/Http/Requests/V3/Mission/RequestPortal/StoreRequest.php

@@ -34,12 +34,9 @@ class StoreRequest extends FormRequest
             'end_date' => 'required|date',
             'description' => 'string',
             'end_point' => 'required|string',
-            'area' => 'required|array',
-            'area.type' => 'required|string',
-            'area.coordinates' => 'required|array',
+            'encoded_route' => 'required|string',
             'explanation' => 'required|string',
             'category_id' => 'required|in:1,2,3',
-            'road_observed_id' => 'required_if:category_id,3|exists:road_observeds,id',
         ];
     }
 
@@ -58,6 +55,12 @@ class StoreRequest extends FormRequest
                         );
                     }
                 }
+                if (strtotime($this->end_date) < strtotime($this->start_date)) {
+                    $validator->errors()->add(
+                        'time',
+                        'زمان پایان ماموریت باید بعد از زمان شروع ماموریت باشد.'
+                    );
+                }
             },
         ];
     }

app/Http/Requests/V3/Mission/RequestPortal/UpdateRequest.php

@@ -35,12 +35,9 @@ class UpdateRequest extends FormRequest
             'end_date' => 'required|date',
             'description' => 'string',
             'end_point' => 'required|string',
-            'area' => 'required|array',
-            'area.type' => 'required|string',
-            'area.coordinates' => 'required|array',
+            'encoded_route' => 'required|string',
             'explanation' => 'required|string',
             'category_id' => 'required|in:1,2,3',
-            'road_observed_id' => 'required_if:category_id,3|exists:road_observeds,id',
         ];
     }
 
@@ -59,6 +56,12 @@ class UpdateRequest extends FormRequest
                         );
                     }
                 }
+                if (strtotime($this->end_date) < strtotime($this->start_date)) {
+                    $validator->errors()->add(
+                        'time',
+                        'زمان پایان ماموریت باید بعد از زمان شروع ماموریت باشد.'
+                    );
+                }
             },
         ];
     }

app/Http/Requests/V3/Mission/TransportaionUnit/AllocateRequest.php

@@ -15,8 +15,8 @@ class AllocateRequest extends FormRequest
      */
     public function authorize(): bool
     {
-        return $this->mission->edare_shahri_id == auth()->user()->edarate_shahri_id && $this->mission->state_id == MissionStates::REQUEST_CREATED->value
-            || $this->user()?->username === 'witel';
+        return $this->mission->station_id == auth()->user()->station_id && $this->mission->state_id == MissionStates::REQUEST_CREATED->value
+            || auth()->user()->username === 'witel';
     }
 
     /**

app/Http/Requests/V3/Mission/TransportaionUnit/DeallocateRequest.php

@@ -13,9 +13,9 @@ class DeallocateRequest extends FormRequest
      */
     public function authorize(): bool
     {
-        return $this->mission->edare_shahri_id == auth()->user()->edarate_shahri_id &&
+        return $this->mission->station_id == auth()->user()->station_id &&
             in_array($this->mission->state_id, [MissionStates::REQUEST_CREATED->value, MissionStates::PENDING_CONFIRMATION->value])
-            || $this->user()?->username === 'witel';
+            || auth()->user()->username === 'witel';
     }
 
     /**

app/Http/Requests/V3/Mission/Violation/NoProcessRequest.php

@@ -2,8 +2,10 @@
 
 namespace App\Http\Requests\V3\Mission\Violation;
 
+use Carbon\Carbon;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Validator;
 
 class NoProcessRequest extends FormRequest
 {
@@ -27,22 +29,10 @@ class NoProcessRequest extends FormRequest
             'rahdaran.*' => 'exists:rahdaran,id',
             'driver' => 'required|integer|exists:rahdaran,id',
             'zone' => 'required|in:1,2,3',
-            'start_date' => 'required|date',
-            'end_date' => 'required|date|after:start_date|before:now',
             'end_point' => 'required|string',
-            'area' => 'array',
-            'area.type' => 'string',
-            'area.coordinates' => 'array',
+//            'encoded_route' => 'required|string',
             'category_id' => 'required|in:1,2,3',
             'explanation' => 'required|string',
         ];
     }
-
-    public function messages(): array
-    {
-        return [
-            'end_date.before' => 'تاریخ پایان باید قبل از زمان فعلی باشد.',
-            'end_date.after' => 'تاریخ پایان نباید قبل از تاریخ شروع باشد.',
-        ];
-    }
 }

app/Http/Requests/V3/Mission/Violation/StoreRequest.php

@@ -25,7 +25,8 @@ class StoreRequest extends FormRequest
     public function rules(): array
     {
         return [
-           'machine_code' => 'required',
+            'exit_station' => 'required|date',
+            'machine_code' => 'required',
             'km'=> 'string',
         ];
     }

app/Http/Requests/V3/Mission/Violation/UpdateRequest.php

@@ -26,8 +26,21 @@ class UpdateRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'exit_time' => 'date',
-            'enter_time' => 'date',
+            'enter_station' => 'required|date',
+        ];
+    }
+
+    public function after(): array
+    {
+        return [
+            function (Validator $validator) {
+                if (strtotime($this->violation->exit_station) < strtotime($this->enter_station)) {
+                    $validator->errors()->add(
+                        'time',
+                        'زمان پایان ماموریت باید بعد از زمان شروع ماموریت باشد.'
+                    );
+                }
+            }
         ];
     }
 }

app/Models/Mission.php

@@ -28,13 +28,6 @@ class Mission extends Model
         );
     }
 
-    protected function area(): Attribute
-    {
-        return Attribute::make(
-            get: fn($value) => json_decode($value, true)
-        );
-    }
-
     public function histories(): HasMany
     {
         return $this->hasMany(MissionHistory::class);

app/Services/Cartables/Mission/ControlUnitService.php

@@ -37,7 +37,7 @@ class ControlUnitService
             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', 'start_time', 'finish_time',
+                'end_date', 'request_date', 'end_point', 'encoded_route', 'zone', 'zone_fa', 'start_time', 'finish_time',
                 'code', 'category_id', 'category_name', 'explanation', 'city_id', 'city_name', 'province_id', 'station_name',
             ]
         );

app/Services/Cartables/Mission/DailyMoveMachineService.php

@@ -2,6 +2,7 @@
 
 namespace App\Services\Cartables\Mission;
 
+use App\Enums\MissionViolationStatus;
 use App\Facades\DataTable\DataTableFacade;
 use App\Models\MissionViolation;
 use Illuminate\Http\Request;
@@ -13,7 +14,8 @@ class DailyMoveMachineService
     {
         $user = Auth::user();
 
-        $query = MissionViolation::query()->with('machine:id,car_name');
+        $query = MissionViolation::query()->with('machine:id,car_name')
+            ->where('mission_violations.status', '=', MissionViolationStatus::SABT_SHODE->value);
 
         if ($user->hasPermissionTo('manage-violation-station')) {
             $query->whereRelation('machine', 'station_id', '=', $user->station_id);

app/Services/Cartables/Mission/Report/ReportMachineService.php

@@ -83,7 +83,7 @@ class ReportMachineService
                     SUM(m.end_km - m.km) AS func
                     FROM missions m
                     JOIN cmms_machines cm ON cm.id = m.machine_id
-                    WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to AND province_id = :province_id
+                    WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to AND m.province_id = :province_id
                     GROUP BY cm.car_type;";
 
         return DB::select($sql, [

app/Services/Cartables/Mission/RequestPortalService.php

@@ -32,8 +32,9 @@ class RequestPortalService
             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', 'start_time', 'finish_time',
+                'end_date', 'request_date', 'end_point', 'encoded_route', 'zone', 'zone_fa', 'start_time', 'finish_time',
                 'code', 'category_id', 'category_name', 'explanation', 'city_id', 'city_name', 'province_id', 'station_name',
+                'driver_id', 'driver_name'
             ]
         );
     }

app/Services/Cartables/Mission/TransportationUnitService.php

@@ -32,7 +32,7 @@ class TransportationUnitService
             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', 'start_time', 'finish_time',
+                'end_date', 'request_date', 'end_point', 'encoded_route', 'zone', 'zone_fa', 'start_time', 'finish_time',
                 'code', 'category_id', 'category_name', 'explanation', 'km', 'city_id', 'city_name', 'province_id', 'station_name',
             ]
         );

app/Services/PolylineEncoder.php

@@ -0,0 +1,88 @@
+<?php
+
+namespace App\Services;
+
+/**
+ * Class PolylineEncoder
+ *
+ * Encodes a list of latitude/longitude coordinates into an encoded polyline string.
+ *
+ * This implementation is compatible with Google's Polyline Algorithm Format:
+ * https://developers.google.com/maps/documentation/utilities/polylinealgorithm
+ *
+ * Example input:
+ * [
+ *   [lat, lng],
+ *   [lat, lng]
+ * ]
+ *
+ * or if `$lng_lat_format = true`:
+ * [
+ *   [lng, lat],
+ *   [lng, lat]
+ * ]
+ *
+ * @package App\Services
+ */
+class PolylineEncoder
+{
+    /**
+     * Encode an array of coordinates into a polyline string.
+     *
+     * Each coordinate is encoded as a delta from the previous point,
+     * scaled by the given precision factor.
+     *
+     * @param array $coords Array of coordinate pairs:
+     *                      - default: [lat, lng]
+     *                      - if $lng_lat_format = true: [lng, lat]
+     * @param int $precision Number of decimal places to preserve (default: 6)
+     * @param bool $lng_lat_format If true, input is treated as [lng, lat] instead of [lat, lng]
+     *
+     * @return string Encoded polyline string
+     */
+    public function encodePolyline(array $coords, int $precision = 6, bool $lng_lat_format = false): string
+    {
+        $factor = 10 ** $precision;
+        $output = '';
+        $prevLat = 0;
+        $prevLng = 0;
+
+        foreach ($coords as [$a, $b]) {
+            [$lat, $lng] = $lng_lat_format ? [$b, $a] : [$a, $b];
+
+            $output .= $this->encodeValue((int)round($lat * $factor) - $prevLat);
+            $output .= $this->encodeValue((int)round($lng * $factor) - $prevLng);
+
+            $prevLat = (int)round($lat * $factor);
+            $prevLng = (int)round($lng * $factor);
+        }
+
+        return $output;
+    }
+
+    /**
+     * Encodes a single integer value using Google's polyline encoding algorithm.
+     *
+     * Steps:
+     * - Left shift the value
+     * - Invert bits if negative
+     * - Split into 5-bit chunks
+     * - Convert to ASCII characters
+     *
+     * @param int $value Signed integer delta to encode
+     *
+     * @return string Encoded character sequence
+     */
+    public function encodeValue(int $value): string
+    {
+        $value = $value < 0 ? ~($value << 1) : ($value << 1);
+        $result = '';
+
+        while ($value >= 0x20) {
+            $result .= chr((0x20 | ($value & 0x1f)) + 63);
+            $value >>= 5;
+        }
+
+        return $result . chr($value + 63);
+    }
+}

database/migrations/2025_05_17_103927_create_missions_table.php

@@ -24,7 +24,7 @@ return new class extends Migration
             $table->unsignedBigInteger('edare_shahri_id')->nullable();
             $table->foreign('edare_shahri_id')->references('id')->on('edarate_shahri')->noActionOnDelete();
             $table->string('edare_shahri_name')->nullable();
-            $table->json('requested_machines');
+            $table->json('requested_machines')->nullable();
             $table->string('type');
             $table->dateTime('start_date');
             $table->dateTime('end_date');

database/migrations/2025_06_10_093806_add_area_to_missions_table.php

@@ -12,7 +12,7 @@ return new class extends Migration
     public function up(): void
     {
         Schema::table('missions', function (Blueprint $table) {
-            $table->json('area');
+            $table->json('area')->nullable();
             $table->integer('zone');
             $table->string('zone_fa');
             $table->string('type_fa');

database/migrations/2026_06_10_144529_add_column_to_mission_violations_table.php

@@ -0,0 +1,31 @@
+<?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('mission_violations', function (Blueprint $table) {
+            $table->dateTime('exit_station')->nullable();
+            $table->dateTime('enter_station')->nullable();
+            $table->unsignedInteger('station_id')->nullable();
+            $table->string('station_name')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('mission_violations', function (Blueprint $table) {
+            $table->dropColumn(['exit_station', 'enter_station']);
+        });
+    }
+};

database/migrations/2026_06_10_150953_add_column_to_missions_table.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('missions', function (Blueprint $table) {
+            $table->longText('encoded_route')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('missions', function (Blueprint $table) {
+            $table->dropColumn('encoded_route');
+        });
+    }
+};

routes/v3.php

@@ -495,13 +495,14 @@ Route::prefix('missions')
             ->controller(RequestPortalController::class)
             ->group(function () {
                 Route::get('/', 'index')->name('index');
+                Route::get('/violations', 'violations')->name('violations');
                 Route::post('/', 'store')->name('store');
-                Route::post('/no_process','noProcess')->name('noProcess');
+                Route::post('/clarify_unauthorized_exit/{violation}','clarifyUnauthorizedExit')->name('clarifyUnauthorizedExit');
                 Route::post('/continue/{mission}','continueMission')->name('continueMission');
                 Route::get('/{mission}', 'show')->name('show');
                 Route::post('/{mission}', 'update')->name('update');
                 Route::delete('/{mission}', 'destroy')->name('destroy');
-                Route::post('/change_state/{mission}', 'changeState')->name('changeState');
+                Route::post('/change_state/{mission}', 'changeState')->name('changeState')->middleware('permission:mission-change-state');
             });
         Route::name('transportationUnit.')
             ->prefix('transportation_unit')
@@ -536,7 +537,6 @@ Route::prefix('missions')
             ->group(function () {
                 Route::get('/', 'index')->name('index');
                 Route::post('/', 'store')->name('store');
-                Route::post('/no_process/{violation}','noProcess')->name('noProcess');
                 Route::get('/{violation}', 'show')->name('show');
                 Route::post('/{violation}', 'update')->name('update');
                 Route::delete('/{violation}', 'destroy')->name('destroy');
@@ -567,11 +567,16 @@ Route::prefix('missions')
             ->controller(ReportMachineController::class)
             ->group(function () {
                 Route::get('/country_machines_activity', 'countryMachinesActivity')->name('countryMachinesActivity');
-                Route::get('/country_machines_activity', 'countryMachinesActivityExcel')->name('countryMachinesActivityExcel');
+                Route::get('/country_machines_activity_excel', 'countryMachinesActivityExcel')->name('countryMachinesActivityExcel');
                 Route::get('/province_machines_activity', 'provinceMachinesActivity')->name('provinceMachinesActivity');
-                Route::get('/province_machines_activity', 'provinceMachinesActivityExcel')->name('provinceMachinesActivityExcel');
+                Route::get('/province_machines_activity_excel', 'provinceMachinesActivityExcel')->name('provinceMachinesActivityExcel');
                 Route::get('/country_machine_types_activity', 'countryMachineTypesActivity')->name('countryMachineTypesActivity');
                 Route::get('/province_machine_types_activity', 'provinceMachineTypesActivity')->name('provinceMachineTypesActivity');
+                Route::get('/machine_details_report', 'machineDetailsReport')->name('machineDetailsReport');
+                Route::get('/country_machine_drivers_activity', 'countryMachineDriversActivity')->name('countryMachineDriversActivity');
+                Route::get('/province_machine_drivers_activity', 'provinceMachineDriversActivity')->name('provinceMachineDriversActivity');
+                Route::get('/machine_driver_details_report', 'machineDriverDetailsReport')->name('machineDriverDetailsReport');
+                Route::get('/machine_type_details_report', ' machineTypeDetailsReport')->name('machineTypeDetailsReport');
             });
     });