rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Merge branch '11-fix-select-a-vehicle-in-job-order' into 'master'

Browse source 
Resolve "Fix "Select a vehicle" in job order"

Closes #11

See merge request jankstudio/resq!9
This commit is contained in:
Ramon Gutierrez 2018-02-17 09:21:49 +00:00
commit bf42224f00
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
templates/job-order/form.html.twig
View file

@ -647,6 +647,9 @@ $(function() {
// check if we need to set map
var latlng = new google.maps.LatLng({{ obj.getCoordinates.getLatitude }}, {{ obj.getCoordinates.getLongitude }});
selectPoint(map, latlng);
// remove placeholder text
$("[data-vehicle-field='1']").prop('placeholder', '');
{% endif %}
{% if mode == 'update-processing' %}
@ -815,8 +818,8 @@ $(function() {
if (typeof vdata.battery !== 'undefined') {
$("#current-battery").val(vdata.battery.mfg_name + " " + vdata.battery.model_name + " " + vdata.battery.size_name + " (" + vdata.battery.prod_code + ")");
$("#warranty-code").val(vdata.battery.warranty_code).prop('placeholder', '');
$("#warranty-expiration").val(vdata.battery.warranty_expiration).prop('placeholder', '');
$("#warranty-code").val(vdata.battery.warranty_code);
$("#warranty-expiration").val(vdata.battery.warranty_expiration);
} else {
$("#current-battery, #warranty-code, #warranty-expiration").val("No current battery").css('color', '#f4516c');
}