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 %}