diff --git a/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php b/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php index 93aaf0cc..ddcc0fd3 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php @@ -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: ['*'], diff --git a/app/Services/Cartables/Mission/Report/ReportMachineService.php b/app/Services/Cartables/Mission/Report/ReportMachineService.php index 89ba239b..38bb4996 100644 --- a/app/Services/Cartables/Mission/Report/ReportMachineService.php +++ b/app/Services/Cartables/Mission/Report/ReportMachineService.php @@ -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, [ diff --git a/routes/v3.php b/routes/v3.php index 513440f1..6c67a1d0 100644 --- a/routes/v3.php +++ b/routes/v3.php @@ -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'); }); });