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

Reviewed-on: #28

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

@@ -65,7 +65,7 @@ class machineDriverReport implements FromView, ShouldAutoSize, WithDrawings, Wit
         $drawing2->setPath(public_path('/dist/141icon.png'));
         $drawing2->setWidth(50);
         $drawing2->setHeight(50);
-        $drawing2->setOffsetX(+90);
+        $drawing2->setOffsetX(5);
         $drawing2->setOffsetY(5);
         $drawing2->setCoordinates('D1');
 

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

@@ -66,7 +66,7 @@ class machineReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent
         $drawing2->setPath(public_path('/dist/141icon.png'));
         $drawing2->setWidth(50);
         $drawing2->setHeight(50);
-        $drawing2->setOffsetX(+90);
+        $drawing2->setOffsetX(5);
         $drawing2->setOffsetY(5);
         $drawing2->setCoordinates('E1');
 

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

@@ -64,7 +64,7 @@ class machineTypeReport implements FromView, ShouldAutoSize, WithDrawings, WithE
         $drawing2->setPath(public_path('/dist/141icon.png'));
         $drawing2->setWidth(50);
         $drawing2->setHeight(50);
-        $drawing2->setOffsetX(+90);
+        $drawing2->setOffsetX(5);
         $drawing2->setOffsetY(5);
         $drawing2->setCoordinates('C1');
 

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

@@ -85,7 +85,7 @@ class ReportMachineController extends Controller
     public function countryMachineTypesActivityExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
     {
         $data = $reportMachineService->countryMachineTypesActivity($request);
-        $name = 'گزارش انوع ماشین'.verta()->now()->format('Y-m-d H-i').'.xlsx';
+        $name = 'گزارش نوع ماشین آلات'.verta()->now()->format('Y-m-d H-i').'.xlsx';
 
         return Excel::download(new machineTypeReport($data), $name);
     }
@@ -125,7 +125,7 @@ class ReportMachineController extends Controller
     public function provinceMachineTypesActivityExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
     {
         $data = $reportMachineService->provinceMachineTypesActivity($request);
-        $name = 'گزارش انوع ماشین'.verta()->now()->format('Y-m-d H-i').'.xlsx';
+        $name = 'گزارش  نوع ماشین آلات'.verta()->now()->format('Y-m-d H-i').'.xlsx';
 
         return Excel::download(new machineTypeReport($data), $name);
     }

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

@@ -285,7 +285,7 @@ class RequestPortalController extends Controller
 
             $mission->rahdaran()->sync($request->rahdaran);
 
-            $violation->update(['status' => 1, 'mission_id' => $mission->id]);
+            $violation->update(['status' => 1]);
 
 //            if ($mission->category_id == 2) {
 //                $rpc = new OperatorController;

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

@@ -5,7 +5,7 @@
     <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>
+    <title>گزارش کل تردد های انواع ماشین ها </title>
 
     <style>
         table,
@@ -40,7 +40,7 @@
     <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>