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

Fix bug for onestep edit when user selects another hub but does not select a new rider. #312

Browse source
This commit is contained in:
Korina Cordero 2020-01-27 02:24:52 +00:00
parent adc6cc8c80
commit eb9b8bfdd2
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -604,6 +604,8 @@
$(function() { $(function() {
var form_in_process = false; var form_in_process = false;
var selected_hub = '';
var selected_rider = '';
// openstreet maps stuff // openstreet maps stuff
// TODO: move this to a service // TODO: move this to a service
@ -742,11 +744,11 @@ $(function() {
$(function() { $(function() {
{% if mode in ['onestep-edit'] %} {% 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); $('#hub-field').val(selected_hub);
{% endif %} {% endif %}
{% if mode in ['onestep'] %} {% if mode in ['onestep'] %}
var selected_hub = ''; selected_hub = '';
{% endif %} {% endif %}
$('#hubs-table').on('click', 'tr', function() { $('#hubs-table').on('click', 'tr', function() {
@ -765,6 +767,10 @@ $(function() {
selected_hub = id; selected_hub = id;
$('#hub-field').val(selected_hub); $('#hub-field').val(selected_hub);
// clear rider field
$('#rider-field').val('');
selected_rider = '';
// get riders of hub // get riders of hub
// get hub riders ajax // get hub riders ajax
// TODO: add latitude and longitude of delivery location to ajax request // TODO: add latitude and longitude of delivery location to ajax request
@ -801,11 +807,11 @@ $(function() {
$(function() { $(function() {
{% if mode in ['onestep-edit'] %} {% 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); $('#rider-field').val(selected_rider);
{% endif %} {% endif %}
{% if mode in ['onestep'] %} {% if mode in ['onestep'] %}
var selected_rider = ''; selected_rider = '';
{% endif %} {% endif %}
$('#rider-table').on('click', 'tr', function() { $('#rider-table').on('click', 'tr', function() {
var id = $(this).data('id'); var id = $(this).data('id');

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

@ -600,6 +600,8 @@
$(function() { $(function() {
var form_in_process = false; var form_in_process = false;
var selected_hub = '';
var selected_rider = '';
// openstreet maps stuff // openstreet maps stuff
// TODO: move this to a service // TODO: move this to a service
@ -633,7 +635,6 @@ $(function() {
function selectPoint(lat, lng) function selectPoint(lat, lng)
{ {
alert('selectPoint');
// clear markers // clear markers
markerLayerGroup.clearLayers(); markerLayerGroup.clearLayers();
hubLayerGroup.clearLayers(); hubLayerGroup.clearLayers();
@ -739,11 +740,11 @@ $(function() {
$(function() { $(function() {
{% if mode in ['onestep-edit'] %} {% 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); $('#hub-field').val(selected_hub);
{% endif %} {% endif %}
{% if mode in ['onestep'] %} {% if mode in ['onestep'] %}
var selected_hub = ''; selected_hub = '';
{% endif %} {% endif %}
$('#hubs-table').on('click', 'tr', function() { $('#hubs-table').on('click', 'tr', function() {
var id = $(this).data('id'); var id = $(this).data('id');
@ -761,6 +762,10 @@ $(function() {
selected_hub = id; selected_hub = id;
$('#hub-field').val(selected_hub); $('#hub-field').val(selected_hub);
// clear rider field
$('#rider-field').val('');
selected_rider = '';
// get riders of hub // get riders of hub
// get hub riders ajax // get hub riders ajax
// TODO: add latitude and longitude of delivery location to ajax request // TODO: add latitude and longitude of delivery location to ajax request
@ -797,11 +802,11 @@ $(function() {
$(function() { $(function() {
{% if mode in ['onestep-edit'] %} {% 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); $('#rider-field').val(selected_rider);
{% endif %} {% endif %}
{% if mode in ['onestep'] %} {% if mode in ['onestep'] %}
var selected_rider = ''; selected_rider = '';
{% endif %} {% endif %}
$('#rider-table').on('click', 'tr', function() { $('#rider-table').on('click', 'tr', function() {
var id = $(this).data('id'); var id = $(this).data('id');