From 79b758f547b8885c7524fe97d8ebb5876340255c Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Mon, 27 Jan 2020 06:33:03 +0000
Subject: [PATCH] Fix for rider icons not displaying in map. #312

---
 .../job-order/cmb.form.onestep.html.twig      | 39 ++++++++++---------
 templates/job-order/form.onestep.html.twig    | 36 ++++++++++-------
 2 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/templates/job-order/cmb.form.onestep.html.twig b/templates/job-order/cmb.form.onestep.html.twig
index cfa2e393..8fa8498c 100644
--- a/templates/job-order/cmb.form.onestep.html.twig
+++ b/templates/job-order/cmb.form.onestep.html.twig
@@ -743,14 +743,6 @@ $(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() {
             var id = $(this).data('id');
 
@@ -806,13 +798,6 @@ $(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() {
             var id = $(this).data('id');
 
@@ -830,12 +815,30 @@ $(function() {
     {% if mode in ['onestep-edit'] %}
         var lat = {{ obj.getCoordinates.getLatitude }};
         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);
 
-        // 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 %}
 
     {% if mode in ['update-processing', 'update-reassign-hub'] %}
diff --git a/templates/job-order/form.onestep.html.twig b/templates/job-order/form.onestep.html.twig
index 7b834830..40fef7d4 100644
--- a/templates/job-order/form.onestep.html.twig
+++ b/templates/job-order/form.onestep.html.twig
@@ -739,13 +739,6 @@ $(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() {
             var id = $(this).data('id');
 
@@ -801,13 +794,6 @@ $(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() {
             var id = $(this).data('id');
 
@@ -826,9 +812,29 @@ $(function() {
         var lat = {{ obj.getCoordinates.getLatitude }};
         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);
 
-        // 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 %}
 
     {% if mode in ['update-processing', 'update-reassign-hub'] %}