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

Add sorting by distance to round robin. #596

Browse source
This commit is contained in:
Korina Cordero 2021-07-15 11:07:58 +00:00
parent bad6de1ed2
commit 625236667b
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Service/HubDistributor.php
View file

@ -95,14 +95,20 @@ class HubDistributor
usort($arranged_hubs, function($a, $b) { usort($arranged_hubs, function($a, $b) {
if ($a['jo_count'] == $b['jo_count']) if ($a['jo_count'] == $b['jo_count'])
return 0; {
if ($a['distance'] == $b['distance'])
return 0;
if ($a['distance'] < $b['distance'])
return -1;
return 1;
}
if ($a['jo_count'] < $b['jo_count']) if ($a['jo_count'] < $b['jo_count'])
return -1; return -1;
else else
return 1; return 1;
}); });
//error_log('arranged hubs ' . json_encode($arranged_hubs)); error_log('arranged hubs ' . json_encode($arranged_hubs));
return $arranged_hubs; return $arranged_hubs;
} }

2
src/Service/JobOrderHandler/ResqJobOrderHandler.php
View file

@ -1985,7 +1985,7 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
if ($this->hub_geofence->isCovered($long, $lat)) if ($this->hub_geofence->isCovered($long, $lat))
{ {
// if true, set other values for HubCriteria // if true, set other values for HubCriteria
// error_log('Area is covered by hub filtering'); error_log('Area is covered by hub filtering');
$hub_criteria->setPaymentMethod($obj->getModeOfPayment()) $hub_criteria->setPaymentMethod($obj->getModeOfPayment())
->setJoType($obj->getServiceType()) ->setJoType($obj->getServiceType())
->setRoundRobin(true); ->setRoundRobin(true);