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

Fix bug on displaying cheapest stations

master
Goncalo Bras 2017-05-27 11:26:39 +01:00
parent 2892847e22
commit 0c1c8846d1
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
laravel/public/js/javascript.js
View File

@ -63,6 +63,7 @@ var js = $(document).ready(function(){
var fuelType=$("#landingFuelType>input[name='fuelType']").val();
var brand=$("#brand").val();
console.log("antes do ajax");
$.ajax({
url: "api/stations/"+district+"/"+brand+"/"+fuelType,
type: "GET",
@ -71,8 +72,7 @@ var js = $(document).ready(function(){
//data: data,
success: function(data) {
var d = JSON.parse(data);
console.log("success: "+d);
console.log("success: "+data["stations"]);
// return results;
},
@ -94,18 +94,30 @@ var js = $(document).ready(function(){
function getLocation() {
if($("#latitude").val()==="" || $("#longitude").val()===""){
if (navigator.geolocation) {
navigator.geolocation.getCurrentPosition(showPosition);
} else {
alert("Geolocation is not supported by this browser.");
}
if (($('#latitude').val()==='' || $('#longitude').val()==='') && localStorage.getItem("latitude")!==null && localStorage.getItem("longitude")!==null) {
$('#latitude').val(localStorage.getItem("latitude"));
$('#longitude').val(localStorage.getItem("longitude"));
}else{
if($("#latitude").val()==="" || $("#longitude").val()===""){
if (navigator.geolocation) {
navigator.geolocation.getCurrentPosition(showPosition);
} else {
alert("Geolocation is not supported by this browser.");
}
}
}
}
function showPosition(position) {
$("#latitude").val(position.coords.latitude);
$("#longitude").val(position.coords.longitude);
submitForm();
$("#latitude").val(position.coords.latitude);
$("#longitude").val(position.coords.longitude);
localStorage.setItem("latitude", position.coords.latitude);
localStorage.setItem("longitude", position.coords.longitude);
submitForm();
}
function submitForm(){
$("#landingHiddenSubmit").click();

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

@ -81,7 +81,7 @@
<button id="landingBack">Back</button>
</form>
<p>Mais baratas</p>
{{$stations}}
@endif

2
laravel/resources/views/user_page.blade.php
View File

@ -122,7 +122,7 @@
<button type="submit" class="btn btn-primary btn-lg">Adicionar</button>
<button type="button" class="btn btn-success btn-lg">Editar</button>
<button type="button" class="btn btn-danger btn-lg">Remover</button>
<button type="button" class="btn btn-danger btn-lg" formaction="{{--route('deletevehicle',$v->id)--}}">Remover</button>
</div>
</form>