Selected Vehicles

laravel/app/Http/Controllers/UserPageController.php

@@ -25,11 +25,14 @@ class UserPageController extends Controller
         $vehicles = Vehicle::join('vehicles', 'vehicle.id', 'vehicles.vehicle_id')
             ->join('users', 'users.id', 'vehicles.user_id')
             ->where('users.email', $user->email)
+            ->select('vehicle.id as vehicleId', 'brand', 'model')
             ->get();
 
-        $planRoute = true;
+        $vehicleData = null;
+        $vehicleData = Vehicle::where('id', $request->upSelectVehicle)
+          ->first();
 
-    	return view('planRoute', ['name'=>$user->name, 'vehicles' => $vehicles, 'planRoute' => $planRoute]);
+    	return view('planRoute', ['name'=>$user->name, 'vehicles' => $vehicles, 'vehicleData' => $vehicleData]);
     }
 
     public function add(Request $request)
@@ -49,7 +52,7 @@ class UserPageController extends Controller
           User::where('id', Auth::user()->id)->update(['preferredVehicle' => $vehiclesId->id]);
         }
 
-        return redirect('userpage');
+        return redirect(route('manageVehicles'));
 
     }
 
@@ -65,8 +68,9 @@ class UserPageController extends Controller
       $selectedVehicle=Vehicle::where('id', $id)->first();
 
       $preferredVehicle = User::where('id', Auth::user()->id)->get();
+      $fuelTypes = DB::select('DESCRIBE fuel_price');
 
-      return view('manageVehicles', ['name'=>$user->name, 'selectedVehicle' => $selectedVehicle, 'vehicles' => $vehicles]);
+      return view('manageVehicles', ['name'=>$user->name, 'selectedVehicle' => $selectedVehicle, 'vehicles' => $vehicles, 'fuelTypes'=>$fuelTypes]);
 
     }
 
@@ -84,6 +88,7 @@ class UserPageController extends Controller
       Vehicles::where('user_id', Auth::user()->id)
         ->where('vehicle_id', $id)
         ->delete();
+
       return redirect(route('manageVehicles'));
     }
 
@@ -245,8 +250,9 @@ class UserPageController extends Controller
             ->where('users.email', $user->email)
             ->get();
 
+        $fuelTypes = DB::select('DESCRIBE fuel_price');
 
-          return view('manageVehicles', ['name'=>$user->name, 'vehicles' => $vehicles]);
+        return view('manageVehicles', ['name'=>$user->name, 'vehicles' => $vehicles,'fuelTypes' => $fuelTypes]);
 
       }
 

laravel/resources/views/manageVehicles.blade.php

@@ -51,8 +51,13 @@
 
       <div class="form-group">
         <label for="fuel">Tipo de Combustível: </label>
-        <input class="form-control" id="txtFuelType" name="fuel" type="text"
-        value="@if(isset($selectedVehicle)){{$selectedVehicle->fuel}}@endif">
+        <select class="form-control" id="txtFuelType" name="fuel">
+          @if(isset($fuelTypes))
+            @for($i=1;$i<count($fuelTypes); $i++)
+              <option value="{{$fuelTypes[$i]->Field}}" @if(isset($selectedVehicle) && $selectedVehicle->fuel==$fuelTypes[$i]->Field) selected @endif>{{$fuelTypes[$i]->Field}}</option>
+            @endfor
+          @endif
+        </select>
       </div>
 
       <div class="form-group">

laravel/resources/views/planRoute.blade.php

@@ -28,7 +28,16 @@
 -->
   <div class="col-sm-6 text-left">
 
-      {{csrf_field()}}
+      <form method="post" action="{{route('selectVehicle')}}">
+        {{csrf_field()}}
+        <select name="upSelectVehicle" onchange="this.form.submit()" >
+          @if(isset($vehicles))
+            @foreach($vehicles as $vehicle)
+              <option value="{{$vehicle->vehicleId}}" @if(isset($vehicleData) && $vehicle->vehicleId==$vehicleData->id ) selected @endif>{{$vehicle->brand}} {{$vehicle->model}}</option>
+            @endforeach
+          @endif
+        </select>
+      </form>
     <div class="form-group">
       <label for="inputdefault">Inicio: </label>
       <input class="form-control" id="upOrigin" name="upOrigin" type="text">
@@ -39,19 +48,13 @@
       <input class="form-control" id="upDestination" name="upDestination" type="text">
     </div>
 
-    <div class="dropdown">
-      <button class="btn btn-default dropdown-toggle" type="button" id="menu1" data-toggle="dropdown">Veiculos
-      <span class="caret"></span></button>
-      <ul class="dropdown-menu" role="menu" aria-labelledby="menu1">
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="#">HTML</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="#">CSS</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="#">JavaScript</a></li>
-      </ul>
+
+
     </div>
-    <input type="checkbox" name="highway" id="upHighway">Autoestrada</input>
     <label>Autonomia (km):<input type="number" name="upAutonomyKm" id="upAutonomyKm"></label><br>
+    <p>Ou</p>
     <label>Autonomia (l):<input type="number" name="upAutonomyL" id="upAutonomyL"></label>
-    <label>Consumo (l/km):<input type="number" name="upConsumption" id="upConsumption"></label>
+    <label>Consumo (l/km):<input type="number" name="upConsumption" id="upConsumption" value="@if(isset($vehicleData)){{$vehicleData->consumption}}@endif"></label>
 
 <br><br>
     <div class="center">

laravel/routes/web.php

@@ -62,6 +62,7 @@ Route::group(['middleware' => 'auth'], function () {
   Route::get('/userpage/vehicles', 'UserPageController@getVehicles')->name('manageVehicles');
   Route::get('/userpage/info', 'UserPageController@getInfo')->name('manageInfo');
   Route::get('/userpage/vehicles/{id}', 'UserPageController@removeVehicle')->name('removeVehicle');
+  Route::post('/userpage', 'UserPageController@index')->name('selectVehicle');
 });
 
 Route::post('/showGpsCoordinates', 'LandingController@index');