Merge branch '626-improve-loading-for-jo-for-dispatch' into 'master-fix'

Resolve "Improve loading for JO for Dispatch"

See merge request jankstudio/resq!740
This commit is contained in:
Kendrick Chan 2021-10-08 12:36:07 +00:00
commit 8056cb6d29
2 changed files with 6 additions and 2 deletions

View file

@ -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[] = [

View file

@ -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['redis_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'] = $hub['redis_jo_count'];
// check for rejection
$hub['flag_rejected'] = false;