diff --git a/src/Service/HubSelector.php b/src/Service/HubSelector.php index ab810c20..87aea726 100644 --- a/src/Service/HubSelector.php +++ b/src/Service/HubSelector.php @@ -92,7 +92,7 @@ class HubSelector $hubs_round_robin = $this->filterHubsByRoundRobin($filtered_hubs, $flag_round_robin); $filtered_hubs = $hubs_round_robin; - //error_log('round robin hubs ' . json_encode($filtered_hubs)); + error_log('round robin hubs ' . json_encode($filtered_hubs)); // max results filter $hubs_max_result = $this->filterHubsByMaxResults($filtered_hubs, $limit_results, $jo_id, $customer_id); diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php index 092e9bf6..32a2db28 100644 --- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php +++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php @@ -2035,6 +2035,7 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface // counters $hub['rider_count'] = count($hub['hub']->getAvailableRiders()); + $hub['redis_jo_count'] = $hub['jo_count']; $hub['jo_count'] = count($hub['hub']->getForAssignmentJobOrders()); // check for rejection @@ -2337,6 +2338,7 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface // counters $hub['rider_count'] = count($hub['hub']->getAvailableRiders()); + $hub['redis_jo_count'] = $hub['jo_count']; $hub['jo_count'] = count($hub['hub']->getForAssignmentJobOrders()); // check for rejection diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig index fede693a..e29d7aa5 100644 --- a/templates/job-order/form.html.twig +++ b/templates/job-order/form.html.twig @@ -645,67 +645,67 @@ {% if mode in ['update-processing', 'update-reassign-hub'] %} -
+
-
-

- Nearest Hubs -

-
-
-
- - -
- - - - - - - - - - - - - - - - - +
+

+ Nearest Hubs +

+
+
+
+ + +
+
HubBranchAvailable RidersJobs For AssignmentInventoryContact NumbersAction
- No items to display. -
+ + + + + + + + + + + + + + + + + - {% for hub in hubs %} - - - - - - - - - - - {% endfor %} - -
HubBranchAvailable RidersJob Order CountJobs For AssignmentInventoryContact NumbersAction
+ No items to display. +
{{ hub.hub.getName }}{{ hub.hub.getBranch }}{{ hub.rider_count }}{{ hub.jo_count }}{{ hub.inventory|default('0') }}{{ hub.hub.getContactNumbers|replace({"\n": ', '}) }} - {% if hub.flag_rejected %} - - {% else %} - - {% endif %} -
-
-
-
+ {% for hub in hubs %} + + {{ hub.hub.getName }} + {{ hub.hub.getBranch }} + + {{ hub.rider_count }} + {{ hub.redis_jo_count }} + {{ hub.jo_count }} + {{ hub.inventory|default('0') }} + {{ hub.hub.getContactNumbers|replace({"\n": ', '}) }} + + {% if hub.flag_rejected %} + + {% else %} + + {% endif %} + + + {% endfor %} + + +
+ +