From d534ce3241ab440d30646068e8da81cd8d798bd4 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 25 Feb 2020 03:37:58 +0000 Subject: [PATCH 1/8] Add getEditRoute for resq. #357 --- src/Controller/JobOrderController.php | 4 +-- .../JobOrderHandler/ResqJobOrderHandler.php | 27 ++++++++++++++++++- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php index dad6a8d4..da68cf5a 100644 --- a/src/Controller/JobOrderController.php +++ b/src/Controller/JobOrderController.php @@ -277,13 +277,13 @@ class JobOrderController extends Controller $rows[$key]['meta']['reassign_hub_url'] = $this->generateUrl('jo_open_hub_form', ['id' => $jo_id]); $rows[$key]['meta']['reassign_rider_url'] = $this->generateUrl('jo_open_rider_form', ['id' => $jo_id]); // $rows[$key]['meta']['edit_url'] = $this->generateUrl('jo_open_edit_form', ['id' => $jo_id]); - $rows[$key]['meta']['edit_url'] = $this->generateUrl($jo_handler->getEditRoute($jo_id), ['id' => $jo_id]); + $rows[$key]['meta']['edit_url'] = $this->generateUrl($jo_handler->getEditRoute($jo_id, $tier_params), ['id' => $jo_id]); $rows[$key]['meta']['onestep_edit_url'] = $this->generateUrl('jo_onestep_edit_form', ['id' => $jo_id]); } else { // $rows[$key]['meta']['update_url'] = $this->generateUrl($tier_params['edit_route'], ['id' => $jo_id]); - $rows[$key]['meta']['update_url'] = $this->generateUrl($jo_handler->getEditRoute($jo_id), ['id' => $jo_id]); + $rows[$key]['meta']['update_url'] = $this->generateUrl($jo_handler->getEditRoute($jo_id, $tier_params), ['id' => $jo_id]); $rows[$key]['meta']['onestep_edit_url'] = $this->generateUrl('jo_onestep_edit_form', ['id' => $jo_id]); $rows[$key]['meta']['pdf_url'] = $this->generateUrl('jo_pdf_form', ['id' => $jo_id]); } diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php index 12995e56..9372b8a5 100644 --- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php +++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php @@ -2588,7 +2588,32 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface } } - public function getEditRoute() + public function getEditRoute($jo_id, $tier) { + $edit_route = ''; + + if (empty($tier)) + return $edit_route; + + switch ($tier) + { + case 'proc': + $edit_route = 'jo_proc_form'; + break; + case 'assign': + $edit_route = 'jo_assign_form'; + break; + case 'fulfill': + $edit_route = 'jo_fulfill_form'; + break; + case 'all': + $edit_route = 'jo_all_form'; + break; + default: + // do nothing + // for 'open', edit route is blank + } + + return $edit_route; } } From 3d40bc62383f28982363681f0213bc9299d47ee2 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 25 Feb 2020 07:18:55 +0000 Subject: [PATCH 2/8] Remove links to onestep edit from templates for resq. Fix for getEditRoute issues found during testing. #357 --- src/Controller/JobOrderController.php | 4 +-- .../JobOrderHandler/ResqJobOrderHandler.php | 25 ++----------------- .../job-order/list.fulfillment.html.twig | 2 +- templates/job-order/list.open.html.twig | 3 --- 4 files changed, 5 insertions(+), 29 deletions(-) diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php index 9388de32..1d1d84c1 100644 --- a/src/Controller/JobOrderController.php +++ b/src/Controller/JobOrderController.php @@ -277,13 +277,13 @@ class JobOrderController extends Controller $rows[$key]['meta']['reassign_hub_url'] = $this->generateUrl('jo_open_hub_form', ['id' => $jo_id]); $rows[$key]['meta']['reassign_rider_url'] = $this->generateUrl('jo_open_rider_form', ['id' => $jo_id]); // $rows[$key]['meta']['edit_url'] = $this->generateUrl('jo_open_edit_form', ['id' => $jo_id]); - $rows[$key]['meta']['edit_url'] = $this->generateUrl($jo_handler->getEditRoute($jo_id, $tier_params), ['id' => $jo_id]); + $rows[$key]['meta']['edit_url'] = $this->generateUrl($jo_handler->getEditRoute($jo_id, $tier_params['edit_route']), ['id' => $jo_id]); $rows[$key]['meta']['onestep_edit_url'] = $this->generateUrl('jo_onestep_edit_form', ['id' => $jo_id]); } else { // $rows[$key]['meta']['update_url'] = $this->generateUrl($tier_params['edit_route'], ['id' => $jo_id]); - $rows[$key]['meta']['update_url'] = $this->generateUrl($jo_handler->getEditRoute($jo_id, $tier_params), ['id' => $jo_id]); + $rows[$key]['meta']['update_url'] = $this->generateUrl($jo_handler->getEditRoute($jo_id, $tier_params['edit_route']), ['id' => $jo_id]); $rows[$key]['meta']['onestep_edit_url'] = $this->generateUrl('jo_onestep_edit_form', ['id' => $jo_id]); $rows[$key]['meta']['pdf_url'] = $this->generateUrl('jo_pdf_form', ['id' => $jo_id]); } diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php index 9372b8a5..e98eaa45 100644 --- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php +++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php @@ -2590,30 +2590,9 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface public function getEditRoute($jo_id, $tier) { - $edit_route = ''; - if (empty($tier)) - return $edit_route; + return 'jo_open_edit_form'; - switch ($tier) - { - case 'proc': - $edit_route = 'jo_proc_form'; - break; - case 'assign': - $edit_route = 'jo_assign_form'; - break; - case 'fulfill': - $edit_route = 'jo_fulfill_form'; - break; - case 'all': - $edit_route = 'jo_all_form'; - break; - default: - // do nothing - // for 'open', edit route is blank - } - - return $edit_route; + return $tier; } } diff --git a/templates/job-order/list.fulfillment.html.twig b/templates/job-order/list.fulfillment.html.twig index 8115866d..66d3c837 100644 --- a/templates/job-order/list.fulfillment.html.twig +++ b/templates/job-order/list.fulfillment.html.twig @@ -135,7 +135,7 @@ sortable: false, overflow: 'visible', template: function (row, index, datatable) { - var actions = '' + ''; + var actions = ''; return actions; }, diff --git a/templates/job-order/list.open.html.twig b/templates/job-order/list.open.html.twig index 451d8492..3a407009 100644 --- a/templates/job-order/list.open.html.twig +++ b/templates/job-order/list.open.html.twig @@ -148,9 +148,6 @@ {% if is_granted('jo_open.edit') %} actions += ''; {% endif %} - {% if is_granted('jo_onestep.edit') %} - actions += ''; - {% endif %} return actions; }, From 164e091c1571f0235666714efa90e36887d91070 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 25 Feb 2020 08:39:30 +0000 Subject: [PATCH 3/8] Remove color field from pdf form. #359 --- src/Service/JobOrderHandler/CMBJobOrderHandler.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php index 2e16f2e9..1d06a1c8 100644 --- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php +++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php @@ -2069,13 +2069,6 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface $pdf->Cell($label_width, $line_height, 'Plate Number:'); $pdf->MultiCell($val_width, $line_height, $cv ? $cv->getPlateNumber() : '', 0, 'L'); - // get Y after left cell - $y1 = $pdf->GetY(); - - $pdf->SetXY($col2_x, $y); - $pdf->Cell($label_width, $line_height, 'Vehicle Color:'); - $pdf->MultiCell(0, $line_height, $cv ? $cv->getColor() : '', 0, 'L'); - // get Y after right cell $y2 = $pdf->GetY(); From 2ab0055286bdbe6b5504873875ac54223cece0e0 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 25 Feb 2020 09:09:51 +0000 Subject: [PATCH 4/8] Clear battery details when New Customer toggle is on. #358 --- templates/job-order/cmb.form.onestep.html.twig | 7 ++++--- templates/job-order/cmb.form.walkin.html.twig | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/templates/job-order/cmb.form.onestep.html.twig b/templates/job-order/cmb.form.onestep.html.twig index c5246ddb..acd88d56 100644 --- a/templates/job-order/cmb.form.onestep.html.twig +++ b/templates/job-order/cmb.form.onestep.html.twig @@ -206,17 +206,17 @@
- +
- +
- +
@@ -1270,6 +1270,7 @@ $(function() { $('.cust_field').val(''); $('.cv_field').val(''); $('#cv-make').val(''); + $('.battery_field').val(''); } else { $('.cust_field').prop('disabled', true); $('.cv_field').prop('disabled', true); diff --git a/templates/job-order/cmb.form.walkin.html.twig b/templates/job-order/cmb.form.walkin.html.twig index 667d84e3..a72973bd 100644 --- a/templates/job-order/cmb.form.walkin.html.twig +++ b/templates/job-order/cmb.form.walkin.html.twig @@ -206,17 +206,17 @@
- +
- +
- +
@@ -806,6 +806,7 @@ var vdata = false; $('.cust_field').val(''); $('.cv_field').val(''); $('#cv-make').val(''); + $('.battery_field').val(''); } else { $('.cust_field').prop('disabled', true); $('.cv_field').prop('disabled', true); From a0f7ca6abed210df3a6009c0119cf1f73ff0668c Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Thu, 27 Feb 2020 02:07:30 +0000 Subject: [PATCH 5/8] Fix editRoute parameters for CMB. #357 --- src/Service/JobOrderHandler/CMBJobOrderHandler.php | 2 +- src/Service/JobOrderHandler/ResqJobOrderHandler.php | 3 +++ src/Service/JobOrderHandlerInterface.php | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php index 2e16f2e9..422f5fb7 100644 --- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php +++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php @@ -2997,7 +2997,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface } } - public function getEditRoute($jo_id) + public function getEditRoute($jo_id, $tier = null) { $jo = $this->em->getRepository(JobOrder::class)->find($jo_id); if (empty($jo)) diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php index e98eaa45..a12e09d5 100644 --- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php +++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php @@ -314,6 +314,9 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface } } + // TODO: check status before saving since JO might already + // have a status that needs to be retained + if (empty($error_array)) { // get current user $user = $this->security->getUser(); diff --git a/src/Service/JobOrderHandlerInterface.php b/src/Service/JobOrderHandlerInterface.php index 5593d10c..590a0926 100644 --- a/src/Service/JobOrderHandlerInterface.php +++ b/src/Service/JobOrderHandlerInterface.php @@ -98,4 +98,7 @@ interface JobOrderHandlerInterface // check if service type is new battery public function checkIfNewBattery(JobOrder $jo); + + // return the edit route, based on tier and form + public function getEditRoute(int $jo_id, $tier); } From 1ab5909dfd6722b03369abbec45764f1ad659ff1 Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Sat, 29 Feb 2020 23:38:05 +0800 Subject: [PATCH 6/8] Add priority field for JobOrder #360 --- src/Entity/JobOrder.php | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/Entity/JobOrder.php b/src/Entity/JobOrder.php index 36834cc1..faa427b0 100644 --- a/src/Entity/JobOrder.php +++ b/src/Entity/JobOrder.php @@ -280,6 +280,14 @@ class JobOrder */ protected $hub_rejections; + // priority order for riders + // NOTE: this is a workaround since changeing rider to jo rider assignment with details requires + // too many changes and may break too many things. + /** + * @ORM\Column(type="integer", options={"default": 0})) + */ + protected $priority; + public function __construct() { $this->date_create = new DateTime(); @@ -297,6 +305,8 @@ class JobOrder $this->trade_in_type = null; $this->flag_rider_rating = false; $this->flag_coolant = false; + + $this->priority = 0; } public function getID() @@ -802,4 +812,15 @@ class JobOrder { return $this->hub_rejections; } + + public function setPriority($priority) + { + $this->priority = $priority; + return $this; + } + + public function getPriority() + { + return $this->priority; + } } From 07753274c33d8e6acd879b8e5481ebaa5bd5af4a Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Sun, 1 Mar 2020 22:14:13 +0800 Subject: [PATCH 7/8] Add initial job order prioritization features #360 --- config/routes/rider.yaml | 10 +++++++ src/Controller/RiderController.php | 45 ++++++++++++++++++++++++++++++ src/Entity/Rider.php | 1 + templates/rider/form.html.twig | 10 +++++++ 4 files changed, 66 insertions(+) diff --git a/config/routes/rider.yaml b/config/routes/rider.yaml index 16a56993..1934a1b1 100644 --- a/config/routes/rider.yaml +++ b/config/routes/rider.yaml @@ -46,3 +46,13 @@ rider_active_jo: path: /riders/{id}/activejo/{jo_id} controller: App\Controller\RiderController::riderActiveJO methods: [GET] + +rider_priority_up_jo: + path: /riders/{id}/priority_up/{jo_id} + controller: App\Controller\RiderController::priorityUpJO + methods: [GET] + +rider_priority_down_jo: + path: /riders/{id}/priority_down/{jo_id} + controller: App\Controller\RiderController::priorityDownJO + methods: [GET] diff --git a/src/Controller/RiderController.php b/src/Controller/RiderController.php index ace84582..184a649d 100644 --- a/src/Controller/RiderController.php +++ b/src/Controller/RiderController.php @@ -534,6 +534,51 @@ class RiderController extends Controller $mclient->sendRiderEvent($jo, $payload); + return $this->redirecttoRoute('rider_update', ['id' => $rider->getID()]); + } + + /** + * @ParamConverter("rider", class="App\Entity\Rider") + * @ParamConverter("jo", class="App\Entity\JobOrder", options={"id": "jo_id"}) + */ + public function priorityUpJO(EntityManagerInterface $em, Rider $rider, JobOrder $jo) + { + error_log("HERE"); + error_log($rider->getID()); + error_log($jo->getID()); + + $jos = $rider->getOpenJobOrders(); + + $old_prio = $jo->getPriority(); + $new_prio = $old_prio - 1; + $jo->setPriority($new_prio); + + foreach ($jos as $rider_jo) + { + // check if it's the same + if ($rider_jo->getID() == $jo->getID()) + continue; + + // if priority is the same as old priority, move it down + if ($new_prio == $rider_jo->getPriority()) + $rider_jo->setPriority($rider_jo->getPriority() + 1); + } + + $em->flush(); + + return $this->redirecttoRoute('rider_update', ['id' => $rider->getID()]); + } + + /** + * @ParamConverter("rider", class="App\Entity\Rider") + * @ParamConverter("jo", class="App\Entity\JobOrder", options={"id": "jo_id"}) + */ + public function priorityDownJO(EntityManagerInterface $em, Rider $rider, JobOrder $jo) + { + error_log("HERE"); + error_log($rider->getID()); + error_log($jo->getID()); + return $this->redirecttoRoute('rider_update', ['id' => $rider->getID()]); } } diff --git a/src/Entity/Rider.php b/src/Entity/Rider.php index 53731475..c588cc77 100644 --- a/src/Entity/Rider.php +++ b/src/Entity/Rider.php @@ -61,6 +61,7 @@ class Rider // job orders that the rider has done /** * @ORM\OneToMany(targetEntity="JobOrder", mappedBy="rider") + * @ORM\OrderBy({"priority" = "ASC"}) */ protected $job_orders; diff --git a/templates/rider/form.html.twig b/templates/rider/form.html.twig index a9b0264c..c1c52708 100644 --- a/templates/rider/form.html.twig +++ b/templates/rider/form.html.twig @@ -180,6 +180,16 @@ {{ jo.getDeliveryAddress|default('') }} {% if jo.getID == active_jo_id %}Active{% endif %} + + + + + + + + + + {% if jo.getID != active_jo_id %} From 977559b88dd732279cdd7bbb77f8f3a8fed55461 Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Mon, 2 Mar 2020 08:33:50 +0800 Subject: [PATCH 8/8] Set priority properly for job order and handle priority down button #360 --- src/Controller/RiderController.php | 29 ++++++++++++++----- .../JobOrderHandler/CMBJobOrderHandler.php | 16 +++++++++- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/src/Controller/RiderController.php b/src/Controller/RiderController.php index 184a649d..43f5d6d6 100644 --- a/src/Controller/RiderController.php +++ b/src/Controller/RiderController.php @@ -543,16 +543,14 @@ class RiderController extends Controller */ public function priorityUpJO(EntityManagerInterface $em, Rider $rider, JobOrder $jo) { - error_log("HERE"); - error_log($rider->getID()); - error_log($jo->getID()); - $jos = $rider->getOpenJobOrders(); + // set new priority $old_prio = $jo->getPriority(); $new_prio = $old_prio - 1; $jo->setPriority($new_prio); + // go through all rider open JOs and set priority when needed foreach ($jos as $rider_jo) { // check if it's the same @@ -575,9 +573,26 @@ class RiderController extends Controller */ public function priorityDownJO(EntityManagerInterface $em, Rider $rider, JobOrder $jo) { - error_log("HERE"); - error_log($rider->getID()); - error_log($jo->getID()); + $jos = $rider->getOpenJobOrders(); + + // set new priority + $old_prio = $jo->getPriority(); + $new_prio = $old_prio + 1; + $jo->setPriority($new_prio); + + // go through all rider open JOs and set priority when needed + foreach ($jos as $rider_jo) + { + // check if it's the same + if ($rider_jo->getID() == $jo->getID()) + continue; + + // if priority is the same as old priority, move it down + if ($new_prio == $rider_jo->getPriority()) + $rider_jo->setPriority($rider_jo->getPriority() - 1); + } + + $em->flush(); return $this->redirecttoRoute('rider_update', ['id' => $rider->getID()]); } diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php index 0e676014..50ef719f 100644 --- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php +++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php @@ -523,6 +523,19 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface } } + // set priority based on rider's existing open job orders + $rider_jos = $rider->getOpenJobOrders(); + + // get maximum priority then add 1 + // NOTE: this can be a bit buggy due to concurrency issues + // ideally have to lock jo table, but that isn't feasible right now + $priority = 0; + foreach ($rider_jos as $rider_jo) + { + if ($priority < $rider_jo->getPriority()) + $priority = $rider_jo->getPriority() + 1; + } + // get discount and set to meta $discount = $req->request->get('invoice_discount', []); @@ -560,7 +573,8 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface ->setModeOfPayment($req->request->get('mode_of_payment')) ->setLandmark($req->request->get('landmark')) ->setHub($hub) - ->setRider($rider); + ->setRider($rider) + ->setPriority($priority); $jo->addMeta('discount', $discount); $jo->addMeta('service_charges', $service_charges);