From 407c860582b22a8f65a10abb7ccfa7ebf750ee67 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Wed, 5 Aug 2020 03:51:40 +0000 Subject: [PATCH] Add finish date column to list of all job orders. #456 --- src/Service/JobOrderHandler/CMBJobOrderHandler.php | 10 ++++++++++ templates/job-order/cmb.list.all.html.twig | 8 ++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php index e1054e9f..57094a1c 100644 --- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php +++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php @@ -196,6 +196,15 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface $date_start = $jo_event->getDateHappen()->format('d M Y g:i A'); } + // get time when JO was finished by rider + $finish_event_type = CMBJOEventType::RIDER_FINISH; + $date_finish = ''; + $finish_results = $this->em->getRepository(JOEvent::class)->findby(['type_id' => $finish_event_type, 'rider' => $rider_id, 'job_order' => $orow->getID()], ['date_happen' => 'DESC']); + if ($finish_results != null) + { + $jo_event = current($finish_results); + $date_finish = $jo_event->getDateHappen()->format('d M Y g:i A'); + } // add row data $row['id'] = $orow->getID(); @@ -212,6 +221,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface $row['rider_name'] = $rider_name; $row['rider_plate_number'] = $rider_plate_number; $row['date_start'] = $date_start; + $row['date_finish'] = $date_finish; $processor = $orow->getProcessedBy(); if ($processor == null) diff --git a/templates/job-order/cmb.list.all.html.twig b/templates/job-order/cmb.list.all.html.twig index c45d3e73..7351e2ad 100644 --- a/templates/job-order/cmb.list.all.html.twig +++ b/templates/job-order/cmb.list.all.html.twig @@ -132,13 +132,17 @@ field: 'type', title: 'Schedule' }, + { + field: 'date_schedule', + title: 'Scheduled Date' + }, { field: 'date_start', title: 'Start Date' }, { - field: 'date_schedule', - title: 'Scheduled Date' + field: 'date_finish', + title: 'Finish Date' }, { field: 'rider_name',