From ca8d6fb57df879b7eabca95f3fc1342652b32a1c Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Tue, 4 Feb 2020 09:12:17 +0800 Subject: [PATCH 1/8] Add multipolygon type #319 --- config/packages/doctrine.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml index b1b6d947..c154fbc2 100644 --- a/config/packages/doctrine.yaml +++ b/config/packages/doctrine.yaml @@ -19,6 +19,7 @@ doctrine: point: CrEOF\Spatial\DBAL\Types\Geometry\PointType polygon: CrEOF\Spatial\DBAL\Types\Geometry\PolygonType linestring: CrEOF\Spatial\DBAL\Types\Geometry\LineStringType + multipolygon: CrEOF\Spatial\DBAL\Types\Geometry\MultiPolygonType orm: auto_generate_proxy_classes: '%kernel.debug%' naming_strategy: doctrine.orm.naming_strategy.underscore From 3789871f9aa7a7851de10d07fc417e69098a0e53 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 4 Feb 2020 08:43:39 +0000 Subject: [PATCH 2/8] Add rider and date filter to search. #319 --- src/Controller/JobOrderController.php | 3 + .../JobOrderHandler/CMBJobOrderHandler.php | 27 ++ templates/job-order/list.all.html.twig | 252 +++++++++++------- 3 files changed, 182 insertions(+), 100 deletions(-) diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php index 5d6127e3..7b1877aa 100644 --- a/src/Controller/JobOrderController.php +++ b/src/Controller/JobOrderController.php @@ -196,6 +196,7 @@ class JobOrderController extends Controller $template = $jo_handler->getTwigTemplate('jo_list_fulfillment'); + $params = $jo_handler->getOtherParameters(); $params['table_refresh_rate'] = $this->container->getParameter('job_order_refresh_interval'); return $this->render($template, $params); @@ -210,6 +211,7 @@ class JobOrderController extends Controller $template = $jo_handler->getTwigTemplate('jo_list_open'); + $params = $jo_handler->getOtherParameters(); $params['table_refresh_rate'] = $this->container->getParameter('job_order_refresh_interval'); $params['statuses'] = JOStatus::getCollection(); @@ -225,6 +227,7 @@ class JobOrderController extends Controller $template = $jo_handler->getTwigTemplate('jo_list_all'); + $params = $jo_handler->getOtherParameters(); $params['table_refresh_rate'] = $this->container->getParameter('job_order_refresh_interval'); return $this->render($template, $params); diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php index 50c504fc..801857a3 100644 --- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php +++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php @@ -2197,6 +2197,14 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface return null; } + public function getOtherParameters() + { + // get riders for dropdown + $params['riders'] = $this->em->getRepository(Rider::class)->findAll(); + + return $params; + } + protected function fillDropdownParameters(&$params) { @@ -2472,6 +2480,25 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface ->orWhere('c.first_name like :filter or c.last_name like :filter') ->setParameter('filter', $datatable['query']['data-rows-search'] . '%'); } + if (isset($datatable['query']['rider'])) + { + $query->innerJoin('q.rider', 'r') + ->where('r.id = :rider_id') + ->setParameter('rider_id', $datatable['query']['rider']); + } + if (isset($datatable['query']['schedule_date'])) + { + $start = $datatable['query']['schedule_date'][0] . ' ' . '00:00:00'; + $end = $datatable['query']['schedule_date'][1] . ' ' . '23:59:00'; + + $date_start = DateTime::createFromFormat('m/d/Y H:i:s', $start); + $date_end = DateTime::createFromFormat('m/d/Y H:i:s', $end); + + $query->where('q.date_schedule >= :date_start') + ->andWhere('q.date_schedule <= :date_end') + ->setParameter('date_start', $date_start) + ->setParameter('date_end', $date_end); + } break; default: $query->where('q.status = :status') diff --git a/templates/job-order/list.all.html.twig b/templates/job-order/list.all.html.twig index a4cd4afe..06773aa8 100644 --- a/templates/job-order/list.all.html.twig +++ b/templates/job-order/list.all.html.twig @@ -19,21 +19,44 @@
-
-
-
-
-
- - - - -
-
-
-
-
-
+
+
+
+
+
+ + + + +
+
+
+
+
+ + +
+
+
+
+
+
+ +
+ +
+ +
+
+
+
+
+
+
@@ -45,93 +68,122 @@ {% endblock %} {% block scripts %} - + // auto refresh table + setInterval(function() { + table.reload(); + }, {{ table_refresh_rate }}); + + $("#rider_list").on("change", function() { + table.search($(this).val(), "rider"); + }); + + $("#date_start").on("change", function() { + var date_start = $(this).val(); + var date_end = $("[name='date_end']").val(); + var date_array = [date_start, date_end]; + + table.search(date_array, "schedule_date"); + }); + + $("#date_end").on("change", function() { + console.log($(this).val()); + + var date_end = $(this).val(); + var date_start = $("[name='date_start']").val(); + var date_array = [date_start, date_end]; + + table.search(date_array, "schedule_date"); + + }); + + }); + + {% endblock %} From 15bafe2363f45911c32d977f6d1f94fc022e7d69 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 4 Feb 2020 10:33:12 +0000 Subject: [PATCH 3/8] Fix for query when multiple parameters are passed. #319 --- src/Service/JobOrderHandler/CMBJobOrderHandler.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php index 801857a3..bc5f679f 100644 --- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php +++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php @@ -2483,7 +2483,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface if (isset($datatable['query']['rider'])) { $query->innerJoin('q.rider', 'r') - ->where('r.id = :rider_id') + ->andWhere('r.id = :rider_id') ->setParameter('rider_id', $datatable['query']['rider']); } if (isset($datatable['query']['schedule_date'])) @@ -2494,7 +2494,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface $date_start = DateTime::createFromFormat('m/d/Y H:i:s', $start); $date_end = DateTime::createFromFormat('m/d/Y H:i:s', $end); - $query->where('q.date_schedule >= :date_start') + $query->andWhere('q.date_schedule >= :date_start') ->andWhere('q.date_schedule <= :date_end') ->setParameter('date_start', $date_start) ->setParameter('date_end', $date_end); From 4ad0db07e8943ecd5ba9c9210124108c3e21d7dd Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Tue, 4 Feb 2020 18:39:14 +0800 Subject: [PATCH 4/8] Add new customer option enabling customer and vehicle fields #319 --- .../job-order/cmb.form.onestep.html.twig | 69 ++++++++++++------- 1 file changed, 46 insertions(+), 23 deletions(-) diff --git a/templates/job-order/cmb.form.onestep.html.twig b/templates/job-order/cmb.form.onestep.html.twig index 8e4ac45d..4db34a48 100644 --- a/templates/job-order/cmb.form.onestep.html.twig +++ b/templates/job-order/cmb.form.onestep.html.twig @@ -75,20 +75,27 @@ {% endif %}
-
+

Customer Details

+ + +
- +
- +
@@ -97,7 +104,7 @@
{% trans %}country_code_prefix{% endtrans %} - +
@@ -105,7 +112,7 @@
{% trans %}country_code_prefix{% endtrans %} - +
@@ -115,7 +122,7 @@
{% trans %}country_code_prefix{% endtrans %} - +
@@ -123,7 +130,7 @@
{% trans %}country_code_prefix{% endtrans %} - +
@@ -131,7 +138,7 @@
- +
@@ -144,33 +151,35 @@
- - - + + +
- - - + + +
- - - + + + +
+
+ + +
+
@@ -1123,6 +1132,20 @@ $(function() { } }).change(); + // toggle new customer + $("#flag-new-customer").change(function() { + console.log('HERE'); + + checked = $(this).prop('checked'); + if (checked) { + $('.cust_field').prop('disabled', false); + $('.cv_field').prop('disabled', false); + } else { + $('.cust_field').prop('disabled', true); + $('.cv_field').prop('disabled', true); + } + }).change(); + // update battery list when changing manufacturer $("#invoice-bmfg").change(function() { {% if ftags.preset_vehicle %} From b6700eed360beaad0131ab20641773bae4d64b6d Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 4 Feb 2020 11:15:10 +0000 Subject: [PATCH 5/8] Add rider and date query parameters for list of to be fulfilled and open job orders. #319 --- .../JobOrderHandler/CMBJobOrderHandler.php | 50 +++- templates/job-order/list.all.html.twig | 4 +- .../job-order/list.fulfillment.html.twig | 242 +++++++++------- templates/job-order/list.open.html.twig | 261 +++++++++++------- 4 files changed, 352 insertions(+), 205 deletions(-) diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php index bc5f679f..c43a25d6 100644 --- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php +++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php @@ -2443,7 +2443,36 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface switch ($tier) { case 'fulfill': - $query->where('q.status IN (:statuses)') + if (isset($datatable['query']['data-rows-search'])) + { + $query->innerJoin('q.cus_vehicle', 'cv') + ->innerJoin('q.customer', 'c') + ->where('cv.plate_number like :filter') + ->orWhere('c.phone_mobile like :filter') + ->orWhere('c.first_name like :filter or c.last_name like :filter') + ->setParameter('filter', $datatable['query']['data-rows-search'] . '%'); + } + if (isset($datatable['query']['rider'])) + { + $query->innerJoin('q.rider', 'r') + ->andWhere('r.id = :rider_id') + ->setParameter('rider_id', $datatable['query']['rider']); + } + if (isset($datatable['query']['schedule_date'])) + { + $start = $datatable['query']['schedule_date'][0] . ' ' . '00:00:00'; + $end = $datatable['query']['schedule_date'][1] . ' ' . '23:59:00'; + + $date_start = DateTime::createFromFormat('m/d/Y H:i:s', $start); + $date_end = DateTime::createFromFormat('m/d/Y H:i:s', $end); + + $query->andWhere('q.date_schedule >= :date_start') + ->andWhere('q.date_schedule <= :date_end') + ->setParameter('date_start', $date_start) + ->setParameter('date_end', $date_end); + } + + $query->andWhere('q.status IN (:statuses)') ->andWhere('q.hub IN (:hubs)') ->setParameter('statuses', $status, Connection::PARAM_STR_ARRAY) ->setParameter('hubs', $hubs, Connection::PARAM_STR_ARRAY); @@ -2469,6 +2498,25 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface $query->where('q.status IN (:statuses)') ->setParameter('statuses', $status, Connection::PARAM_STR_ARRAY); } + if (isset($datatable['query']['rider'])) + { + $query->innerJoin('q.rider', 'r') + ->andWhere('r.id = :rider_id') + ->setParameter('rider_id', $datatable['query']['rider']); + } + if (isset($datatable['query']['schedule_date'])) + { + $start = $datatable['query']['schedule_date'][0] . ' ' . '00:00:00'; + $end = $datatable['query']['schedule_date'][1] . ' ' . '23:59:00'; + + $date_start = DateTime::createFromFormat('m/d/Y H:i:s', $start); + $date_end = DateTime::createFromFormat('m/d/Y H:i:s', $end); + + $query->andWhere('q.date_schedule >= :date_start') + ->andWhere('q.date_schedule <= :date_end') + ->setParameter('date_start', $date_start) + ->setParameter('date_end', $date_end); + } break; case 'all': if (isset($datatable['query']['data-rows-search'])) diff --git a/templates/job-order/list.all.html.twig b/templates/job-order/list.all.html.twig index 06773aa8..95e1732e 100644 --- a/templates/job-order/list.all.html.twig +++ b/templates/job-order/list.all.html.twig @@ -35,6 +35,7 @@
- - - -
-
-
- - - +
+
+
+
+
+ + + + +
+
+
+
+
+ + +
+
+
+
+
+
+ +
+ +
+ +
+
+
+
+
+
+
@@ -45,88 +69,116 @@ {% endblock %} {% block scripts %} - + // auto refresh table + setInterval(function() { + table.reload(); + }, {{ table_refresh_rate }}); + + + $("#rider_list").on("change", function() { + console.log($(this).val()); + table.search($(this).val(), "rider"); + }); + + $("#date_start").on("change", function() { + var date_start = $(this).val(); + var date_end = $("[name='date_end']").val(); + var date_array = [date_start, date_end]; + + table.search(date_array, "schedule_date"); + }); + + $("#date_end").on("change", function() { + console.log($(this).val()); + + var date_end = $(this).val(); + var date_start = $("[name='date_start']").val(); + var date_array = [date_start, date_end]; + + table.search(date_array, "schedule_date"); + }); + }); + {% endblock %} diff --git a/templates/job-order/list.open.html.twig b/templates/job-order/list.open.html.twig index 62af1e3a..2cae9007 100644 --- a/templates/job-order/list.open.html.twig +++ b/templates/job-order/list.open.html.twig @@ -19,21 +19,45 @@
-
-
-
-
-
- - - - -
-
-
-
-
-
+
+
+
+
+
+ + + + +
+
+
+
+
+ + +
+
+
+
+
+
+ +
+ +
+ +
+
+
+
+
+
+
@@ -45,104 +69,129 @@ {% endblock %} {% block scripts %} - + // auto refresh table + setInterval(function() { + table.reload(); + }, {{ table_refresh_rate }}); + + $("#rider_list").on("change", function() { + table.search($(this).val(), "rider"); + }); + + $("#date_start").on("change", function() { + var date_start = $(this).val(); + var date_end = $("[name='date_end']").val(); + var date_array = [date_start, date_end]; + + table.search(date_array, "schedule_date"); + }); + + $("#date_end").on("change", function() { + console.log($(this).val()); + + var date_end = $(this).val(); + var date_start = $("[name='date_start']").val(); + var date_array = [date_start, date_end]; + + table.search(date_array, "schedule_date"); + }); + }); + {% endblock %} From 746b25ad74318f76d201c4974ba2b71a75148911 Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Wed, 5 Feb 2020 04:36:33 +0800 Subject: [PATCH 6/8] Fix one step form for CMB to allow for new customer and vehicle #319 --- src/Controller/JobOrderController.php | 9 +- .../CustomerHandler/CMBCustomerHandler.php | 1 + .../job-order/cmb.form.onestep.html.twig | 94 ++++++++++++++++--- 3 files changed, 89 insertions(+), 15 deletions(-) diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php index 5d6127e3..09269aa5 100644 --- a/src/Controller/JobOrderController.php +++ b/src/Controller/JobOrderController.php @@ -10,6 +10,8 @@ use App\Entity\CustomerVehicle; use App\Entity\Promo; use App\Entity\Battery; use App\Entity\JobOrder; +use App\Entity\VehicleManufacturer; +use App\Entity\Vehicle; use App\Service\InvoiceGeneratorInterface; use App\Service\JobOrderHandlerInterface; @@ -833,7 +835,7 @@ class JobOrderController extends Controller /** * @Menu(selected="jo_onestep_form") */ - public function oneStepForm(JobOrderHandlerInterface $jo_handler, GISManagerInterface $gis) + public function oneStepForm(EntityManagerInterface $em, JobOrderHandlerInterface $jo_handler, GISManagerInterface $gis) { $this->denyAccessUnlessGranted('jo_onestep.form', null, 'No access.'); @@ -841,6 +843,10 @@ class JobOrderController extends Controller $params['submit_url'] = $this->generateUrl('jo_onestep_submit'); $params['return_url'] = $this->generateUrl('jo_onestep_form'); $params['map_js_file'] = $gis->getJSJOFile(); + $params['vmfgs'] = $em->getRepository(VehicleManufacturer::class)->findAll(); + $params['vmakes'] = $em->getRepository(Vehicle::class)->findAll(); + $params['vmodel_year'] = ''; + $params['vplate'] = ''; $template = $params['template']; @@ -886,6 +892,7 @@ class JobOrderController extends Controller $params['submit_url'] = $this->generateUrl('jo_onestep_edit_submit', ['id' => $id]); $params['return_url'] = $this->generateUrl('jo_open'); $params['map_js_file'] = $gis->getJSJOFile(); + $params['vmfgs'] = $em->getRepository(VehicleManufacturer::class)->findAll(); $template = $params['template']; diff --git a/src/Service/CustomerHandler/CMBCustomerHandler.php b/src/Service/CustomerHandler/CMBCustomerHandler.php index fb6a888e..d8107514 100644 --- a/src/Service/CustomerHandler/CMBCustomerHandler.php +++ b/src/Service/CustomerHandler/CMBCustomerHandler.php @@ -519,6 +519,7 @@ class CMBCustomerHandler implements CustomerHandlerInterface ], 'vehicle' => [ 'id' => $vehicle->getID(), + 'mfg_id' => $vehicle->getManufacturer()->getID(), 'mfg_name' => $vehicle->getManufacturer()->getName(), 'make' => $vehicle->getMake(), 'model_year_from' => $vehicle->getModelYearFrom(), diff --git a/templates/job-order/cmb.form.onestep.html.twig b/templates/job-order/cmb.form.onestep.html.twig index 4db34a48..aaeee29a 100644 --- a/templates/job-order/cmb.form.onestep.html.twig +++ b/templates/job-order/cmb.form.onestep.html.twig @@ -42,12 +42,14 @@
+
@@ -152,12 +154,25 @@
- - + +
-
- - +
+ +
@@ -165,21 +180,21 @@
+
+
-
+
@@ -616,6 +631,33 @@