add extra reports

2026-06-13 14:09:17 +03:30
parent 55b40eb0cc
commit a8c71de069
15 changed files with 210 additions and 85 deletions
--- a/app/Http/Controllers/V3/Dashboard/Mission/ControlUnitController.php
+++ b/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) {
--- a/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php
+++ b/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php
@@ -3,9 +3,11 @@
 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\Mission;
 use App\Models\Province;
 use App\Services\Cartables\Mission\Report\ReportMachineService;
 use Illuminate\Http\JsonResponse;
@@ -85,4 +87,18 @@ class ReportMachineController extends Controller
 //                ->get(['id', 'name_fa'])
        ]);
    }
+
+    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_name',
+            ]
+        );
+    }
 }
--- a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php
+++ b/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): JsonResponse
+    {
+        $query = MissionViolation::query()->where([
+            ['status', '=', MissionViolationStatus::BEDON_EGHDAM->value],
+            ['station_id', '=', auth()->user()->station_id]
+        ]);
+
+        return DataTableFacade::run(
+            $query,
+            $request,
+            allowedFilters: ['*'],
+            allowedSortings: ['*'],
+        );
+    }
+
    /**
     * @throws Throwable
     */
@@ -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();
+    }
 }
--- a/app/Http/Controllers/V3/Dashboard/Mission/TransportationUnitController.php
+++ b/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),
--- a/app/Http/Controllers/V3/Dashboard/Mission/ViolationManagementController.php
+++ b/app/Http/Controllers/V3/Dashboard/Mission/ViolationManagementController.php
@@ -36,67 +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($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,
-                '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();