diff --git a/app/Exports/V3/RoadObservation/OperatorCartableReport.php b/app/Exports/V3/RoadObservation/OperatorCartableReport.php
index 7dca86d8..6285c700 100644
--- a/app/Exports/V3/RoadObservation/OperatorCartableReport.php
+++ b/app/Exports/V3/RoadObservation/OperatorCartableReport.php
@@ -21,13 +21,9 @@ class OperatorCartableReport implements FromView, ShouldAutoSize, WithEvents, Wi
public function view(): View
{
- $data = $this->data;
-
return view('v3.Reports.RoadObservation.OperatorCartableReport', [
'data' => $this->data,
- 'fromDate' => $this->data['fromDate'] ?? null,
- 'toDate' => $this->data['toDate'] ?? null
- ]);
+ ]);
}
public function registerEvents(): array
@@ -67,7 +63,7 @@ class OperatorCartableReport implements FromView, ShouldAutoSize, WithEvents, Wi
$drawing2->setHeight(50);
$drawing2->setOffsetX(5);
$drawing2->setOffsetY(5);
- $drawing2->setCoordinates('q1');
+ $drawing2->setCoordinates('K1');
return [$drawing, $drawing2];
}
diff --git a/app/Exports/V3/RoadObservation/SupervisorCartableReport.php b/app/Exports/V3/RoadObservation/SupervisorCartableReport.php
index 3ecc88f8..4aa2b072 100644
--- a/app/Exports/V3/RoadObservation/SupervisorCartableReport.php
+++ b/app/Exports/V3/RoadObservation/SupervisorCartableReport.php
@@ -23,8 +23,6 @@ class SupervisorCartableReport implements FromView, WithEvents, ShouldAutoSize,
return view('v3.Reports.RoadObservation.SupervisorCartableReport', [
'data' => $this->data,
- 'fromDate' => $this->data['fromDate'] ?? null,
- 'toDate' => $this->data['toDate'] ?? null
]);
}
@@ -65,7 +63,7 @@ class SupervisorCartableReport implements FromView, WithEvents, ShouldAutoSize,
$drawing2->setHeight(50);
$drawing2->setOffsetX(5);
$drawing2->setOffsetY(5);
- $drawing2->setCoordinates('q1');
+ $drawing2->setCoordinates('K1');
return [$drawing, $drawing2];
}
}
diff --git a/app/Http/Controllers/V3/Dashboard/RoadObservationController.php b/app/Http/Controllers/V3/Dashboard/RoadObservationController.php
index ff534f53..c8a52bdc 100644
--- a/app/Http/Controllers/V3/Dashboard/RoadObservationController.php
+++ b/app/Http/Controllers/V3/Dashboard/RoadObservationController.php
@@ -56,7 +56,7 @@ class RoadObservationController extends Controller
public function supervisorCartableReport(Request $request, RoadObservationTableService $roadObservationTableService): BinaryFileResponse
{
$name = 'گزارش از کارتابل ارزیابی واکنش سریع '. verta()->now()->format('Y-m-d H:i') . '.xlsx';
- $data = $roadObservationTableService->supervisorCartableIndex($request, true);
+ $data = $roadObservationTableService->supervisorCartableIndex($request);
return Excel::download(new SupervisorCartableReport($data['data']), $name);
}
diff --git a/resources/views/v3/Reports/RoadObservation/OpratorCartableReport.blade.php b/resources/views/v3/Reports/RoadObservation/OpratorCartableReport.blade.php
index 4c308f98..e15d1d53 100644
--- a/resources/views/v3/Reports/RoadObservation/OpratorCartableReport.blade.php
+++ b/resources/views/v3/Reports/RoadObservation/OpratorCartableReport.blade.php
@@ -21,20 +21,20 @@
- |
تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
|
- |
|
- |
- گزارش کارتابل ارزیابی واکنش سریع
+ گزارش کارتابل عملیات واکنش سریع
|
diff --git a/resources/views/v3/Reports/RoadObservation/SupervisorCartableReport.blade.php b/resources/views/v3/Reports/RoadObservation/SupervisorCartableReport.blade.php
index 4c04abfd..2ebaab38 100644
--- a/resources/views/v3/Reports/RoadObservation/SupervisorCartableReport.blade.php
+++ b/resources/views/v3/Reports/RoadObservation/SupervisorCartableReport.blade.php
@@ -21,28 +21,20 @@
- |
تاریخ دریافت گزارش: {{ 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
+ گزارش کارتابل ارزیابی واکنش سریع
|