Merge pull request 'correct the excels' (#27) from feature/MachineExcels into develop

Reviewed-on: #27

.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/machineReport.php

@@ -23,7 +23,7 @@ class machineReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent
 
         foreach ($this->data as $r) {
             $exportRows[] = [
-                'machine_id' => $r->c_name ?? '',
+                'machine_id' => $r->machine_id ?? '',
                 'machine_code' => $r->machine_code ?? '',
                 'car_name' => $r->car_name ?? '',
                 'missions' => $r->missions ?? 0,

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,
             ]);
 

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>

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

@@ -46,7 +46,11 @@
     <tr>
         <th rowspan="1"
             style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
-            car_type
+            کد یکتا
+        </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;">

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

@@ -27,18 +27,18 @@
 <table>
     <thead>
     <tr>
-        <th colspan="4"
+        <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="4"
+        <th colspan="3"
             style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;">
         </th>
     </tr>
     <tr>
-        <th colspan="4"
+        <th colspan="3"
             style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
             گزارش نوع ماشین های ماموریت رفته
         </th>