From fe15385613887b34e06425a1b3610e666ae81d29 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Fri, 8 Oct 2021 12:09:46 +0000 Subject: [PATCH 1/3] Use the redis job order count to display number of assigned job orders to hub. #626 --- src/Service/JobOrderHandler/ResqJobOrderHandler.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php index 789c3690..718758a3 100644 --- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php +++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php @@ -2120,7 +2120,8 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface $hub['rider_count'] = count($hub['hub']->getAvailableRiders()); $hub['redis_jo_count'] = $hub['jo_count']; //$hub['redis_jo_count'] = 0; - $hub['jo_count'] = count($hub['hub']->getForAssignmentJobOrders()); + // $hub['jo_count'] = count($hub['hub']->getForAssignmentJobOrders()); + //$hub['jo_count'] = $hub['jo_count']; // check for rejection $hub['flag_rejected'] = false; @@ -2426,7 +2427,8 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface $hub['rider_count'] = count($hub['hub']->getAvailableRiders()); // $hub['redis_jo_count'] = $hub['jo_count']; $hub['redis_jo_count'] = 0; - $hub['jo_count'] = count($hub['hub']->getForAssignmentJobOrders()); + // $hub['jo_count'] = count($hub['hub']->getForAssignmentJobOrders()); + $hub['jo_count'] = 0; // check for rejection $hub['flag_rejected'] = false; From e6d304355611a3180bc0c079e0ff1aa312341e5e Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Fri, 8 Oct 2021 12:21:57 +0000 Subject: [PATCH 2/3] Set hub jo count to redis jo count. #626 --- src/Service/JobOrderHandler/ResqJobOrderHandler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php index 718758a3..a7f23150 100644 --- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php +++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php @@ -2428,7 +2428,7 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface // $hub['redis_jo_count'] = $hub['jo_count']; $hub['redis_jo_count'] = 0; // $hub['jo_count'] = count($hub['hub']->getForAssignmentJobOrders()); - $hub['jo_count'] = 0; + $hub['jo_count'] = $hub['redis_jo_count']; // check for rejection $hub['flag_rejected'] = false; From 840cbe2463c8fb966ee233a85037b632c2fe8c90 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Fri, 8 Oct 2021 12:34:55 +0000 Subject: [PATCH 3/3] Fix setting of hub jo count. #626 --- src/Service/HubDistributor.php | 2 ++ src/Service/JobOrderHandler/ResqJobOrderHandler.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Service/HubDistributor.php b/src/Service/HubDistributor.php index 8b296b7f..27a70f15 100644 --- a/src/Service/HubDistributor.php +++ b/src/Service/HubDistributor.php @@ -71,6 +71,8 @@ class HubDistributor // check if hub is in hash. if not, hub has no jobs // but should still be added to results + // TODO: rename the jo_count key so that it won't collide + // later on with the dispatch JO page. if ($hub_jo_count != null) { $arranged_hubs[] = [ diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php index a7f23150..ba7125f0 100644 --- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php +++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php @@ -2121,7 +2121,7 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface $hub['redis_jo_count'] = $hub['jo_count']; //$hub['redis_jo_count'] = 0; // $hub['jo_count'] = count($hub['hub']->getForAssignmentJobOrders()); - //$hub['jo_count'] = $hub['jo_count']; + $hub['jo_count'] = $hub['redis_jo_count']; // check for rejection $hub['flag_rejected'] = false;