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

Fix for rider icons not displaying in map. #312

Browse source
This commit is contained in:
Korina Cordero 2020-01-27 06:33:03 +00:00
parent 655ead7739
commit 79b758f547
2 changed files with 42 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
templates/job-order/cmb.form.onestep.html.twig
View file

@ -743,14 +743,6 @@ $(function() {
}); });
$(function() { $(function() {
{% if mode in ['onestep-edit'] %}
selected_hub = '{{ obj.getHub ? obj.getHub.getID: "" }}';
$('#hub-field').val(selected_hub);
{% endif %}
{% if mode in ['onestep'] %}
selected_hub = '';
{% endif %}
$('#hubs-table').on('click', 'tr', function() { $('#hubs-table').on('click', 'tr', function() {
var id = $(this).data('id'); var id = $(this).data('id');
@ -806,13 +798,6 @@ $(function() {
}); });
$(function() { $(function() {
{% if mode in ['onestep-edit'] %}
selected_rider = '{{ obj.getRider ? obj.getRider.getID: "" }}';
$('#rider-field').val(selected_rider);
{% endif %}
{% if mode in ['onestep'] %}
selected_rider = '';
{% endif %}
$('#rider-table').on('click', 'tr', function() { $('#rider-table').on('click', 'tr', function() {
var id = $(this).data('id'); var id = $(this).data('id');
@ -830,12 +815,30 @@ $(function() {
{% if mode in ['onestep-edit'] %} {% if mode in ['onestep-edit'] %}
var lat = {{ obj.getCoordinates.getLatitude }}; var lat = {{ obj.getCoordinates.getLatitude }};
var lng = {{ obj.getCoordinates.getLongitude }}; var lng = {{ obj.getCoordinates.getLongitude }};
var hub = {{ obj.getHub.getID }};
var rider = {{ obj.getRider.getID }}; selected_hub = '{{ obj.getHub ? obj.getHub.getID: "" }}';
$('#hub-field').val(selected_hub);
selected_rider = '{{ obj.getRider ? obj.getRider.getID: "" }}';
$('#rider-field').val(selected_rider);
selectPoint(lat, lng); selectPoint(lat, lng);
// TODO: find a way to highlight the set hub // need to put selected rider on map. selected_hub is already on map because of selectPoint
riderLayerGroup.clearLayers();
$.getJSON("{{ url('hub_riders') }}?id=" + selected_hub, function(data) {
var riders = data['riders'];
for (i in riders) {
var rider = riders[i];
if (selected_rider == rider['id']) {
var rider_lat = rider['location'][0];
var rider_lng = rider['location'][1];
var rider_marker = L.marker([rider_lat, rider_lng], { icon: icon_rider_available });
riderLayerGroup.addLayer(rider_marker);
}
}
});
{% endif %} {% endif %}
{% if mode in ['update-processing', 'update-reassign-hub'] %} {% if mode in ['update-processing', 'update-reassign-hub'] %}

36
templates/job-order/form.onestep.html.twig
View file

@ -739,13 +739,6 @@ $(function() {
}); });
$(function() { $(function() {
{% if mode in ['onestep-edit'] %}
selected_hub = '{{ obj.getHub ? obj.getHub.getID: "" }}';
$('#hub-field').val(selected_hub);
{% endif %}
{% if mode in ['onestep'] %}
selected_hub = '';
{% endif %}
$('#hubs-table').on('click', 'tr', function() { $('#hubs-table').on('click', 'tr', function() {
var id = $(this).data('id'); var id = $(this).data('id');
@ -801,13 +794,6 @@ $(function() {
}); });
$(function() { $(function() {
{% if mode in ['onestep-edit'] %}
selected_rider = '{{ obj.getRider ? obj.getRider.getID: "" }}';
$('#rider-field').val(selected_rider);
{% endif %}
{% if mode in ['onestep'] %}
selected_rider = '';
{% endif %}
$('#rider-table').on('click', 'tr', function() { $('#rider-table').on('click', 'tr', function() {
var id = $(this).data('id'); var id = $(this).data('id');
@ -826,9 +812,29 @@ $(function() {
var lat = {{ obj.getCoordinates.getLatitude }}; var lat = {{ obj.getCoordinates.getLatitude }};
var lng = {{ obj.getCoordinates.getLongitude }}; var lng = {{ obj.getCoordinates.getLongitude }};
selected_hub = '{{ obj.getHub ? obj.getHub.getID: "" }}';
$('#hub-field').val(selected_hub);
selected_rider = '{{ obj.getRider ? obj.getRider.getID: "" }}';
$('#rider-field').val(selected_rider);
selectPoint(lat, lng); selectPoint(lat, lng);
// TODO: find a way to highlight the set hub // need to put selected rider on map. selected_hub is already on map because of selectPoint
riderLayerGroup.clearLayers();
$.getJSON("{{ url('hub_riders') }}?id=" + selected_hub, function(data) {
var riders = data['riders'];
for (i in riders) {
var rider = riders[i];
if (selected_rider == rider['id']) {
var rider_lat = rider['location'][0];
var rider_lng = rider['location'][1];
var rider_marker = L.marker([rider_lat, rider_lng], { icon: icon_rider_available });
riderLayerGroup.addLayer(rider_marker);
}
}
});
{% endif %} {% endif %}
{% if mode in ['update-processing', 'update-reassign-hub'] %} {% if mode in ['update-processing', 'update-reassign-hub'] %}