diff --git a/app/Console/Commands/EncodePolyLineCommand.php b/app/Console/Commands/EncodePolyLineCommand.php index 7eb615f1..4dd32435 100644 --- a/app/Console/Commands/EncodePolyLineCommand.php +++ b/app/Console/Commands/EncodePolyLineCommand.php @@ -2,6 +2,7 @@ namespace App\Console\Commands; +use App\Models\Mission; use App\Services\PolylineEncoder; use Illuminate\Console\Command; @@ -24,8 +25,15 @@ class EncodePolyLineCommand extends Command /** * Execute the console command. */ - public function handle(PolylineEncoder $polylineEncoder) + public function handle(PolylineEncoder $polylineEncoder): void { + Mission::query()->whereNotNull('area')->each(function ($mission) use ($polylineEncoder) { + $encodedValue = $polylineEncoder->encodePolyLine($mission, lng_lat_format:true); + $mission->update([ + 'encoded_route' => $encodedValue, + ]); + }); + $this->info("updated successfully"); } } diff --git a/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php b/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php index 67b40e81..e9d1e5c2 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php @@ -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', + 'end_km', 'km', 'driver_name', 'state_name', 'station_name' ] ); } diff --git a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php index ab69b445..74dd434e 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php @@ -41,7 +41,7 @@ class RequestPortalController extends Controller return response()->json($requestPortalService->datatable($request)); } - public function violations(Request $request): JsonResponse + public function violations(Request $request): array { $query = MissionViolation::query()->where([ ['status', '=', MissionViolationStatus::BEDON_EGHDAM->value], diff --git a/routes/v3.php b/routes/v3.php index ff56530e..d4c2ef71 100644 --- a/routes/v3.php +++ b/routes/v3.php @@ -497,7 +497,7 @@ Route::prefix('missions') Route::get('/', 'index')->name('index'); Route::get('/violations', 'violations')->name('violations'); Route::post('/', 'store')->name('store'); - Route::post('/clarifyUnauthorizedExit/{violation}','clarifyUnauthorizedExit')->name('clarifyUnauthorizedExit'); + Route::post('/clarify_unauthorized_exit/{violation}','clarifyUnauthorizedExit')->name('clarifyUnauthorizedExit'); Route::post('/continue/{mission}','continueMission')->name('continueMission'); Route::get('/{mission}', 'show')->name('show'); Route::post('/{mission}', 'update')->name('update');