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

Merge pull request 'fix route' (#22) from feature/MachineTypesDetails into develop

Browse Source 
Reviewed-on: #22
This commit was merged in pull request #22.
This commit is contained in:
amirghasempoor
2026-06-14 08:09:14 +00:00
parent 5edb061a24 75c649c48e
commit ca51f65da4
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,7 +45,7 @@ class ReportMachineController extends Controller
public function provinceMachinesActivity(Request $request, ReportMachineService $reportMachineService): JsonResponse
{
return $this->successResponse([
'activities' => $reportMachineService->countryMachinesActivity($request),
'activities' => $reportMachineService->provinceMachinesActivity($request),
// 'city' => City::query()
// ->where('province_id', $request->province_id)
// ->where(function ($query) {
@@ -102,10 +102,10 @@ class ReportMachineController extends Controller
]);
}
public function machineDetailsReport(Request $request)
public function machineDetailsReport(Request $request, int $machine_id)
{
return DataTableFacade::run(
Mission::query()->where('machine_id', '=', $request->query('machine_id')),
Mission::query()->where('machine_id', '=', $machine_id),
$request,
allowedFilters: ['*'],
allowedSortings: ['*'],
@@ -165,10 +165,10 @@ class ReportMachineController extends Controller
);
}
public function machineDriverDetailsReport(Request $request)
public function machineDriverDetailsReport(Request $request, int $driver_id)
{
return DataTableFacade::run(
Mission::query()->where('driver_id', '=', $request->query('driver_id')),
Mission::query()->where('driver_id', '=', $driver_id),
$request,
allowedFilters: ['*'],
allowedSortings: ['*'],

4
app/Services/Cartables/Mission/Report/ReportMachineService.php
View File

@@ -38,10 +38,10 @@ class ReportMachineService
$to = $request->date_to ? Carbon::parse($request->date_to)->endOfDay() : today()->endOfDay();
$province = $request->province_id;
$sql = "SELECT machine_id, machine_code, cm.car_name, COUNT(*) AS missions, SUM(m.end_km - m.km) AS func
$sql = "SELECT m.machine_id, m.machine_code, cm.car_name, COUNT(*) AS missions, SUM(m.end_km - m.km) AS func
FROM missions m
JOIN cmms_machines cm ON cm.id = m.machine_id
WHERE m.state_id = 4 AND start_time >= :from AND finish_time <= :to AND province_id = :province_id
WHERE m.state_id = 4 AND start_time >= :from AND finish_time <= :to AND m.province_id = :province_id
GROUP BY machine_id;";
return DB::select($sql, [

8
routes/v3.php
View File

@@ -571,11 +571,15 @@ Route::prefix('missions')
Route::get('/province_machines_activity', 'provinceMachinesActivity')->name('provinceMachinesActivity');
Route::get('/province_machines_activity_excel', 'provinceMachinesActivityExcel')->name('provinceMachinesActivityExcel');
Route::get('/country_machine_types_activity', 'countryMachineTypesActivity')->name('countryMachineTypesActivity');
Route::get('/country_machine_types_activity_excel', 'countryMachineTypesActivityExcel')->name('countryMachineTypesActivityExcel');
Route::get('/province_machine_types_activity', 'provinceMachineTypesActivity')->name('provinceMachineTypesActivity');
Route::get('/machine_details_report', 'machineDetailsReport')->name('machineDetailsReport');
Route::get('/province_machine_types_activity_excel', 'provinceMachineTypesActivityExcel')->name('provinceMachineTypesActivityExcel');
Route::get('/country_machine_drivers_activity', 'countryMachineDriversActivity')->name('countryMachineDriversActivity');
Route::get('/country_machine_drivers_activity_excel', 'countryMachineDriversActivityExcel')->name('countryMachineDriversActivityExcel');
Route::get('/province_machine_drivers_activity', 'provinceMachineDriversActivity')->name('provinceMachineDriversActivity');
Route::get('/machine_driver_details_report', 'machineDriverDetailsReport')->name('machineDriverDetailsReport');
Route::get('/province_machine_drivers_activity_excel', 'provinceMachineDriversActivityExcel')->name('provinceMachineDriversActivityExcel');
Route::get('/machine_details_report/{machine_id}', 'machineDetailsReport')->name('machineDetailsReport');
Route::get('/machine_driver_details_report/{driver_id}', 'machineDriverDetailsReport')->name('machineDriverDetailsReport');
Route::get('/machine_type_details_report', ' machineTypeDetailsReport')->name('machineTypeDetailsReport');
});
});