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

Planear rota melhorada

master
NoNameGuy 2017-09-04 00:56:23 +01:00
parent a8b8f884a4
commit 8cacfa2543
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -288,9 +288,7 @@ var array2;
var consumption = $("#upConsumption").val();
//original logic
//(autonomykm==='' && autonomyl==='')||(autonomykm!=='' && autonomyl!=='' || consumption!=='') || (autonomyl!=='' && autonomykm!=='' && consumption==='') || (autonomyl!=='' && autonomyl==='' && consumption!=='')
if( (autonomykm==='' && autonomyl==='') || (autonomyl!=='' && consumption==='') || (autonomykm!=='' && autonomyl!=='') ){
alert("Preencha apenas a autonomia em km ou a autonomia em litros e o consumo");
}else{
var coordinates = getCoordinates();
/*console.table(coordinates.origin);
console.table(coordinates.destination);*/
@ -347,7 +345,7 @@ var array2;
});
}
});
}

34
laravel/resources/views/planRoute.blade.php
View File

@ -67,35 +67,41 @@
</div>
<label>Autonomia (km):<br><input type="number" name="upAutonomyKm" id="upAutonomyKm"></label><br>
<br>
<button id="upSearch" class="btn btn-primary btn-lg">Pesquisar</button>
<button id="cleanSearch" class="btn btn-danger btn-lg">Limpar Pesquisa</button><br><br>
<a id="btnFeelingLucky" type="button" class="btn btn-primary btn-lg" <!--href="{{route('feelingLucky')}}"-->Pesquisa Automática</a>
<form id="formEmailLink" method="post" action="{{route('sendRouteEmail')}}">
{{csrf_field()}}
<input type="hidden" id="routeLink" name="link">
</form>
<button id="sendRouteEmail" type="button" class="btn btn-info btn-lg" >Envio P/ Email</button>
</div>
<div class="col-lg-6">
<!--<div class="col-lg-6">
<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" value="@if(isset($vehicleData)){{$vehicleData->consumption}}@endif"></label>
</div>
</div>-->
</div>
</div>
<div class="col-lg-6 center">
<!-- <div class="col-lg-6 center">
<br>
<button id="upSearch" class="btn btn-primary btn-lg">Pesquisar</button>
<button id="cleanSearch" class="btn btn-danger btn-lg">Limpar Pesquisa</button>
<a id="btnFeelingLucky" type="button" class="btn btn-info btn-lg" <!--href="{{route('feelingLucky')}}"-->>"Estou com sorte"</a>
</div>
<form id="formEmailLink" method="post" action="{{route('sendRouteEmail')}}">
{{csrf_field()}}
<input type="hidden" id="routeLink" name="link">
</form>
<button id="sendRouteEmail" type="button" class="btn btn-info btn-lg" >Enviar rota para o meu Email</button>
<button id="cleanSearch" class="btn btn-danger btn-lg">Limpar Pesquisa</button><br><br>
</div>-->
</div>
</div>