NoNameGuy
/
geocomb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Districts code

master
Goncalo Bras 2017-06-17 20:42:41 +01:00
parent 05675f0c00
commit bf89b86378
4 changed files with 68 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
laravel/app/Http/Controllers/UserPageController.php
View File

@ -150,7 +150,8 @@ class UserPageController extends Controller
$obj_user = User::find($user_id);
$obj_user->password = Hash::make($request_data['password']);;
$obj_user->save();
return "ok";
return redirect(route('manageInfo'));
//return "ok";
}
else
{
@ -161,8 +162,9 @@ class UserPageController extends Controller
}
else
{
return redirect()->to('/');
//return redirect()->to('/');
}
}
public function postTripData(Request $request)

32
laravel/database/seeds/StationTableSeeder.php
View File

@ -14,14 +14,14 @@ class StationTableSeeder extends Seeder
public function run()
{
for ($i = 0; $i < DB::table('location')->count(); $i++) {
for ($j=0; $j < 5; $j++) {
//for ($j=0; $j < 5; $j++) {
$brand = $this->randomBrand();
$location = $this->generateRandomNumber(1,10);
$district = $this->generateRandomNumber(1,18);
$location = $i+1;//$this->generateRandomNumber(1,10);
$district = $this->associateDistrict($i+1);
$fuel_price = $this->generateRandomNumber(1,10);
$services = $this->generateRandomNumber(1,10);
$schedule = $this->generateRandomNumber(1,10);
}
//}
DB::table('station')->insert([
'name' => "a$i",
@ -38,6 +38,30 @@ class StationTableSeeder extends Seeder
}
}
public function associateDistrict($id)
{
$location = DB::table('location')->where('id', $id)->first();
$link = "http://maps.google.com/maps/api/geocode/json?address=$location->latitude,$location->longitude";
$data = file_get_contents($link);
$json = json_decode($data, true);
if(isset($json['results'][0]['address_components'][1]['long_name'])){
$districtString = $json['results'][0]['address_components'][1]['long_name'];
$districtName = trim(str_replace('district', '', $districtString)); //Distrito em texto
if($districtName=='Lisbon'){
$district = DB::table('district')->where('name', 'like', "Lisboa")->first();
}else{
$district = DB::table('district')->where('name', 'like', "%$districtName%")->first();
}
if(isset($district)){
return $district->id;
}else{
$districtId = DB::table('district')->insertGetId(['name'=>$districtName]);
return $districtId;
}
}return 1;
}
private function generateRandomNumber($min, $max)
{
return ($min + lcg_value()*(abs($max - $min)));

28
laravel/resources/views/landing_page.blade.php
View File

@ -40,25 +40,25 @@
</div>
<div class="col-sm-4">
<label><input type="radio" name="fuelType" value="diesel">Gasóleo</label><br>
<label><input type="radio" name="fuelType" value="diesel_simple">Gasóleo Simples</label><br>
<label><input type="radio" name="fuelType" value="diesel_colored">Gasóleo Colorido</label><br>
<label><input type="radio" name="fuelType" value="diesel_special">Gasóleo Especial</label><br>
<label><input type="checkbox" name="fuelType" value="diesel">Gasóleo</label><br>
<label><input type="checkbox" name="fuelType" value="diesel_simple">Gasóleo Simples</label><br>
<label><input type="checkbox" name="fuelType" value="diesel_colored">Gasóleo Colorido</label><br>
<label><input type="checkbox" name="fuelType" value="diesel_special">Gasóleo Especial</label><br>
<br><br>
<label><input type="radio" name="fuelType" value="petrol_95">Gasolina 95</label><br>
<label><input type="radio" name="fuelType" value="petrol_simple_95">Gasolina Simples 95</label><br>
<label><input type="radio" name="fuelType" value="petrol_special_95">Gasolina Especial 95</label><br>
<label><input type="checkbox" name="fuelType" value="petrol_95">Gasolina 95</label><br>
<label><input type="checkbox" name="fuelType" value="petrol_simple_95">Gasolina Simples 95</label><br>
<label><input type="checkbox" name="fuelType" value="petrol_special_95">Gasolina Especial 95</label><br>
<br><br>
</div>
<div class="col-sm-8">
<label><input type="radio" name="fuelType" value="gas_natural_compressed_kg">GNC KG</label><br>
<label><input type="radio" name="fuelType" value="gas_natural_compressed_m3">GNC M3</label><br>
<label><input type="radio" name="fuelType" value="gas_natural_liquified">GNL</label><br>
<label><input type="radio" name="fuelType" value="gpl">GPL</label><br>
<label><input type="checkbox" name="fuelType" value="gas_natural_compressed_kg">GNC KG</label><br>
<label><input type="checkbox" name="fuelType" value="gas_natural_compressed_m3">GNC M3</label><br>
<label><input type="checkbox" name="fuelType" value="gas_natural_liquified">GNL</label><br>
<label><input type="checkbox" name="fuelType" value="gpl">GPL</label><br>
<br><br>
<label><input type="radio" name="fuelType" value="petrol_98">Gasolina 98</label><br>
<label><input type="radio" name="fuelType" value="petrol_simple_98">Gasolina Simples 98</label><br>
<label><input type="radio" name="fuelType" value="petrol_special_98">Gasolina Especial 98</label><br>
<label><input type="checkbox" name="fuelType" value="petrol_98">Gasolina 98</label><br>
<label><input type="checkbox" name="fuelType" value="petrol_simple_98">Gasolina Simples 98</label><br>
<label><input type="checkbox" name="fuelType" value="petrol_special_98">Gasolina Especial 98</label><br>
<br><br>
</div>
</div>

22
laravel/resources/views/manageVehicles.blade.php
View File

@ -50,6 +50,28 @@
<div class="form-group">
<label for="fuel">Tipo de Combustível: </label>
<div class="col-sm-4">
<label><input type="checkbox" name="fuelType" value="diesel">Gasóleo</label><br>
<label><input type="checkbox" name="fuelType" value="diesel_simple">Gasóleo Simples</label><br>
<label><input type="checkbox" name="fuelType" value="diesel_colored">Gasóleo Colorido</label><br>
<label><input type="checkbox" name="fuelType" value="diesel_special">Gasóleo Especial</label><br>
<br><br>
<label><input type="checkbox" name="fuelType" value="petrol_95">Gasolina 95</label><br>
<label><input type="checkbox" name="fuelType" value="petrol_simple_95">Gasolina Simples 95</label><br>
<label><input type="checkbox" name="fuelType" value="petrol_special_95">Gasolina Especial 95</label><br>
<br><br>
</div>
<div class="col-sm-8">
<label><input type="checkbox" name="fuelType" value="gas_natural_compressed_kg">GNC KG</label><br>
<label><input type="checkbox" name="fuelType" value="gas_natural_compressed_m3">GNC M3</label><br>
<label><input type="checkbox" name="fuelType" value="gas_natural_liquified">GNL</label><br>
<label><input type="checkbox" name="fuelType" value="gpl">GPL</label><br>
<br><br>
<label><input type="checkbox" name="fuelType" value="petrol_98">Gasolina 98</label><br>
<label><input type="checkbox" name="fuelType" value="petrol_simple_98">Gasolina Simples 98</label><br>
<label><input type="checkbox" name="fuelType" value="petrol_special_98">Gasolina Especial 98</label><br>
<br><br>
</div>
<select class="form-control" id="txtFuelType" name="fuel">
@if(isset($fuelTypes))
@for($i=1;$i<count($fuelTypes); $i++)