RMS/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix code for blade and report

Browse Source
This commit is contained in:
joddyabott
2025-02-26 10:24:53 +03:30
parent b5b799ee90
commit 8c2491d380
5 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Exports/V3/RoadObservation/OperatorCartableReport.php
View File

@@ -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];
}

4
app/Exports/V3/RoadObservation/SupervisorCartableReport.php
View File

@@ -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];
}
}

2
app/Http/Controllers/V3/Dashboard/RoadObservationController.php
View File

@@ -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);
}

8
resources/views/v3/Reports/RoadObservation/OpratorCartableReport.blade.php
View File

@@ -21,20 +21,20 @@
<table>
<thead>
<tr>
<th colspan="9"
<th colspan="11"
style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;">
تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
</th>
</tr>
<tr>
<th colspan="9"
<th colspan="11"
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;">
</th>
</tr>
<tr>
<th colspan="9"
<th colspan="11"
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13;">
گزارش کارتابل ارزیابی واکنش سریع
گزارش کارتابل عملیات واکنش سریع
</th>
</tr>
<tr>

16
resources/views/v3/Reports/RoadObservation/SupervisorCartableReport.blade.php
View File

@@ -21,28 +21,20 @@
<table>
<thead>
<tr>
<th colspan="9"
<th colspan="11"
style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;">
تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
</th>
</tr>
<tr>
<th colspan="9"
<th colspan="11"
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;">
</th>
</tr>
<tr>
<th colspan="9"
<th colspan="11"
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13;">
@if ($fromDate == null)
گزارش کارتابل ارزیابی واکنش سریع
@else
گزارش کارتابل ارزیابی واکنش سریع از تاریخ
{{ verta($fromDate)->format('Y/n/j') }}
تا
تاریخ
{{ verta($toDate)->format('Y/n/j') }}
@endif
گزارش کارتابل ارزیابی واکنش سریع
</th>
</tr>