diff --git a/resources/views/v3/Reports/RoadPatrols/OperatorCartableReport.blade.php b/resources/views/v3/Reports/RoadPatrols/OperatorCartableReport.blade.php
index c90cb1da..92e1f1d6 100644
--- a/resources/views/v3/Reports/RoadPatrols/OperatorCartableReport.blade.php
+++ b/resources/views/v3/Reports/RoadPatrols/OperatorCartableReport.blade.php
@@ -74,7 +74,7 @@
{{ $item['id'] ?? '-' }} |
{{ $item['province_fa'] ?? '-' }} |
{{ $item['edare_name'] ?? '-' }} |
- {{ $item['cmms_machines'] != null ? $item['cmms_machines']->pluck('machine_code')->implode(', ') : '-' }} |
+ {{ $item['cmmsMachines'] != null ? $item['cmmsMachines']->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') : '-' }}
diff --git a/resources/views/v3/Reports/RoadPatrols/SupervisorCartableReport.blade.php b/resources/views/v3/Reports/RoadPatrols/SupervisorCartableReport.blade.php
index 0fb2a3d1..af572a66 100644
--- a/resources/views/v3/Reports/RoadPatrols/SupervisorCartableReport.blade.php
+++ b/resources/views/v3/Reports/RoadPatrols/SupervisorCartableReport.blade.php
@@ -33,7 +33,7 @@
|
|
+ style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
گزارش کارتابل ارزیابی گشت راهداری
|
@@ -74,7 +74,7 @@
{{ $item['id'] ?? '-' }} |
{{ $item['province_fa'] ?? '-' }} |
{{ $item['edare_name'] ?? '-' }} |
- {{ $item['cmms_machines'] != null ? $item['cmms_machines']->pluck('machine_code')->implode(', ') : '-' }} |
+ {{ $item['cmmsMachines'] != null ? $item['cmmsMachines']->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') : '-' }}
|