diff --git a/.gitignore b/.gitignore
index 627e5bbd..3519487b 100644
--- a/.gitignore
+++ b/.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
\ No newline at end of file
diff --git a/app/Exports/V3/Mission/Report/Machine/machineReport.php b/app/Exports/V3/Mission/Report/Machine/machineReport.php
index 5b9daa15..538c294f 100644
--- a/app/Exports/V3/Mission/Report/Machine/machineReport.php
+++ b/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,
diff --git a/app/Http/Controllers/V3/Dashboard/Mission/TransportationUnitController.php b/app/Http/Controllers/V3/Dashboard/Mission/TransportationUnitController.php
index ae80dad8..c268b91b 100644
--- a/app/Http/Controllers/V3/Dashboard/Mission/TransportationUnitController.php
+++ b/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,
]);
diff --git a/resources/views/v3/Reports/Mission/Report/Machine/ActivityReport.blade.php b/resources/views/v3/Reports/Mission/Report/Machine/ActivityReport.blade.php
index 53091d8b..c25c0dd2 100644
--- a/resources/views/v3/Reports/Mission/Report/Machine/ActivityReport.blade.php
+++ b/resources/views/v3/Reports/Mission/Report/Machine/ActivityReport.blade.php
@@ -27,18 +27,18 @@
- |
تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
|
- |
|
- |
گزارش ماشین های ماموریت رفته
|
diff --git a/resources/views/v3/Reports/Mission/Report/Machine/MachineDriverReport.blade.php b/resources/views/v3/Reports/Mission/Report/Machine/MachineDriverReport.blade.php
index 9ed7b2c9..787bd624 100644
--- a/resources/views/v3/Reports/Mission/Report/Machine/MachineDriverReport.blade.php
+++ b/resources/views/v3/Reports/Mission/Report/Machine/MachineDriverReport.blade.php
@@ -46,7 +46,11 @@
|
- car_type
+ کد یکتا
+ |
+
+ نام راننده
|
diff --git a/resources/views/v3/Reports/Mission/Report/Machine/MachineTypeReport.blade.php b/resources/views/v3/Reports/Mission/Report/Machine/MachineTypeReport.blade.php
index 46545ea6..74e25d00 100644
--- a/resources/views/v3/Reports/Mission/Report/Machine/MachineTypeReport.blade.php
+++ b/resources/views/v3/Reports/Mission/Report/Machine/MachineTypeReport.blade.php
@@ -27,18 +27,18 @@
- |
تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
|
- |
|
- |
گزارش نوع ماشین های ماموریت رفته
|
|