From eb9b8bfdd298461aaf65a02a161fa2104ad24a90 Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Mon, 27 Jan 2020 02:24:52 +0000
Subject: [PATCH] Fix bug for onestep edit when user selects another hub but
 does not select a new rider. #312

---
 templates/job-order/cmb.form.onestep.html.twig | 14 ++++++++++----
 templates/job-order/form.onestep.html.twig     | 15 ++++++++++-----
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/templates/job-order/cmb.form.onestep.html.twig b/templates/job-order/cmb.form.onestep.html.twig
index 822ee7f1..5fff6343 100644
--- a/templates/job-order/cmb.form.onestep.html.twig
+++ b/templates/job-order/cmb.form.onestep.html.twig
@@ -604,6 +604,8 @@
 
 $(function() {
     var form_in_process = false;
+    var selected_hub = '';
+    var selected_rider = '';
 
     // openstreet maps stuff
     // TODO: move this to a service
@@ -742,11 +744,11 @@ $(function() {
 
     $(function() {
         {% if mode in ['onestep-edit'] %}
-            var selected_hub = '{{ obj.getHub ? obj.getHub.getID: "" }}';
+            selected_hub = '{{ obj.getHub ? obj.getHub.getID: "" }}';
             $('#hub-field').val(selected_hub); 
         {% endif %}
         {% if mode in ['onestep'] %}
-            var selected_hub = '';
+            selected_hub = '';
         {% endif %}
 
         $('#hubs-table').on('click', 'tr', function() {
@@ -765,6 +767,10 @@ $(function() {
                 selected_hub = id;
                 $('#hub-field').val(selected_hub); 
 
+                // clear rider field
+                $('#rider-field').val('');
+                selected_rider = '';
+
                 // get riders of hub
                 // get hub riders ajax
                 // TODO: add latitude and longitude of delivery location to ajax request
@@ -801,11 +807,11 @@ $(function() {
 
     $(function() {
         {% if mode in ['onestep-edit'] %}
-            var selected_rider = '{{ obj.getRider ? obj.getRider.getID: "" }}';
+            selected_rider = '{{ obj.getRider ? obj.getRider.getID: "" }}';
             $('#rider-field').val(selected_rider);
         {% endif %}
         {% if mode in ['onestep'] %}
-            var selected_rider = '';
+            selected_rider = '';
         {% endif %}
         $('#rider-table').on('click', 'tr', function() {
             var id = $(this).data('id');
diff --git a/templates/job-order/form.onestep.html.twig b/templates/job-order/form.onestep.html.twig
index 4bef4efb..aee7ca87 100644
--- a/templates/job-order/form.onestep.html.twig
+++ b/templates/job-order/form.onestep.html.twig
@@ -600,6 +600,8 @@
 
 $(function() {
     var form_in_process = false;
+    var selected_hub = '';
+    var selected_rider = '';
 
     // openstreet maps stuff
     // TODO: move this to a service
@@ -633,7 +635,6 @@ $(function() {
 
     function selectPoint(lat, lng)
     {
-        alert('selectPoint');
         // clear markers
         markerLayerGroup.clearLayers();
         hubLayerGroup.clearLayers();
@@ -739,11 +740,11 @@ $(function() {
 
     $(function() {
         {% if mode in ['onestep-edit'] %}
-            var selected_hub = '{{ obj.getHub ? obj.getHub.getID: "" }}';
+            selected_hub = '{{ obj.getHub ? obj.getHub.getID: "" }}';
             $('#hub-field').val(selected_hub);
         {% endif %}
         {% if mode in ['onestep'] %}
-            var selected_hub = '';
+            selected_hub = '';
         {% endif %}
         $('#hubs-table').on('click', 'tr', function() {
             var id = $(this).data('id');
@@ -761,6 +762,10 @@ $(function() {
                 selected_hub = id;
                 $('#hub-field').val(selected_hub); 
 
+                // clear rider field
+                $('#rider-field').val('');
+                selected_rider = '';
+
                 // get riders of hub
                 // get hub riders ajax
                 // TODO: add latitude and longitude of delivery location to ajax request
@@ -797,11 +802,11 @@ $(function() {
 
     $(function() {
         {% if mode in ['onestep-edit'] %}
-            var selected_rider = '{{ obj.getRider ? obj.getRider.getID: "" }}';
+            selected_rider = '{{ obj.getRider ? obj.getRider.getID: "" }}';
             $('#rider-field').val(selected_rider);
         {% endif %}
         {% if mode in ['onestep'] %}
-            var selected_rider = '';
+            selected_rider = '';
         {% endif %}
         $('#rider-table').on('click', 'tr', function() {
             var id = $(this).data('id');