diff --git a/app/Exports/V3/RoadObservation/OperatorCartableReport.php b/app/Exports/V3/RoadObservation/OperatorCartableReport.php
index 18e0ef18..4cad7e54 100644
--- a/app/Exports/V3/RoadObservation/OperatorCartableReport.php
+++ b/app/Exports/V3/RoadObservation/OperatorCartableReport.php
@@ -17,15 +17,17 @@ use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
class OperatorCartableReport implements FromView, ShouldAutoSize, WithEvents, WithDrawings
{
- public function __construct(private ?Collection $data){}
+ public function __construct(private Collection $data){}
public function view(): View
{
- return view ("test", [
- 'data' => $this->data,
- ]);
+ $data = $this->data;
+ return view('v3.Reports.RoadItems.RoadObservation.OperatorCartableReport', [
+ 'data' => $data['activities']['data'],
+ ]);
}
+
public function registerEvents(): array
{
return [
diff --git a/app/Exports/V3/RoadObservation/SupervisorCartableReport.php b/app/Exports/V3/RoadObservation/SupervisorCartableReport.php
index 224be733..ea3170f4 100644
--- a/app/Exports/V3/RoadObservation/SupervisorCartableReport.php
+++ b/app/Exports/V3/RoadObservation/SupervisorCartableReport.php
@@ -15,12 +15,14 @@ use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
class SupervisorCartableReport implements FromView, WithEvents, ShouldAutoSize, WithDrawings
{
- public function __construct(private ?Collection $data){}
+ public function __construct(private Collection $data){}
public function view(): View
{
- return view ("test", [
- 'data' => $this->data,
+ $data = $this->data;
+
+ return view('v3.Reports.RoadItems.RoadObservation.supervisorCartableReport', [
+ 'data' => $data['activities']['data'],
]);
}
diff --git a/resources/views/v3/Reports/RoadObservation/OpratorCartableReport.blade.php b/resources/views/v3/Reports/RoadObservation/OpratorCartableReport.blade.php
new file mode 100644
index 00000000..da390bb1
--- /dev/null
+++ b/resources/views/v3/Reports/RoadObservation/OpratorCartableReport.blade.php
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+ گزارش واکنش سریع
+
+
+
+
+
+
+
+
+
+ |
+ تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
+ |
+
+
+ |
+ |
+
+
+ |
+ گزارش کارتابل ارزیابی واکنش سریع
+ |
+
+
+ | کد یکتا |
+ کد سوانح |
+ استان |
+ ادارات شهری |
+ موضوع گزارش |
+ نوع گزارش |
+ شماره تماس گیرنده |
+ وضعیت |
+ تاریخ اقدام |
+ توضیحات |
+ توضیحات کارشناس |
+
+
+
+
+ @foreach ($data as $item)
+
+ | {{ $item['id'] ?? '-' }} |
+ {{ $item['fk_RegisteredEventMessage'] ?? '-' }} |
+ {{ $item['province_fa'] ?? '-' }} |
+ {{ $item['edarate_shahri_name_fa'] ?? '-' }} |
+ {{ $item['Title'] ?? '-' }} |
+ {{ $item['FeatureTypeTitle'] ?? '-' }} |
+ {{ $item['MobileForSendEventSms'] ?? '-' }} |
+ {{ $item['status_fa'] ?? '-' }} |
+ {{ $item['rms_last_activity_fa'] ?? '-' }} |
+ {{ $item['rms_description'] ?? '-' }} |
+ {{ $item['supervisor_description'] ?? '-' }} |
+
+ @endforeach
+
+
+
+
+
diff --git a/resources/views/v3/Reports/RoadObservation/SupervisorCartableReport.blade.php b/resources/views/v3/Reports/RoadObservation/SupervisorCartableReport.blade.php
new file mode 100644
index 00000000..4c04abfd
--- /dev/null
+++ b/resources/views/v3/Reports/RoadObservation/SupervisorCartableReport.blade.php
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+ گزارش واکنش سریع
+
+
+
+
+
+
+
+
+
+ |
+ تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
+ |
+
+
+ |
+ |
+
+
+ |
+ @if ($fromDate == null)
+ گزارش کارتابل ارزیابی واکنش سریع
+ @else
+ گزارش کارتابل ارزیابی واکنش سریع از تاریخ
+ {{ verta($fromDate)->format('Y/n/j') }}
+ تا
+ تاریخ
+ {{ verta($toDate)->format('Y/n/j') }}
+ @endif
+
+ |
+
+
+ | کد یکتا |
+ کد پیگیری |
+ استان |
+ ادارات شهری |
+ موضوع گزارش |
+ نوع گزارش |
+ شماره تماس گیرنده |
+ وضعیت |
+ تاریخ اقدام |
+ توضیحات |
+ توضیحات کارشناس |
+
+
+
+
+ @foreach ($data as $item)
+
+ | {{ $item['id'] ?? '-' }} |
+ {{ $item['fk_RegisteredEventMessage'] ?? '-' }} |
+ {{ $item['province_fa'] ?? '-' }} |
+ {{ $item['edarate_shahri_name_fa'] ?? '-' }} |
+ {{ $item['Title'] ?? '-' }} |
+ {{ $item['FeatureTypeTitle'] ?? '-' }} |
+ {{ $item['MobileForSendEventSms'] ?? '-' }} |
+ {{ $item['status_fa'] ?? '-' }} |
+ {{ $item['rms_last_activity_fa'] ?? '-' }} |
+ {{ $item['rms_description'] ?? '-' }} |
+ {{ $item['supervisor_description'] ?? '-' }} |
+
+ @endforeach
+
+
+
+
+