rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Merge branch '456-cmb-add-rider-s-finish-time-in-jo-list' into '424-cmb-release'

Browse source 
Add finish date column to list of all job orders. #456

See merge request jankstudio/resq!532
This commit is contained in:
Korina Cordero 2020-08-05 04:04:08 +00:00
commit 1dabdee4b0
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Service/JobOrderHandler/CMBJobOrderHandler.php
View file

@ -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)

8
templates/job-order/cmb.list.all.html.twig
View file

@ -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',