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

Merge branch '734-add-columns-to-nearest-hubs-in-dispatch-page' into 'staging'

Browse source 
Add flag_active to query for riders. #734

See merge request jankstudio/resq!851
This commit is contained in:
Kendrick Chan 2023-02-09 03:14:29 +00:00
commit 71ee183813
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3312,13 +3312,13 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
$hub_id = $hub->getID(); $hub_id = $hub->getID();
// get in transit rider count aka flag_available is false AND current_jo_id is not null // get in transit rider count aka flag_available is false AND current_jo_id is not null AND rider is active
$in_transit_query = $em->createQuery('SELECT count(r.id) FROM App\Entity\Rider r JOIN r.hub h WHERE h.id = :hub_id AND r.flag_available = false AND r.current_job_order IS NOT NULL'); $in_transit_query = $em->createQuery('SELECT count(r.id) FROM App\Entity\Rider r JOIN r.hub h WHERE h.id = :hub_id AND r.flag_available = false AND r.current_job_order IS NOT NULL AND r.flag_active = true');
$in_transit_query->setParameters(['hub_id' => $hub_id]); $in_transit_query->setParameters(['hub_id' => $hub_id]);
$in_transit_count = $in_transit_query->getSingleScalarResult(); $in_transit_count = $in_transit_query->getSingleScalarResult();
// get available rider count aka flag_available is true AND current_jo_id is null // get available rider count aka flag_available is true AND current_jo_id is null AND rider is active
$available_query = $em->createQuery('SELECT count(r.id) FROM App\Entity\Rider r JOIN r.hub h WHERE h.id = :hub_id AND r.flag_available = true AND r.current_job_order IS NULL'); $available_query = $em->createQuery('SELECT count(r.id) FROM App\Entity\Rider r JOIN r.hub h WHERE h.id = :hub_id AND r.flag_available = true AND r.current_job_order IS NULL AND r.flag_active = true');
$available_query->setParameters(['hub_id' => $hub_id]); $available_query->setParameters(['hub_id' => $hub_id]);
$available_count = $available_query->getSingleScalarResult(); $available_count = $available_query->getSingleScalarResult();