Merge pull request 'develop' (#35) from develop into main

Reviewed-on: #35

.env.example

@@ -78,7 +78,7 @@ FMS_ERROR_RATE_URL=
 FMS_ERROR_RATE_PASSWORD=
 FMS_ERROR_RATE_USERNAME=
 
-HARIM_NEED_ACCESS_URL='https://zamin.gov.ir/ow/api/ow/esb/response',
+HARIM_NEED_ACCESS_URL='https://zamin.gov.ir/ow/api/ow/esb/response'
 HARIM_NEED_ACCESS_PASSWORD=
 HARIM_NEED_ACCESS_USERNAME=
 
@@ -106,7 +106,7 @@ BACKUP_PASSWORD=1qaz
 HARIM_ENCRYPTION_KEY="TestKey"
 HARIM_ENCRYPTION_IV="1111000011110101"
 
-CHECKE_LIST_MACHINES_ACTIVITY_URL='fms.141.ir:7030/api/RMS/GetMovingVehicles',
+CHECKE_LIST_MACHINES_ACTIVITY_URL='fms.141.ir:7030/api/RMS/GetMovingVehicles'
 CHECKE_LIST_MACHINES_ACTIVITY_PASSWORD=
 CHECKE_LIST_MACHINES_ACTIVITY_USERNAME=
 

.gitignore

@@ -19,3 +19,10 @@ yarn-error.log
 /.idea
 /.vscode
 archive.tgz
+storage/avatar/
+storage/cities-geojson.json
+storage/compress.php
+storage/images/
+storage/provinces-cities-geojson copy.js
+storage/provinces-cities-geojson.js
+storage/provinces-geojson.json

app/Exports/V3/Mission/Report/Machine/machineDetailsReport.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Exports\V3\Mission\Report\Machine;
+
+use Illuminate\Contracts\View\View;
+use Maatwebsite\Excel\Concerns\FromView;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithDrawings;
+use Maatwebsite\Excel\Concerns\WithEvents;
+use Maatwebsite\Excel\Events\AfterSheet;
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
+
+class machineDetailsReport implements FromView, ShouldAutoSize, WithDrawings, WithEvents
+{
+    public function __construct(private array $data)
+    {
+    }
+
+    public function view(): View
+    {
+        $exportRows = [];
+
+        foreach ($this->data as $r) {
+            $exportRows[] = [
+                'id' => $r->id,
+                'province_name' => $r->province_name,
+                'city_name' => $r->city_name,
+                'station_name' => $r->station_name ?? 0,
+                'driver_name' => $r->driver_name ?? '',
+                'km' => $r->km ?? '',
+                'end_km' => $r->end_km ?? '',
+            ];
+        }
+
+        return view('v3.Reports.Mission.Report.Machine.ActivityDetailsReport', [
+            'rows' => $exportRows,
+        ]);
+    }
+
+    public function registerEvents(): array
+    {
+        return [
+            AfterSheet::class => function (AfterSheet $event) {
+                $event->sheet->getDelegate()->setRightToLeft(true);
+            },
+        ];
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function drawings(): array
+    {
+        $drawing = new Drawing();
+        $drawing->setName('Logo');
+        $drawing->setDescription('This is my logo');
+        $drawing->setPath(public_path('/dist/logo.png'));
+        $drawing->setWidth(50);
+        $drawing->setHeight(50);
+        $drawing->setOffsetX(5);
+        $drawing->setOffsetY(5);
+        $drawing->setCoordinates('A1');
+
+        $drawing2 = new Drawing();
+        $drawing2->setName('Logo');
+        $drawing2->setDescription('This is my logo');
+        $drawing2->setPath(public_path('/dist/141icon.png'));
+        $drawing2->setWidth(50);
+        $drawing2->setHeight(50);
+        $drawing2->setOffsetX(+90);
+        $drawing2->setOffsetY(5);
+        $drawing2->setCoordinates('E1');
+
+        return [$drawing, $drawing2];
+    }
+}

app/Exports/V3/Mission/Report/Machine/machineDriverDetailsReport.php

@@ -0,0 +1,78 @@
+<?php
+
+namespace App\Exports\V3\Mission\Report\Machine;
+
+use Illuminate\Contracts\View\View;
+use Maatwebsite\Excel\Concerns\FromView;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithDrawings;
+use Maatwebsite\Excel\Concerns\WithEvents;
+use Maatwebsite\Excel\Events\AfterSheet;
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
+
+class machineDriverDetailsReport implements FromView, ShouldAutoSize, WithDrawings, WithEvents
+{
+    public function __construct(private array $data)
+    {
+    }
+
+    public function view(): View
+    {
+        $exportRows = [];
+
+        foreach ($this->data as $r) {
+            $exportRows[] = [
+                'id' => $r->id,
+                'province_name' => $r->province_name,
+                'city_name' => $r->city_name,
+                'station_name' => $r->station_name ?? 0,
+                'driver_name' => $r->driver_name ?? '',
+                'km' => $r->km ?? '',
+                'end_km' => $r->end_km ?? '',
+
+            ];
+        }
+
+        return view('v3.Reports.Mission.Report.Machine.MachineDriverDetailsReport', [
+            'rows' => $exportRows,
+        ]);
+    }
+
+    public function registerEvents(): array
+    {
+        return [
+            AfterSheet::class => function (AfterSheet $event) {
+                $event->sheet->getDelegate()->setRightToLeft(true);
+            },
+        ];
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function drawings(): array
+    {
+        $drawing = new Drawing();
+        $drawing->setName('Logo');
+        $drawing->setDescription('This is my logo');
+        $drawing->setPath(public_path('/dist/logo.png'));
+        $drawing->setWidth(50);
+        $drawing->setHeight(50);
+        $drawing->setOffsetX(5);
+        $drawing->setOffsetY(5);
+        $drawing->setCoordinates('A1');
+
+        $drawing2 = new Drawing();
+        $drawing2->setName('Logo');
+        $drawing2->setDescription('This is my logo');
+        $drawing2->setPath(public_path('/dist/141icon.png'));
+        $drawing2->setWidth(50);
+        $drawing2->setHeight(50);
+        $drawing2->setOffsetX(+90);
+        $drawing2->setOffsetY(5);
+        $drawing2->setCoordinates('D1');
+
+        return [$drawing, $drawing2];
+    }
+}

app/Exports/V3/Mission/Report/Machine/machineDriverReport.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Exports\V3\Mission\Report\Machine;
+
+use Illuminate\Contracts\View\View;
+use Maatwebsite\Excel\Concerns\FromView;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithDrawings;
+use Maatwebsite\Excel\Concerns\WithEvents;
+use Maatwebsite\Excel\Events\AfterSheet;
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
+
+class machineDriverReport implements FromView, ShouldAutoSize, WithDrawings, WithEvents
+{
+    public function __construct(private array $data)
+    {
+    }
+
+    public function view(): View
+    {
+        $exportRows = [];
+
+        foreach ($this->data as $r) {
+            $exportRows[] = [
+                'driver_id' => $r->driver_id ?? '',
+                'driver_name' => $r->driver_name ?? '',
+                'missions' => $r->missions ?? 0,
+                'func' => (int) ($r->func ?? 0),
+            ];
+        }
+
+        return view('v3.Reports.Mission.Report.Machine.MachineDriverReport', [
+            'rows' => $exportRows,
+        ]);
+    }
+
+    public function registerEvents(): array
+    {
+        return [
+            AfterSheet::class => function (AfterSheet $event) {
+                $event->sheet->getDelegate()->setRightToLeft(true);
+            },
+        ];
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function drawings(): array
+    {
+        $drawing = new Drawing();
+        $drawing->setName('Logo');
+        $drawing->setDescription('This is my logo');
+        $drawing->setPath(public_path('/dist/logo.png'));
+        $drawing->setWidth(50);
+        $drawing->setHeight(50);
+        $drawing->setOffsetX(5);
+        $drawing->setOffsetY(5);
+        $drawing->setCoordinates('A1');
+
+        $drawing2 = new Drawing();
+        $drawing2->setName('Logo');
+        $drawing2->setDescription('This is my logo');
+        $drawing2->setPath(public_path('/dist/141icon.png'));
+        $drawing2->setWidth(50);
+        $drawing2->setHeight(50);
+        $drawing2->setOffsetX(+90);
+        $drawing2->setOffsetY(5);
+        $drawing2->setCoordinates('D1');
+
+        return [$drawing, $drawing2];
+    }
+}

app/Exports/V3/Mission/Report/Machine/machineReport.php

@@ -18,14 +18,16 @@ class machineReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent
     }
 
     public function view(): View
-    { $exportRows = [];
+    {
+        $exportRows = [];
 
         foreach ($this->data as $r) {
             $exportRows[] = [
-                'city_name' => $r->c_name ?? '',
-                'province_name' => $r->p_name ?? '',
+                'machine_id' => $r->machine_id ?? '',
+                'machine_code' => $r->machine_code ?? '',
+                'car_name' => $r->car_name ?? '',
                 'missions' => $r->missions ?? 0,
-                'distance' => (int) ($r->distance ?? 0),
+                'func' => (int) ($r->func ?? 0),
             ];
         }
 
@@ -64,9 +66,9 @@ class machineReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent
         $drawing2->setPath(public_path('/dist/141icon.png'));
         $drawing2->setWidth(50);
         $drawing2->setHeight(50);
-        $drawing2->setOffsetX(5);
+        $drawing2->setOffsetX(+90);
         $drawing2->setOffsetY(5);
-        $drawing2->setCoordinates('D1');
+        $drawing2->setCoordinates('E1');
 
         return [$drawing, $drawing2];
     }

app/Exports/V3/Mission/Report/Machine/machineTypeDetailsReport.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Exports\V3\Mission\Report\Machine;
+
+use Illuminate\Contracts\View\View;
+use Maatwebsite\Excel\Concerns\FromView;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithDrawings;
+use Maatwebsite\Excel\Concerns\WithEvents;
+use Maatwebsite\Excel\Events\AfterSheet;
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
+
+class machineTypeDetailsReport implements FromView, ShouldAutoSize, WithDrawings, WithEvents
+{
+    public function __construct(private array $data)
+    {
+    }
+
+    public function view(): View
+    {
+        $exportRows = [];
+
+        foreach ($this->data as $r) {
+            $exportRows[] = [
+                'id' => $r->id,
+                'province_name' => $r->province_name,
+                'city_name' => $r->city_name,
+                'station_name' => $r->station_name ?? 0,
+                'driver_name' => $r->driver_name ?? '',
+                'km' => $r->km ?? '',
+                'end_km' => $r->end_km ?? '',
+            ];
+        }
+
+        return view('v3.Reports.Mission.Report.Machine.MachineTypeDetailsReport', [
+            'rows' => $exportRows,
+        ]);
+    }
+
+    public function registerEvents(): array
+    {
+        return [
+            AfterSheet::class => function (AfterSheet $event) {
+                $event->sheet->getDelegate()->setRightToLeft(true);
+            },
+        ];
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function drawings(): array
+    {
+        $drawing = new Drawing();
+        $drawing->setName('Logo');
+        $drawing->setDescription('This is my logo');
+        $drawing->setPath(public_path('/dist/logo.png'));
+        $drawing->setWidth(50);
+        $drawing->setHeight(50);
+        $drawing->setOffsetX(5);
+        $drawing->setOffsetY(5);
+        $drawing->setCoordinates('A1');
+
+        $drawing2 = new Drawing();
+        $drawing2->setName('Logo');
+        $drawing2->setDescription('This is my logo');
+        $drawing2->setPath(public_path('/dist/141icon.png'));
+        $drawing2->setWidth(50);
+        $drawing2->setHeight(50);
+        $drawing2->setOffsetX(+90);
+        $drawing2->setOffsetY(5);
+        $drawing2->setCoordinates('C1');
+
+        return [$drawing, $drawing2];
+    }
+}

app/Exports/V3/Mission/Report/Machine/machineTypeReport.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Exports\V3\Mission\Report\Machine;
+
+use Illuminate\Contracts\View\View;
+use Maatwebsite\Excel\Concerns\FromView;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithDrawings;
+use Maatwebsite\Excel\Concerns\WithEvents;
+use Maatwebsite\Excel\Events\AfterSheet;
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
+
+class machineTypeReport implements FromView, ShouldAutoSize, WithDrawings, WithEvents
+{
+    public function __construct(private array $data)
+    {
+    }
+
+    public function view(): View
+    {
+        $exportRows = [];
+
+        foreach ($this->data as $r) {
+            $exportRows[] = [
+                'car_type' => $r->car_type ?? '',
+                'missions' => $r->missions ?? 0,
+                'func' => (int) ($r->func ?? 0),
+            ];
+        }
+
+        return view('v3.Reports.Mission.Report.Machine.MachineTypeReport', [
+            'rows' => $exportRows,
+        ]);
+    }
+
+    public function registerEvents(): array
+    {
+        return [
+            AfterSheet::class => function (AfterSheet $event) {
+                $event->sheet->getDelegate()->setRightToLeft(true);
+            },
+        ];
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function drawings(): array
+    {
+        $drawing = new Drawing();
+        $drawing->setName('Logo');
+        $drawing->setDescription('This is my logo');
+        $drawing->setPath(public_path('/dist/logo.png'));
+        $drawing->setWidth(50);
+        $drawing->setHeight(50);
+        $drawing->setOffsetX(5);
+        $drawing->setOffsetY(5);
+        $drawing->setCoordinates('A1');
+
+        $drawing2 = new Drawing();
+        $drawing2->setName('Logo');
+        $drawing2->setDescription('This is my logo');
+        $drawing2->setPath(public_path('/dist/141icon.png'));
+        $drawing2->setWidth(50);
+        $drawing2->setHeight(50);
+        $drawing2->setOffsetX(+90);
+        $drawing2->setOffsetY(5);
+        $drawing2->setCoordinates('C1');
+
+        return [$drawing, $drawing2];
+    }
+}

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

@@ -2,13 +2,14 @@
 
 namespace App\Http\Controllers\V3\Dashboard\Mission\Report;
 
+use App\Exports\V3\Mission\Report\Machine\machineDetailsReport;
+use App\Exports\V3\Mission\Report\Machine\machineDriverDetailsReport;
+use App\Exports\V3\Mission\Report\Machine\machineDriverReport;
 use App\Exports\V3\Mission\Report\Machine\machineReport;
-use App\Facades\DataTable\DataTableFacade;
+use App\Exports\V3\Mission\Report\Machine\machineTypeDetailsReport;
+use App\Exports\V3\Mission\Report\Machine\machineTypeReport;
 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;
 use Illuminate\Http\Request;
@@ -20,131 +21,114 @@ class ReportMachineController extends Controller
 {
     use ApiResponse;
 
-    public function countryMachinesActivity(Request $request, ReportMachineService $reportMachineService): JsonResponse
+    public function machineDetailsReport(Request $request, ReportMachineService $reportMachineService,int $machine_id): JsonResponse
     {
-        return $this->successResponse([
-            'activities' => $reportMachineService->countryMachinesActivity($request),
-//            'provinces' => Province::all(['id', 'name_fa']),
-        ]);
+        $data = $reportMachineService->machineDetailActivity($request,$machine_id);
+
+        return response()->json($data);
     }
 
     /**
      * @throws Exception
      * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
      */
-    public function countryMachinesActivityExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
+    public function machineDetailsReportExcel(Request $request, int $machine_id, ReportMachineService $reportMachineService): BinaryFileResponse
     {
-        $data = $reportMachineService->countryMachinesActivity($request);
-        $name = 'گزارش ماشین آلات'.verta()->now()->format('Y-m-d H-i').'.xlsx';
+        $data = $reportMachineService->machineDetailActivity($request,$machine_id);
+        $name = 'گزارش عملکرد ماشین آلات'.verta()->now()->format('Y-m-d H-i').'.xlsx';
 
-        return Excel::download(new machineReport($data), $name);
+        return Excel::download(new machineDetailsReport($data['data']), $name);
     }
 
-    public function provinceMachinesActivity(Request $request, ReportMachineService $reportMachineService): JsonResponse
+    public function machinesActivity(Request $request, ReportMachineService $reportMachineService): JsonResponse
     {
-        return $this->successResponse([
-            'activities' => $reportMachineService->countryMachinesActivity($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'])
-        ]);
+        return response()->json($reportMachineService->machinesActivity($request));
     }
 
     /**
      * @throws Exception
      * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
      */
-    public function provinceMachinesActivityExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
+
+    public function machinesActivityExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
     {
-        $data = $reportMachineService->countryMachinesActivity($request);
+        $data = $reportMachineService->machinesActivity($request);
         $name = 'گزارش ماشین آلات'.verta()->now()->format('Y-m-d H-i').'.xlsx';
 
         return Excel::download(new machineReport($data), $name);
     }
 
-    public function countryMachineTypesActivity(Request $request, ReportMachineService $reportMachineService): JsonResponse
+
+    public function machineTypeDetailsReport(Request $request, ReportMachineService $reportMachineService): JsonResponse
     {
-        return $this->successResponse([
-            'activities' => $reportMachineService->countryMachineTypesActivity($request),
-//            'provinces' => Province::all(['id', 'name_fa']),
-        ]);
+        $data = $reportMachineService->machineTypeDetailActivity($request);
+
+        return response()->json($data);
     }
 
     /**
      * @throws Exception
      * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
      */
-    public function countryMachineTypesActivityExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
+    public function machineTypeDetailsReportExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
     {
-        $data = $reportMachineService->countryMachineTypesActivity($request);
-        $name = 'گزارش ماشین آلات'.verta()->now()->format('Y-m-d H-i').'.xlsx';
+        $data = $reportMachineService->machineTypeDetailActivity($request);
+        $name = 'گزارش عملکردیک نوع ماشین'.verta()->now()->format('Y-m-d H-i').'.xlsx';
 
-        return Excel::download(new machineReport($data), $name);
+        return Excel::download(new machineTypeDetailsReport($data['data']), $name);
     }
 
-    public function provinceMachineTypesActivity(Request $request, ReportMachineService $reportMachineService): JsonResponse
+    public function machineTypesActivity(Request $request, ReportMachineService $reportMachineService): JsonResponse
     {
-        return $this->successResponse([
-            'activities' => $reportMachineService->provinceMachineTypesActivity($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 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'
-            ]
-        );
+        return response()->json($reportMachineService->machineTypesActivity($request));
     }
 
     /**
      * @throws Exception
      * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
      */
-    public function provinceMachineTypesActivityExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
+    public function machineTypesActivityExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
     {
-        $data = $reportMachineService->provinceMachineTypesActivity($request);
-        $name = 'گزارش ماشین آلات'.verta()->now()->format('Y-m-d H-i').'.xlsx';
+        $data = $reportMachineService->machineTypesActivity($request);
+        $name = 'گزارش نوع ماشین آلات'.verta()->now()->format('Y-m-d H-i').'.xlsx';
 
-        return Excel::download(new machineReport($data), $name);
+        return Excel::download(new machineTypeReport($data), $name);
     }
 
-    public function countryMachineDriversActivity(Request $request, ReportMachineService $reportMachineService)
+    public function machineDriverDetailsReport(Request $request, ReportMachineService $reportMachineService): JsonResponse
     {
-        return $this->successResponse([
-            'activities' => $reportMachineService->countryMachineDriversActivity($request),
-//            'provinces' => Province::all(['id', 'name_fa']),
-        ]);
+        $data = $reportMachineService->machineDriverDetailActivity($request);
+
+        return response()->json($data);
     }
 
-    public function provinceMachineDriversActivity(Request $request, ReportMachineService $reportMachineService)
+    /**
+     * @throws Exception
+     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
+     */
+    public function machineDriverDetailsReportExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
     {
-        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'])
-        ]);
+        $data = $reportMachineService->machineDriverDetailActivity($request);
+        $name = 'گزارش عملکرد راننده'.verta()->now()->format('Y-m-d H-i').'.xlsx';
+
+        return Excel::download(
+            new machineDriverDetailsReport($data['data']), $name);
     }
-}
+
+    public function machineDriversActivity(Request $request, ReportMachineService $reportMachineService): JsonResponse
+    {
+        return  response()->json($reportMachineService->machineDriversActivity($request));
+    }
+
+    /**
+     * @throws Exception
+     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
+     */
+    public function machineDriversActivityExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
+    {
+        $data = $reportMachineService->machineDriversActivity($request);
+        $name = 'گزارش نوع ماشین آلات'.verta()->now()->format('Y-m-d H-i').'.xlsx';
+
+        return Excel::download(new machineDriverReport($data), $name);
+    }
+}

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

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers\V3\Dashboard\Mission;
 
-use App\Enums\FMSResultCode;
 use App\Enums\MissionCategory;
 use App\Enums\MissionStates;
 use App\Enums\MissionTypes;
@@ -10,7 +9,6 @@ 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;
@@ -23,7 +21,6 @@ use App\Models\Mission;
 use App\Models\MissionViolation;
 use App\Models\Rahdaran;
 use App\Models\RahdariPoint;
-use App\Models\RoadObserved;
 use App\Services\Cartables\Mission\RequestPortalService;
 use App\Services\FMS\GetErrorRateService;
 use Carbon\Carbon;
@@ -65,6 +62,8 @@ class RequestPortalController extends Controller
             $user = auth()->user();
 
             $mission = Mission::query()->create([
+                'item_id' => $request->item_id,
+                'sub_item_id' => $request->sub_item_id,
                 'user_id' => $user->id,
                 'username' => $user->username,
                 'province_id' => $user->province_id,
@@ -83,7 +82,6 @@ class RequestPortalController extends Controller
                 'start_date' => $request->start_date,
                 'end_date' => $request->end_date,
                 'request_date' => now(),
-                'description' => $request->description,
                 'end_point' => $request->end_point,
                 'encoded_route' => $request->encoded_route,
                 'category_id' => $request->category_id,
@@ -126,6 +124,7 @@ class RequestPortalController extends Controller
                 'finish_time' => now(),
                 'state_id' => MissionStates::END_MISSION->value,
                 'state_name' => MissionStates::name(MissionStates::END_MISSION->value),
+                'end_km' => $request->end_km,
             ]);
 
 //            if ($mission->category_id == 2) {
@@ -133,9 +132,11 @@ class RequestPortalController extends Controller
 //                $rpc->store($mission);
 //            }
 
-            $machine = CMMSMachine::query()->find($request->machine_id);
+            $machine = CMMSMachine::query()->find($request->machine_id, ['id', 'machine_code', 'car_type']);
 
             $newMission = Mission::query()->create([
+                'item_id' => $request->item_id,
+                'sub_item_id' => $request->sub_item_id,
                 'user_id' => $user->id,
                 'username' => $user->username,
                 'province_id' => $user->province_id,
@@ -153,7 +154,6 @@ class RequestPortalController extends Controller
                 'start_date' => now(),
                 'end_date' => $request->end_date,
                 'request_date' => now(),
-                'description' => $request->description,
                 'end_point' => $request->end_point,
                 'encoded_route' => $request->encoded_route,
                 'category_id' => $request->category_id,
@@ -166,6 +166,8 @@ class RequestPortalController extends Controller
                 'station_name' => RahdariPoint::query()->find( $user->station_id)->name,
                 'driver_id' => $request->driver,
                 'driver_name' => Rahdaran::query()->find($request->driver)->name,
+                'km' => $request->end_km,
+                'requested_machines' => json_encode($machine->car_type),
             ]);
 
             $newMission->rahdaran()->sync($request->rahdaran);
@@ -182,6 +184,8 @@ class RequestPortalController extends Controller
         DB::transaction(function () use ($mission, $request) {
             $state = MissionStates::REQUEST_CREATED->value;
             $mission->update([
+                'item_id' => $request->item_id,
+                'sub_item_id' => $request->sub_item_id,
                 'state_id' => $state,
                 'state_name' => MissionStates::name($state),
                 'requested_machines' => json_encode($request->requested_machines),
@@ -191,7 +195,6 @@ class RequestPortalController extends Controller
                 'zone_fa' => MissionZones::name($request->zone),
                 'start_date' => $request->start_date,
                 'end_date' => $request->end_date,
-                'description' => $request->description,
                 'end_point' => $request->end_point,
                 'encoded_route' => $request->encoded_route,
                 'category_id' => $request->category_id,
@@ -241,9 +244,11 @@ class RequestPortalController extends Controller
             $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']);
+            $machine = CMMSMachine::query()->where('machine_code', '=', $violation->machine_code)->first(['id', 'machine_code', 'car_type']);
 
             $mission = Mission::query()->create([
+                'item_id' => $request->item_id,
+                'sub_item_id' => $request->sub_item_id,
                 'user_id' => $user->id,
                 'username' => $user->username,
                 'province_id' => $user->province_id,
@@ -271,17 +276,18 @@ class RequestPortalController extends Controller
                 'request_date' => now(),
                 'machine_id' => $machine->id,
                 'machine_code' => $machine->machine_code,
-                'requested_machines' => $machine->car_type,
+                'requested_machines' => json_encode($machine->car_type),
                 'station_id' => $user->station_id,
                 'station_name' => RahdariPoint::query()->find($user->station_id)->name,
                 'km' => $violation->km ?? null,
+                'end_km' => $violation->end_km ?? null,
                 'driver_id' => $request->driver,
                 'driver_name' => Rahdaran::query()->find($request->driver)->name,
             ]);
 
             $mission->rahdaran()->sync($request->rahdaran);
 
-            $violation->update(['status' => 1]);
+            $violation->update(['status' => 1, 'mission_id' => $mission->id]);
 
 //            if ($mission->category_id == 2) {
 //                $rpc = new OperatorController;

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

@@ -47,7 +47,7 @@ class TransportationUnitController extends Controller
                 'state_name' => MissionStates::name($state),
                 'machine_id' => $machine->id,
                 'machine_code' => $machine->machine_code,
-                'driver_id' => $request->driver_id,
+                'driver_id' => $request->driver,
                 'driver_name' => Rahdaran::query()->find($request->driver)->name,
             ]);
 

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

@@ -70,6 +70,7 @@ class ViolationManagementController extends Controller
         $violation->update([
             'enter_time' => $request->enter_time,
             'status' => MissionViolationStatus::BEDON_EGHDAM->value,
+            'end_km' => $request->end_km,
         ]);
 
         return $this->successResponse();

app/Http/Controllers/V3/NotificationController.php

@@ -197,18 +197,67 @@ class NotificationController extends Controller
             'control' => 0,
         ];
 
-        if ($user->hasPermissionTo('manage-transportation-unit')) {
+        if ($user->hasPermissionTo('manage-transportation-unit-station')) {
             $missions['transportation'] = Mission::query()->where([
                 ['state_id', '=',  MissionStates::REQUEST_CREATED->value],
-                ['edare_shahri_id', '=', $user->edarate_shahri_id],
+                ['station_id', '=', $user->station_id],
             ])->count();
         }
-        if ($user->hasPermissionTo('manage-control-unit')) {
-            $missions['control'] = Mission::query()->where([
-                ['state_id', '=',  MissionStates::PENDING_CONFIRMATION->value],
-                ['edare_shahri_id', '=', $user->edarate_shahri_id],
+        if ($user->hasPermissionTo('manage-transportation-unit-country')) {
+            $missions['transportation'] = Mission::query()->where([
+                ['state_id', '=',  MissionStates::REQUEST_CREATED->value],
             ])->count();
         }
+        if ($user->hasPermissionTo('manage-transportation-unit-province')) {
+            $missions['transportation'] = Mission::query()->where([
+                ['state_id', '=',  MissionStates::REQUEST_CREATED->value],
+                ['province_id', '=', $user->province_id],
+
+            ])->count();
+        }
+        if ($user->hasPermissionTo('manage-transportation-unit-city')) {
+            $missions['transportation'] = Mission::query()->where([
+                ['state_id', '=',  MissionStates::REQUEST_CREATED->value],
+                ['city_id', '=', $user->city_id],
+
+            ])->count();
+        }
+
+
+        if ($user->hasPermissionTo('manage-control-unit-station')) {
+            $missions['control'] = Mission::query()
+                ->whereIn('state_id', [
+                    MissionStates::PENDING_CONFIRMATION->value,
+                    MissionStates::START_MISSION->value,
+                ])
+                ->where('station_id', $user->station_id)
+                ->count();
+        }
+        if ($user->hasPermissionTo('manage-control-unit-country')) {
+            $missions['control'] = Mission::query()
+                ->whereIn('state_id', [
+                MissionStates::PENDING_CONFIRMATION->value,
+                MissionStates::START_MISSION->value,
+            ])->count();
+        }
+        if ($user->hasPermissionTo('manage-control-unit-province')) {
+            $missions['control'] = Mission::query()
+                ->whereIn('state_id', [
+                MissionStates::PENDING_CONFIRMATION->value,
+                MissionStates::START_MISSION->value,
+            ])
+                ->where('province_id', '=', $user->province_id)
+                ->count();
+        }
+        if ($user->hasPermissionTo('manage-control-unit-city')) {
+            $missions['control'] = Mission::query()
+                ->whereIn('state_id', [
+                    MissionStates::PENDING_CONFIRMATION->value,
+                    MissionStates::START_MISSION->value,
+                ])
+                ->where('city_id', '=', $user->city_id
+            )->count();
+        }
 
         $missions['total'] = $missions['request_portal'] + $missions['transportation'] + $missions['control'];
 

app/Http/Requests/V3/Mission/ControlUnit/FinishRequest.php

@@ -3,6 +3,7 @@
 namespace App\Http\Requests\V3\Mission\ControlUnit;
 
 use App\Enums\MissionStates;
+use App\Models\CMMSMachine;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Validator;
@@ -14,7 +15,7 @@ class FinishRequest extends FormRequest
      */
     public function authorize(): bool
     {
-        return $this->mission->state_id == MissionStates::START_MISSION->value;
+        return $this->mission->state_id === MissionStates::START_MISSION->value;
     }
 
     /**
@@ -34,6 +35,7 @@ class FinishRequest extends FormRequest
     {
         return [
             function (Validator $validator) {
+
                 $mission = $this->mission;
                 if (strtotime($this->time) < strtotime($mission->start_time)) {
                     $validator->errors()->add(
@@ -41,12 +43,25 @@ class FinishRequest extends FormRequest
                         'زمان پایان ماموریت باید بعد از زمان شروع ماموریت باشد.'
                     );
                 }
-                if ($this->end_km < $mission->km) {
+
+                if ($this->end_km <= $mission->km) {
                     $validator->errors()->add(
                         'end_km',
                         'کیلومتر پایان باید بزرگتر از کیلومتر شروع باشد.'
                     );
                 }
+
+                $machine = CMMSMachine::find($mission->machine_id);
+
+                $distance = $this->end_km - $mission->km;
+
+                if ($distance > $machine->max_mission_duration)
+                {
+                    $validator->errors()->add(
+                        'end_km',
+                        'کیلومتر /ساعت کار از حد نصاب بیشتر هست.'
+                    );
+                }
             }
         ];
     }

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

@@ -25,6 +25,8 @@ class ClarifyUnauthorizedExitRequest extends FormRequest
     public function rules(): array
     {
         return [
+            'item_id' => 'required|exists:info_items,item',
+            'sub_item_id' => 'required|exists:info_items,id',
             'rahdaran' => 'array',
             'rahdaran.*' => 'exists:rahdaran,id',
             'driver' => 'required|integer|exists:rahdaran,id',

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

@@ -26,6 +26,8 @@ class ContinueMissionRequest extends FormRequest
     public function rules(): array
     {
         return [
+            'item_id' => 'required|exists:info_items,item',
+            'sub_item_id' => 'required|exists:info_items,id',
             'rahdaran' => 'array',
             'rahdaran.*' => 'exists:rahdaran,id',
             'machine_id' => 'required|integer|exists:cmms_machines,id',
@@ -33,11 +35,11 @@ class ContinueMissionRequest extends FormRequest
             'type' => 'required|in:1,2',
             'zone' => 'required|in:1,2,3',
             'end_date' => 'required|date',
-            'description' => 'string',
             'end_point' => 'required|string',
             'encoded_route' => 'required|string',
             'explanation' => 'required|string',
             'category_id' => 'required|in:1,2,3',
+            'end_km'=> 'required|string',
         ];
     }
 
@@ -56,6 +58,18 @@ class ContinueMissionRequest extends FormRequest
                         );
                     }
                 }
+                if ($this->end_km <= $this->mission->km) {
+                    $validator->errors()->add(
+                        'end_km',
+                        'کیلومتر پایان باید بزرگتر از کیلومتر شروع باشد.'
+                    );
+                }
+                if (strtotime($this->end_date) < strtotime($this->mission->start_time)) {
+                    $validator->errors()->add(
+                        'time',
+                        'زمان پایان ماموریت باید بعد از زمان شروع ماموریت باشد.'
+                    );
+                }
             },
         ];
     }

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

@@ -25,6 +25,8 @@ class StoreRequest extends FormRequest
     public function rules(): array
     {
         return [
+            'item_id' => 'required|exists:info_items,item',
+            'sub_item_id' => 'required|exists:info_items,id',
             'rahdaran' => 'array',
             'rahdaran.*' => 'exists:rahdaran,id',
             'requested_machines' => 'required|array',
@@ -32,7 +34,6 @@ class StoreRequest extends FormRequest
             'zone' => 'required|in:1,2,3',
             'start_date' => 'required|date',
             'end_date' => 'required|date',
-            'description' => 'string',
             'end_point' => 'required|string',
             'encoded_route' => 'required|string',
             'explanation' => 'required|string',

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

@@ -26,6 +26,8 @@ class UpdateRequest extends FormRequest
     public function rules(): array
     {
         return [
+            'item_id' => 'required|exists:info_items,item',
+            'sub_item_id' => 'required|exists:info_items,id',
             'rahdaran' => 'array',
             'rahdaran.*' => 'exists:rahdaran,id',
             'requested_machines' => 'required|array',
@@ -33,7 +35,6 @@ class UpdateRequest extends FormRequest
             'zone' => 'required|in:1,2,3',
             'start_date' => 'required|date',
             'end_date' => 'required|date',
-            'description' => 'string',
             'end_point' => 'required|string',
             'encoded_route' => 'required|string',
             'explanation' => 'required|string',

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

@@ -15,7 +15,7 @@ class AllocateRequest extends FormRequest
      */
     public function authorize(): bool
     {
-        return $this->mission->station_id == auth()->user()->station_id && $this->mission->state_id == MissionStates::REQUEST_CREATED->value
+        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,8 +13,8 @@ class DeallocateRequest extends FormRequest
      */
     public function authorize(): bool
     {
-        return $this->mission->station_id == auth()->user()->station_id &&
-            in_array($this->mission->state_id, [MissionStates::REQUEST_CREATED->value, MissionStates::PENDING_CONFIRMATION->value])
+        return ($this->mission->station_id == auth()->user()->station_id &&
+            in_array($this->mission->state_id, [MissionStates::REQUEST_CREATED->value, MissionStates::PENDING_CONFIRMATION->value]))
             || auth()->user()->username === 'witel';
     }
 

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

@@ -27,6 +27,7 @@ class UpdateRequest extends FormRequest
     {
         return [
             'enter_time' => 'required|date',
+            'end_km'=> 'required|string',
         ];
     }
 
@@ -40,6 +41,12 @@ class UpdateRequest extends FormRequest
                         'زمان پایان ماموریت باید بعد از زمان شروع ماموریت باشد.'
                     );
                 }
+                if ($this->end_km <= $this->violation->km) {
+                    $validator->errors()->add(
+                        'end_km',
+                        'کیلومتر پایان باید بزرگتر از کیلومتر شروع باشد.'
+                    );
+                }
             }
         ];
     }

app/Models/Mission.php

@@ -14,7 +14,7 @@ class Mission extends Model
 {
     use HasFactory;
 
-    protected $guarded = [];
+    protected $guarded = ['id'];
     protected $hidden = ['pivot'];
     protected $casts = [
         'start_time' => 'datetime',

app/Models/MissionViolation.php

@@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Relations\HasOne;
 class MissionViolation extends Model
 {
     use HasFactory;
-    protected $guarded =[];
+    protected $guarded =['id'];
 
     public function mission(): BelongsTo
     {

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

@@ -3,135 +3,130 @@
 namespace App\Services\Cartables\Mission\Report;
 
 use App\Facades\DataTable\DataTableFacade;
-use App\Models\MissionViolation;
-use Carbon\Carbon;
+use App\Models\CMMSMachine;
+use App\Models\Mission;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
 
 class ReportMachineService
 {
-    public function countryMachinesActivity(Request $request): array
+    public function machineDetailActivity(Request $request, int $machine_id): array
     {
-        $from = $request->from_date ?? today()->startOfDay();
-        $to = $request->date_to ? Carbon::parse($request->date_to)->endOfDay() : today()->endOfDay();
-
-        $sql = "SELECT
-                    m.machine_id,
-                    m.machine_code,
-                    cm.car_name,
-                    COUNT(*) AS missions,
-                    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
-                    GROUP BY machine_id;";
-
-        return DB::select($sql, [
-            'from' => $from,
-            'to'   => $to,
-        ]);
+        return DataTableFacade::run(
+            Mission::query()->where('machine_id', '=', $machine_id),
+            $request,
+            allowedFilters: ['*'],
+            allowedSortings: ['*'],
+            allowedSelects: [
+                'id', 'province_id', 'province_name', 'city_id', 'city_name',
+                'end_km', 'km', 'driver_name', 'state_id', 'station_name'
+            ]
+        );
     }
 
-    public function provinceMachinesActivity(Request $request): array
+    public function machinesActivity(Request $request): array
     {
-        $from = $request->from_date ?? today()->startOfDay();
-        $to = $request->date_to ? Carbon::parse($request->date_to)->endOfDay() : today()->endOfDay();
-        $province = $request->province_id;
+        $query = Mission::query()
+            ->join('cmms_machines as cm', 'cm.id', '=', 'missions.machine_id')
+            ->where('state_id', '=', 4)
+            ->when($request->province_id, function ($q) use ($request) {
+                $q->where('missions.province_id', '=', $request->province_id);
+            })
+            ->selectRaw(
+                'cm.car_name,
+                missions.machine_code,
+                missions.machine_id,
+                COUNT(*) as missions,
+                SUM(missions.end_km - missions.km) as func'
+            )
+            ->groupBy('missions.machine_id');
 
-        $sql = "SELECT machine_id, machine_code, cm.car_name, COUNT(*) AS missions, 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 start_time >= :from AND finish_time <= :to AND province_id = :province_id
-                    GROUP BY machine_id;";
-
-        return DB::select($sql, [
-            'from' => $from,
-            'to'   => $to,
-            'province_id' => $province,
-        ]);
+        $fields = ['machine_code','machine_id','cm.car_name','missions', 'func', 'start_time', 'finish_time', 'province_id'];
+        return DataTableFacade::run(
+            $query,
+            $request,
+            allowedFilters:  $fields,
+            allowedSortings:  $fields,
+        );
     }
 
-    public function countryMachineTypesActivity(Request $request): array
+    public function machineTypeDetailActivity(Request $request): array
     {
-        $from = $request->from_date ?? today()->startOfDay();
-        $to = $request->date_to ? Carbon::parse($request->date_to)->endOfDay() : today()->endOfDay();
-
-        $sql = "SELECT
-                    cm.car_type,
-                    COUNT(*) AS missions,
-                    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
-                    GROUP BY cm.car_type;";
-
-        return DB::select($sql, [
-            'from' => $from,
-            'to'   => $to,
-        ]);
+        $machineIds = CMMSMachine::query()->where('car_type', '=', $request->query('car_type'))->pluck('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 provinceMachineTypesActivity(Request $request): array
+    public function machineTypesActivity(Request $request): array
     {
-        $from = $request->from_date ?? today()->startOfDay();
-        $to = $request->date_to ? Carbon::parse($request->date_to)->endOfDay() : today()->endOfDay();
-        $province = $request->province_id;
+        $query = Mission::query()
+            ->join('cmms_machines as cm', 'cm.id', '=', 'missions.machine_id')
+            ->where('missions.state_id','=', 4)
+            ->when($request->province_id, function ($q) use ($request) {
+                $q->where('missions.province_id', $request->province_id);
+            })
+            ->selectRaw(
+                'cm.car_type,
+                COUNT(*) as missions,
+                SUM(missions.end_km - missions.km) as func'
+            )
+            ->groupBy('cm.car_type')
+            ->orderByRaw('COUNT(*) DESC');
 
-        $sql = "SELECT
-                    cm.car_type,
-                    COUNT(*) AS missions,
-                    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
-                    GROUP BY cm.car_type;";
+        $fields = ['car_type','missions', 'func', 'start_time', 'finish_time', 'province_id'];
 
-        return DB::select($sql, [
-            'from' => $from,
-            'to'   => $to,
-            'province_id' => $province,
-        ]);
+        return DataTableFacade::run(
+            $query,
+            $request,
+            allowedFilters:  $fields,
+            allowedSortings:  $fields,
+        );
     }
 
-    public function countryMachineDriversActivity(Request $request): array
+    public function machineDriverDetailActivity(Request $request): array
     {
-        $from = $request->from_date ?? today()->startOfDay();
-        $to = $request->date_to ? Carbon::parse($request->date_to)->endOfDay() : today()->endOfDay();
-
-        $sql = "SELECT
-                    m.driver_id,
-                    m.driver_name,
-                    COUNT(*) AS missions,
-                    SUM(m.end_km - m.km) AS func
-                    FROM missions m
-                    WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to
-                    GROUP BY m.driver_id;";
-
-        return DB::select($sql, [
-            'from' => $from,
-            'to'   => $to,
-        ]);
+        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'
+            ]
+        );
     }
 
-    public function provinceMachineDriversActivity(Request $request): array
+    public function machineDriversActivity(Request $request): array
     {
-        $from = $request->from_date ?? today()->startOfDay();
-        $to = $request->date_to ? Carbon::parse($request->date_to)->endOfDay() : today()->endOfDay();
-        $province = $request->province_id;
+        $query = Mission::query()
+            ->selectRaw(
+                'driver_id,
+                driver_name,
+                COUNT(*) as missions,
+                SUM(end_km - km) as func'
+            )
+            ->where('state_id', '=', 4)
+            ->when($request->province_id, function ($query) use ($request) {
+                $query->where('province_id', '=', $request->province_id);
+            })
+            ->groupBy('driver_id')
+            ->orderByRaw('COUNT(*) DESC');
 
-        $sql = "SELECT
-                    m.driver_id,
-                    m.driver_name,
-                    COUNT(*) AS missions,
-                    SUM(m.end_km - m.km) AS func
-                    FROM missions m
-                    WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to AND province_id = :province_id
-                    GROUP BY m.driver_id;";
+        $fields = ['driver_id','driver_name','missions', 'func', 'start_time', 'finish_time', 'province_id'];
 
-        return DB::select($sql, [
-            'from' => $from,
-            'to'   => $to,
-            'province_id' => $province,
-        ]);
+        return DataTableFacade::run(
+            $query,
+            $request,
+            allowedFilters:  $fields,
+            allowedSortings:  $fields,
+        );
     }
 }

app/Services/Cartables/Mission/RequestPortalService.php

@@ -34,7 +34,7 @@ class RequestPortalService
                 'description', 'requested_machines', 'type', 'type_fa', 'start_date', 'state_id',
                 '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'
+                'driver_id', 'driver_name', 'machine_id', 'item_id', 'sub_item_id'
             ]
         );
     }

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

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

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

resources/views/v3/Reports/Mission/Report/Machine/ActivityDetailsReport.blade.php

@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>گزارش کل تردد های یک ماشین </title>
+
+    <style>
+        table,
+        th,
+        td {
+            border: 1px solid black;
+        }
+    </style>
+</head>
+
+<body dir="rtl" style="text-align: center;">
+@php
+    // show a dot if key missing or value is 0/empty
+    function cell($row, $key) {
+        return array_key_exists($key, $row) ? ($row[$key] ?: '0') : '0';
+    }
+@endphp
+
+<table>
+    <thead>
+    <tr>
+        <th colspan="7"
+            style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;">
+            تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
+        </th>
+    </tr>
+    <tr>
+        <th colspan="7"
+            style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;">
+        </th>
+    </tr>
+    <tr>
+        <th colspan="7"
+            style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
+            گزارش ماشین های ماموریت رفته
+        </th>
+    </tr>
+    <tr>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            کد یکتا
+        </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            استان
+        </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            شهر </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            راهدارخانه
+        </th>
+
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            نام راننده
+        </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            کیلومتر شروع
+        </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            کیلومتر پایان  </th>
+
+
+    </tr>
+    </thead>
+
+    <tbody>
+    @foreach ($rows as $item)
+        <tr>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['id'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['province_name'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['city_name'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['station_name'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['driver_name'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['km'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['end_km'] ?? '-' }}</td>
+        </tr>
+    @endforeach
+    </tbody>
+</table>
+</body>
+</html>

resources/views/v3/Reports/Mission/Report/Machine/ActivityReport.blade.php

@@ -27,18 +27,18 @@
 <table>
     <thead>
     <tr>
-        <th colspan="4"
+        <th colspan="5"
             style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;">
             تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
         </th>
     </tr>
     <tr>
-        <th colspan="4"
+        <th colspan="5"
             style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;">
         </th>
     </tr>
     <tr>
-        <th colspan="4"
+        <th colspan="5"
             style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
             گزارش ماشین های ماموریت رفته
         </th>
@@ -46,19 +46,23 @@
     <tr>
         <th rowspan="1"
             style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
-            استان
+            کدیکتا
         </th>
         <th rowspan="1"
             style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
-            شهر
+             مدل ماشین </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            کد ماشین
+        </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            کارکرد
         </th>
         <th rowspan="1"
             style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
             تعداد ماموریت </th>
-        <th rowspan="1"
-            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
-            جمع کارکرد
-        </th>
+
 
     </tr>
     </thead>
@@ -66,10 +70,11 @@
     <tbody>
     @foreach ($rows as $item)
         <tr>
-            <td style="border: 1px solid black;text-align: center;">{{ $item['province_name'] ?? '-' }}</td>
-            <td style="border: 1px solid black;text-align: center;">{{ $item['city_name'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['machine_id'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['car_name'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['machine_code'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['func'] ?? '-' }}</td>
             <td style="border: 1px solid black;text-align: center;">{{ $item['missions'] ?? '-' }}</td>
-            <td style="border: 1px solid black;text-align: center;">{{ $item['distance'] ?? '-' }}</td>
         </tr>
     @endforeach
     </tbody>

resources/views/v3/Reports/Mission/Report/Machine/MachineDriverDetailsReport.blade.php

@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>گزارش کل تردد های راننده </title>
+
+    <style>
+        table,
+        th,
+        td {
+            border: 1px solid black;
+        }
+    </style>
+</head>
+
+<body dir="rtl" style="text-align: center;">
+@php
+    // show a dot if key missing or value is 0/empty
+    function cell($row, $key) {
+        return array_key_exists($key, $row) ? ($row[$key] ?: '0') : '0';
+    }
+@endphp
+
+<table>
+    <thead>
+    <tr>
+        <th colspan="7"
+            style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;">
+            تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
+        </th>
+    </tr>
+    <tr>
+        <th colspan="7"
+            style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;">
+        </th>
+    </tr>
+    <tr>
+        <th colspan="7"
+            style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
+            گزارش عملکرد راندده در ماموریت
+        </th>
+    </tr>
+    <tr>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            کد یکتا
+        </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            استان
+        </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+             شهر </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            راهدارخانه
+        </th>
+
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            نام راننده
+        </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            کیلومتر شروع
+        </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            کیلومتر پایان  </th>
+
+
+    </tr>
+    </thead>
+
+    <tbody>
+    @foreach ($rows as $item)
+        <tr>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['id'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['province_name'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['city_name'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['station_name'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['driver_name'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['km'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['end_km'] ?? '-' }}</td>
+        </tr>
+    @endforeach
+    </tbody>
+</table>
+</body>
+</html>

resources/views/v3/Reports/Mission/Report/Machine/MachineDriverReport.blade.php

@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>گزارش کل تردد های راننده </title>
+
+    <style>
+        table,
+        th,
+        td {
+            border: 1px solid black;
+        }
+    </style>
+</head>
+
+<body dir="rtl" style="text-align: center;">
+@php
+    // show a dot if key missing or value is 0/empty
+    function cell($row, $key) {
+        return array_key_exists($key, $row) ? ($row[$key] ?: '0') : '0';
+    }
+@endphp
+
+<table>
+    <thead>
+    <tr>
+        <th colspan="4"
+            style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;">
+            تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
+        </th>
+    </tr>
+    <tr>
+        <th colspan="4"
+            style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;">
+        </th>
+    </tr>
+    <tr>
+        <th colspan="4"
+            style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
+            گزارش راندده ها در ماموریت
+        </th>
+    </tr>
+    <tr>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            کد یکتا
+        </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            نام راننده
+        </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            کارکرد
+        </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            تعداد ماموریت </th>
+
+
+    </tr>
+    </thead>
+
+    <tbody>
+    @foreach ($rows as $item)
+        <tr>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['driver_id'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['driver_name'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['func'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['missions'] ?? '-' }}</td>
+        </tr>
+    @endforeach
+    </tbody>
+</table>
+</body>
+</html>

resources/views/v3/Reports/Mission/Report/Machine/MachineTypeDetailsReport.blade.php

@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>گزارش ترددهای انواع ماشین ها</title>
+
+    <style>
+        table,
+        th,
+        td {
+            border: 1px solid black;
+        }
+    </style>
+</head>
+
+<body dir="rtl" style="text-align: center;">
+@php
+    // show a dot if key missing or value is 0/empty
+    function cell($row, $key) {
+        return array_key_exists($key, $row) ? ($row[$key] ?: '0') : '0';
+    }
+@endphp
+
+<table>
+    <thead>
+    <tr>
+        <th colspan="7"
+            style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;">
+            تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
+        </th>
+    </tr>
+    <tr>
+        <th colspan="7"
+            style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;">
+        </th>
+    </tr>
+    <tr>
+        <th colspan="7"
+            style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
+            گزارش نوع ماشین هادرماموریت
+        </th>
+    </tr>
+    <tr>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            کد یکتا
+        </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            استان
+        </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            شهر </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            راهدارخانه
+        </th>
+
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            نام راننده
+        </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            کیلومتر شروع
+        </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            کیلومتر پایان  </th>
+
+
+    </tr>
+    </thead>
+
+    <tbody>
+    @foreach ($rows as $item)
+        <tr>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['id'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['province_name'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['city_name'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['station_name'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['driver_name'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['km'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['end_km'] ?? '-' }}</td>
+        </tr>
+    @endforeach
+    </tbody>
+</table>
+</body>
+</html>

resources/views/v3/Reports/Mission/Report/Machine/MachineTypeReport.blade.php

@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>گزارش ترددهای انواع ماشین ها</title>
+
+    <style>
+        table,
+        th,
+        td {
+            border: 1px solid black;
+        }
+    </style>
+</head>
+
+<body dir="rtl" style="text-align: center;">
+@php
+    // show a dot if key missing or value is 0/empty
+    function cell($row, $key) {
+        return array_key_exists($key, $row) ? ($row[$key] ?: '0') : '0';
+    }
+@endphp
+
+<table>
+    <thead>
+    <tr>
+        <th colspan="3"
+            style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;">
+            تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
+        </th>
+    </tr>
+    <tr>
+        <th colspan="3"
+            style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;">
+        </th>
+    </tr>
+    <tr>
+        <th colspan="3"
+            style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
+            گزارش نوع ماشین هادرماموریت
+        </th>
+    </tr>
+    <tr>
+
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+             نوع ماشین </th>
+
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            کارکرد
+        </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            تعداد ماموریت </th>
+
+
+    </tr>
+    </thead>
+
+    <tbody>
+    @foreach ($rows as $item)
+        <tr>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['car_type'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['func'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['missions'] ?? '-' }}</td>
+        </tr>
+    @endforeach
+    </tbody>
+</table>
+</body>
+</html>

routes/v3.php

@@ -566,15 +566,19 @@ Route::prefix('missions')
             ->middleware(['permission:mission-report-province|mission-report-country'])
             ->controller(ReportMachineController::class)
             ->group(function () {
-                Route::get('/country_machines_activity', 'countryMachinesActivity')->name('countryMachinesActivity');
-                Route::get('/country_machines_activity_excel', 'countryMachinesActivityExcel')->name('countryMachinesActivityExcel');
-                Route::get('/province_machines_activity', 'provinceMachinesActivity')->name('provinceMachinesActivity');
-                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('/machines_activity', 'machinesActivity')->name('machinesActivity');
+                Route::get('/machines_activity_excel', 'machinesActivityExcel')->name('machinesActivityExcel');
+
+                Route::get('/machine_types_activity', 'machineTypesActivity')->name('machineTypesActivity');
+                Route::get('/machine_types_activity_excel', 'machineTypesActivityExcel')->name('machineTypesActivityExcel');
+                Route::get('/machine_drivers_activity', 'machineDriversActivity')->name('machineDriversActivity');
+                Route::get('/machine_drivers_activity_excel', 'machineDriversActivityExcel')->name('machineDriversActivityExcel');
+                Route::get('/machine_details_report/{machine_id}', 'machineDetailsReport')->name('machineDetailsReport');
+                Route::get('/machine_details_report_excel/{machine_id}', 'machineDetailsReportExcel')->name('machineDetailsReportExcel');
+                Route::get('/machine_type_details_report', 'machineTypeDetailsReport')->name('machineTypeDetailsReport');
+                Route::get('/machine_type_details_report_excel', 'machineTypeDetailsReportExcel')->name('machineTypeDetailsReportExcel');
+                Route::get('/machine_driver_details_report', 'machineDriverDetailsReport')->name('machineDriverDetailsReport');
+                Route::get('/machine_driver_details_report_excel', 'machineDriverDetailsReportExcel')->name('machineDriverDetailsReportExcel');
             });
     });