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

fix the command

Browse Source
This commit is contained in:
amirghasempoor
2026-06-14 10:05:13 +03:30
parent e7ced6267d
commit 0b7b22ff87
5 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php
View File

@@ -109,7 +109,7 @@ class ReportMachineController extends Controller
allowedSortings: ['*'],
allowedSelects: [
'id', 'province_id', 'province_name', 'city_id', 'city_name',
'end_km', 'km', 'driver_name', 'state_name', 'station_name'
'end_km', 'km', 'driver_name', 'state_id', 'station_name'
]
);
}
@@ -125,4 +125,26 @@ class ReportMachineController extends Controller
return Excel::download(new machineReport($data), $name);
}
public function countryMachineDriversActivity(Request $request, ReportMachineService $reportMachineService)
{
return $this->successResponse([
'activities' => $reportMachineService->countryMachineDriversActivity($request),
// 'provinces' => Province::all(['id', 'name_fa']),
]);
}
public function provinceMachineDriversActivity(Request $request, ReportMachineService $reportMachineService)
{
return $this->successResponse([
'activities' => $reportMachineService->provinceMachineDriversActivity($request),
// 'city' => City::query()
// ->where('province_id', $request->province_id)
// ->where(function ($query) {
// $query->where('type_id', 1)
// ->orWhereIn('name_fa', ['اداره ماشين‌آلات', 'اداره نقلیه']);
// })
// ->get(['id', 'name_fa'])
]);
}
}