diff --git a/app/Exports/V3/RoadPatrols/OperatorCartableReport.php b/app/Exports/V3/RoadPatrols/OperatorCartableReport.php
index 0a72ef63..769044e3 100644
--- a/app/Exports/V3/RoadPatrols/OperatorCartableReport.php
+++ b/app/Exports/V3/RoadPatrols/OperatorCartableReport.php
@@ -63,7 +63,7 @@ class OperatorCartableReport implements FromView, WithEvents, ShouldAutoSize, Wi
$drawing2->setHeight(50);
$drawing2->setOffsetX(5);
$drawing2->setOffsetY(5);
- $drawing2->setCoordinates('q1');
+ $drawing2->setCoordinates('i1');
return [$drawing, $drawing2];
}
}
\ No newline at end of file
diff --git a/app/Exports/V3/RoadPatrols/SupervisorCartableReport.php b/app/Exports/V3/RoadPatrols/SupervisorCartableReport.php
index 6373978e..b4e67b7a 100644
--- a/app/Exports/V3/RoadPatrols/SupervisorCartableReport.php
+++ b/app/Exports/V3/RoadPatrols/SupervisorCartableReport.php
@@ -63,7 +63,7 @@ class SupervisorCartableReport implements FromView, WithEvents, ShouldAutoSize,
$drawing2->setHeight(50);
$drawing2->setOffsetX(5);
$drawing2->setOffsetY(5);
- $drawing2->setCoordinates('q1');
+ $drawing2->setCoordinates('i1');
return [$drawing, $drawing2];
}
}
\ No newline at end of file
diff --git a/resources/views/v3/Reports/RoadItems/OperatorCartableReport.blade.php b/resources/views/v3/Reports/RoadItems/OperatorCartableReport.blade.php
index 8c45948a..558c8907 100644
--- a/resources/views/v3/Reports/RoadItems/OperatorCartableReport.blade.php
+++ b/resources/views/v3/Reports/RoadItems/OperatorCartableReport.blade.php
@@ -97,7 +97,7 @@
{{ $item['sub_item_data'] ? ($item['unit_fa'] ? $item['sub_item_data'] . '(' . $item['unit_fa'] . ')' : $item['sub_item_data'] . '(-)') : '-' }}
|
- {{ $item['cmmsMachines'] != null ? $item['cmmsMachines']->pluck('machine_code')->implode(', ') : '-' }} |
+ {{ $item['cmms_machines'] != null ? $item['cmms_machines']->pluck('machine_code')->implode(', ') : '-' }} |
{{ $item['rahdaran'] != null ? $item['rahdaran']->pluck('code')->implode(', ') : '-' }} |
{{ isset($item['start_lat']) && isset($item['start_lng']) ? $item['start_lat'] . ' ' . $item['start_lng'] : '-' }}
diff --git a/resources/views/v3/Reports/RoadItems/SupervisorCartableReport.blade.php b/resources/views/v3/Reports/RoadItems/SupervisorCartableReport.blade.php
index c92fc3ab..1dd0a9c8 100644
--- a/resources/views/v3/Reports/RoadItems/SupervisorCartableReport.blade.php
+++ b/resources/views/v3/Reports/RoadItems/SupervisorCartableReport.blade.php
@@ -97,7 +97,7 @@
|
{{ $item['sub_item_data'] ? ($item['unit_fa'] ? $item['sub_item_data'] . '(' . $item['unit_fa'] . ')' : $item['sub_item_data'] . '(-)') : '-' }}
|
- {{ $item['cmmsMachines'] != null ? $item['cmmsMachines']->pluck('machine_code')->implode(', ') : '-' }} |
+ {{ $item['cmms_machines'] != null ? $item['cmms_machines']->pluck('machine_code')->implode(', ') : '-' }} |
{{ $item['rahdaran'] != null ? $item['rahdaran']->pluck('code')->implode(', ') : '-' }} |
{{ isset($item['start_lat']) && isset($item['start_lng']) ? $item['start_lat'] . ' ' . $item['start_lng'] : '-' }}
diff --git a/resources/views/v3/Reports/RoadPatrols/OperatorCartableReport.blade.php b/resources/views/v3/Reports/RoadPatrols/OperatorCartableReport.blade.php
index 7cf3b4c3..c90cb1da 100644
--- a/resources/views/v3/Reports/RoadPatrols/OperatorCartableReport.blade.php
+++ b/resources/views/v3/Reports/RoadPatrols/OperatorCartableReport.blade.php
@@ -73,13 +73,13 @@
|
| {{ $item['id'] ?? '-' }} |
{{ $item['province_fa'] ?? '-' }} |
- {{ $item['edarat_name'] ?? '-' }} |
- {{ $item['cmmsMachines'] != null ? $item['cmmsMachines']->pluck('machine_code')->implode(', ') : '-' }} |
+ {{ $item['edare_name'] ?? '-' }} |
+ {{ $item['cmms_machines'] != null ? $item['cmms_machines']->pluck('machine_code')->implode(', ') : '-' }} |
{{ $item['rahdaran'] != null ? $item['rahdaran']->pluck('code')->implode(', ') : '-' }} |
{{ $item['start_time'] ? verta($item['start_time'])->format('Y/n/j H:i:s') : '-' }}
| {{ $item['end_time'] ? verta($item['end_time'])->format('Y/n/j H:i:s') : '-' }}
| {{ $item['created_at'] ? verta($item['created_at'])->format('Y/n/j H:i:s') : '-' }} |
- {{ $item['supervisor_description'] ?? '-' }} |
+ {{ $item['description'] ?? '-' }} |
@endforeach
diff --git a/resources/views/v3/Reports/RoadPatrols/SupervisorCartableReport.blade.php b/resources/views/v3/Reports/RoadPatrols/SupervisorCartableReport.blade.php
index e90648a2..0fb2a3d1 100644
--- a/resources/views/v3/Reports/RoadPatrols/SupervisorCartableReport.blade.php
+++ b/resources/views/v3/Reports/RoadPatrols/SupervisorCartableReport.blade.php
@@ -21,18 +21,18 @@
- |
تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
|
- |
|
- |
گزارش کارتابل ارزیابی گشت راهداری
|
@@ -73,13 +73,13 @@
| {{ $item['id'] ?? '-' }} |
{{ $item['province_fa'] ?? '-' }} |
- {{ $item['edarat_name'] ?? '-' }} |
- {{ $item['cmmsMachines'] != null ? $item['cmmsMachines']->pluck('machine_code')->implode(', ') : '-' }} |
+ {{ $item['edare_name'] ?? '-' }} |
+ {{ $item['cmms_machines'] != null ? $item['cmms_machines']->pluck('machine_code')->implode(', ') : '-' }} |
{{ $item['rahdaran'] != null ? $item['rahdaran']->pluck('code')->implode(', ') : '-' }} |
{{ $item['start_time'] ? verta($item['start_time'])->format('Y/n/j H:i:s') : '-' }}
| {{ $item['end_time'] ? verta($item['end_time'])->format('Y/n/j H:i:s') : '-' }}
| {{ $item['created_at'] ? verta($item['created_at'])->format('Y/n/j H:i:s') : '-' }} |
- {{ $item['supervisor_description'] ?? '-' }} |
+ {{ $item['description'] ?? '-' }} |
@endforeach