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

debug

Browse Source
This commit is contained in:
amirghasempoor
2025-02-09 14:35:54 +03:30
parent c131e466da
commit baf4b0502c
4 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Exports/V3/RoadPatrols/ProvinceActivity.php
View File

@@ -21,7 +21,7 @@ class ProvinceActivity implements FromView, WithEvents, ShouldAutoSize, WithDraw
$activities = $this->activities; $activities = $this->activities;
return view('v3.Reports.RoadPatrols.ProvinceActivity', [ return view('v3.Reports.RoadPatrols.ProvinceActivity', [
'activities' => $activities["activities"], 'activities' => $activities["data"],
'fromDate' => $activities["fromDate"], 'fromDate' => $activities["fromDate"],
'toDate' => $activities["toDate"] 'toDate' => $activities["toDate"]
]); ]);

12
app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php
View File

@@ -21,10 +21,7 @@ class RoadPatrolReportController extends Controller
use ApiResponse; use ApiResponse;
public function countryPatrolActivity(Request $request, RoadPatrolReportService $roadPatrolReportService): JsonResponse public function countryPatrolActivity(Request $request, RoadPatrolReportService $roadPatrolReportService): JsonResponse
{ {
$fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString(); $activities = $roadPatrolReportService->countryActivity($request);
$toDate = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
$activities = $roadPatrolReportService->countryActivity($fromDate, $toDate);
$provinces = Province::all(['id', 'name_fa']); $provinces = Province::all(['id', 'name_fa']);
@@ -37,13 +34,10 @@ class RoadPatrolReportController extends Controller
public function provincePatrolActivity(Request $request, RoadPatrolReportService $roadPatrolReportService): JsonResponse public function provincePatrolActivity(Request $request, RoadPatrolReportService $roadPatrolReportService): JsonResponse
{ {
$request->validate(["province_id" => "required",]); $request->validate(["province_id" => "required",]);
$fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString();
$toDate = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
$provinceId = $request->province_id;
$activities = $roadPatrolReportService->provinceActivity($fromDate, $toDate, $provinceId); $activities = $roadPatrolReportService->provinceActivity($request);
$edarateShahri = EdarateShahri::query()->where('province_id', '=', $provinceId)->get(['id', 'name_fa']); $edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
return $this->successResponse([ return $this->successResponse([
'activities' => $activities['data'], 'activities' => $activities['data'],

2
resources/views/v3/Reports/RoadPatrols/CountryActivity.blade.php
View File

@@ -27,7 +27,7 @@
</tr> </tr>
<tr> <tr>
<th colspan="8" <th colspan="8"
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13;"> style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
گزارش گشت راهداری و ترابری از تاریخ گزارش گشت راهداری و ترابری از تاریخ
{{ verta($fromDate)->format('Y/n/j') }} {{ verta($fromDate)->format('Y/n/j') }}
تا تا

2
resources/views/v3/Reports/RoadPatrols/ProvinceActivity.blade.php
View File

@@ -27,7 +27,7 @@
</tr> </tr>
<tr> <tr>
<th colspan="8" <th colspan="8"
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13;"> style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
گزارش گشت راهداری و ترابری از تاریخ گزارش گشت راهداری و ترابری از تاریخ
{{ verta($fromDate)->format('Y/n/j') }} {{ verta($fromDate)->format('Y/n/j') }}
تا تا