diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php index 5c12492d..80e4158e 100644 --- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php +++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php @@ -1517,7 +1517,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface { $em = $this->em; - $params['mode'] = 'update-all'; + $params['mode'] = 'view-all'; // get row data $obj = $em->getRepository(JobOrder::class)->find($id); diff --git a/templates/job-order/cmb.form.onestep.html.twig b/templates/job-order/cmb.form.onestep.html.twig index 8a266b63..0d9bac9f 100644 --- a/templates/job-order/cmb.form.onestep.html.twig +++ b/templates/job-order/cmb.form.onestep.html.twig @@ -389,14 +389,20 @@

- Nearest Hubs + {% if mode == 'view-all' %} + Assigned Hub + {% else %} + Nearest Hubs + {% endif %}

- + {% if mode != 'view-all' %} + + {% endif %}
@@ -430,14 +436,20 @@

- Rider Assignment + {% if mode == 'view-all' %} + Assigned Rider + {% else %} + Rider Assignment + {% endif %}

- + {% if mode != 'view-all' %} + + {% endif %}
@@ -452,7 +464,7 @@ - {% if mode in ['onestep-edit'] %} + {% if mode in ['onestep-edit', 'view-all'] %} {% set avail_riders = obj.getHub.getAvailableRiders|default([]) %} @@ -462,7 +474,11 @@ {% if obj.getHub %} {% for rider in avail_riders %} - + {% if mode == 'view-all' %} + + {% else %} + + {% endif %} {{ rider.getFirstName }} {{ rider.getLastName }} {{ rider.getContactNumber }} @@ -485,11 +501,13 @@
-
- -
+ {% if mode != 'view-all' %} +
+ +
+ {% endif %}
- + {% for jo_sc_key, jo_sc in obj.getMeta('service_charges')|default([]) %}
@@ -634,9 +652,11 @@
- - {% if ftags.set_map_coordinate and is_granted('joborder.cancel') and not obj.isCancelled %} - Cancel Job Order + {% if mode != 'view-all' %} + + {% if ftags.set_map_coordinate and is_granted('joborder.cancel') and not obj.isCancelled %} + Cancel Job Order + {% endif %} {% endif %} Back
@@ -781,6 +801,32 @@ $(function() { }); {% endif %} + {% if mode in ['view-all'] %} + var hub_table = ''; + $.getJSON("{{ url('hub_nearest') }}?lat=" + lat + "&long=" + lng, function(data) { + var hubs = data['hubs']; + var hub_marker; + for (i in hubs) { + var hub = hubs[i]; + + if(selected_hub == hub['id']) { + hub_table += ''; + hub_marker = L.marker([hub['lat'], hub['long']], { icon: icon_hub }); + hubLayerGroup.addLayer(hub_marker); + + hub_table += '' + hub['name'] + ''; + hub_table += '' + hub['branch'] + ''; + hub_table += '' + hub['cnum'] + ''; + hub_table += '' + hub['distance'] + ''; + hub_table += ''; + hub_table += ''; + } + } + + $('#nearest_hubs').html(hub_table); + }); + {% endif %} + // add marker to layer group markerLayerGroup.addLayer(marker); @@ -844,76 +890,80 @@ $(function() { }); $(function() { - $('#hubs-table').on('click', 'tr', function() { - var id = $(this).data('id'); + {% if mode != 'view-all' %} + $('#hubs-table').on('click', 'tr', function() { + var id = $(this).data('id'); - riderLayerGroup.clearLayers(); + riderLayerGroup.clearLayers(); - if (id != selected_hub) { + if (id != selected_hub) { - // highlight this row - $('#hubs-table').find('.m-table__row--primary').removeClass('m-table__row--primary'); + // highlight this row + $('#hubs-table').find('.m-table__row--primary').removeClass('m-table__row--primary'); - $(this).addClass('m-table__row--primary'); + $(this).addClass('m-table__row--primary'); - // set hub - selected_hub = id; - $('#hub-field').val(selected_hub); + // set hub + selected_hub = id; + $('#hub-field').val(selected_hub); - // clear rider field - $('#rider-field').val(''); - selected_rider = ''; + // 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 - var rider_table = ''; - $.getJSON("{{ url('hub_riders') }}?id=" + selected_hub, function(data) { - var riders = data['riders']; - for (i in riders) { - var rider = riders[i]; - 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); + // get riders of hub + // get hub riders ajax + // TODO: add latitude and longitude of delivery location to ajax request + var rider_table = ''; + $.getJSON("{{ url('hub_riders') }}?id=" + selected_hub, function(data) { + var riders = data['riders']; + for (i in riders) { + var rider = riders[i]; + 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); - rider_table += ''; - rider_table += '' + rider['first_name'] + ''; - rider_table += '' + rider['last_name'] + ''; - rider_table += '' + rider['contact_num'] + ''; - rider_table += '' + rider['plate_num'] + ''; - rider_table += ''; - rider_table += ''; - } + rider_table += ''; + rider_table += '' + rider['first_name'] + ''; + rider_table += '' + rider['last_name'] + ''; + rider_table += '' + rider['contact_num'] + ''; + rider_table += '' + rider['plate_num'] + ''; + rider_table += ''; + rider_table += ''; + } - $('#riders').html(rider_table); - }); - } else { - // unhighlight this row - $(this).removeClass('m-table__row--primary'); - - // remove id value - selected_hub = ''; - } - }); + $('#riders').html(rider_table); + }); + } else { + // unhighlight this row + $(this).removeClass('m-table__row--primary'); + + // remove id value + selected_hub = ''; + } + }); + {% endif %} }); $(function() { - $('#rider-table').on('click', 'tr', function() { - var id = $(this).data('id'); + {% if mode != 'view-all' %} + $('#rider-table').on('click', 'tr', function() { + var id = $(this).data('id'); - // highlight this row - $('#rider-table').find('.m-table__row--primary').removeClass('m-table__row--primary'); + // highlight this row + $('#rider-table').find('.m-table__row--primary').removeClass('m-table__row--primary'); - $(this).addClass('m-table__row--primary'); + $(this).addClass('m-table__row--primary'); - // set rider - selected_rider = id; - $('#rider-field').val(selected_rider); - }); + // set rider + selected_rider = id; + $('#rider-field').val(selected_rider); + }); + {% endif %} }); - {% if mode in ['onestep-edit'] %} + {% if mode in ['onestep-edit', 'view-all'] %} var lat = {{ obj.getCoordinates.getLatitude }}; var lng = {{ obj.getCoordinates.getLongitude }}; @@ -1307,7 +1357,7 @@ $(function() { var sc_array = []; // populate invoiceItems if editing so that we don't lose the battery - {% if mode in ['open-edit', 'onestep-edit', 'walk-in-edit'] %} + {% if mode in ['view-all', 'open-edit', 'onestep-edit', 'walk-in-edit'] %} {% if (obj.getInvoice and obj.getInvoice.getItems|length > 0) %} {% for item in obj.getInvoice.getItems %} {% if item.getBattery() %}