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/JobOrderController.php b/src/Controller/JobOrderController.php
index dfc421c6..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), ['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), ['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/Controller/RiderController.php b/src/Controller/RiderController.php
index ace84582..43f5d6d6 100644
--- a/src/Controller/RiderController.php
+++ b/src/Controller/RiderController.php
@@ -534,6 +534,66 @@ 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)
+ {
+ $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()]);
+ }
+
+ /**
+ * @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)
+ {
+ $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/Entity/JobOrder.php b/src/Entity/JobOrder.php
index 9e902e98..8f5e78e7 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;
+
// meta
/**
* @ORM\Column(type="json")
@@ -304,6 +312,7 @@ class JobOrder
$this->flag_rider_rating = false;
$this->flag_coolant = false;
+ $this->priority = 0;
$this->meta = [];
}
@@ -811,6 +820,17 @@ class JobOrder
return $this->hub_rejections;
}
+ public function setPriority($priority)
+ {
+ $this->priority = $priority;
+ return $this;
+ }
+
+ public function getPriority()
+ {
+ return $this->priority;
+ }
+
public function addMeta($id, $value)
{
$this->meta[$id] = $value;
@@ -825,5 +845,4 @@ class JobOrder
return $this->meta[$id];
}
-
}
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/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index 43f90e57..ee08568a 100644
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@@ -518,6 +518,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', []);
@@ -555,7 +568,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);
@@ -2065,13 +2079,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();
@@ -2993,7 +3000,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 48c22029..4e58b05c 100644
--- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
@@ -310,6 +310,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();
@@ -2585,7 +2588,11 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
}
}
- public function getEditRoute()
+ public function getEditRoute($jo_id, $tier)
{
+ if (empty($tier))
+ return 'jo_open_edit_form';
+
+ return $tier;
}
}
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);
}
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);
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;
},
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 %}
|