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

Reviewed-on: #22

app/Console/Commands/EncodePolyLineCommand.php

@@ -13,7 +13,7 @@ class EncodePolyLineCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'polyline:encode';
+    protected $signature = 'app:encode-poly-line-command';
 
     /**
      * The console command description.

app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php

@@ -7,11 +7,13 @@ use App\Facades\DataTable\DataTableFacade;
 use App\Http\Controllers\Controller;
 use App\Http\Traits\ApiResponse;
 use App\Models\City;
+use App\Models\CMMSMachine;
 use App\Models\Mission;
 use App\Models\Province;
 use App\Services\Cartables\Mission\Report\ReportMachineService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 use Maatwebsite\Excel\Facades\Excel;
 use PhpOffice\PhpSpreadsheet\Exception;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
@@ -43,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) {
@@ -100,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: ['*'],
@@ -147,4 +149,33 @@ class ReportMachineController extends Controller
 //                ->get(['id', 'name_fa'])
         ]);
     }
+
+    public function machineTypeDetailsReport(Request $request)
+    {
+        $machineIds = CMMSMachine::query()->where('car_type', '=', $request->query('car_type'))->pluck('machine_id');
+        return DataTableFacade::run(
+        Mission::query()->whereIn('machine_id', $machineIds),
+        $request,
+        allowedFilters: ['*'],
+        allowedSortings: ['*'],
+        allowedSelects: [
+            'id', 'province_id', 'province_name', 'city_id', 'city_name',
+            'end_km', 'km', 'driver_name', 'state_name', 'station_name'
+        ]
+    );
+    }
+
+    public function machineDriverDetailsReport(Request $request, int $driver_id)
+    {
+        return DataTableFacade::run(
+            Mission::query()->where('driver_id', '=', $driver_id),
+            $request,
+            allowedFilters: ['*'],
+            allowedSortings: ['*'],
+            allowedSelects: [
+                'id', 'province_id', 'province_name', 'city_id', 'city_name',
+                'end_km', 'km', 'driver_name', 'state_id', 'station_name'
+            ]
+        );
+    }
 }

app/Http/Requests/V3/Mission/Violation/UpdateRequest.php

@@ -34,7 +34,7 @@ class UpdateRequest extends FormRequest
     {
         return [
             function (Validator $validator) {
-                if (strtotime($this->enter_time) < strtotime($this->violation->exit_time)) {
+                if (strtotime($this->violation->exit_time) < strtotime($this->enter_time)) {
                     $validator->errors()->add(
                         'time',
                         'زمان پایان ماموریت باید بعد از زمان شروع ماموریت باشد.'

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, [
@@ -83,7 +83,7 @@ class ReportMachineService
                     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 m.start_time >= :from AND m.finish_time <= :to AND province_id = :province_id
+                    WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to AND m.province_id = :province_id
                     GROUP BY cm.car_type;";
 
         return DB::select($sql, [

routes/v3.php

@@ -571,10 +571,16 @@ 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('/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');
             });
     });