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

Add service type to View All page. Replace Battery Facilitated By to Assigned Hub in View All Page. #769

Browse source
This commit is contained in:
Korina Cordero 2023-11-08 15:17:32 +08:00
parent b20371cd1f
commit 8ed1434353
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Service/JobOrderHandler/ResqJobOrderHandler.php
View file

@ -241,12 +241,20 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
else else
$row['assignor'] = $orow->getAssignedBy()->getFullName(); $row['assignor'] = $orow->getAssignedBy()->getFullName();
// not removing this since this might be used by other pages since getRows is also used by other pages
$hub_facilitated = $orow->getFacilitatedBy(); $hub_facilitated = $orow->getFacilitatedBy();
if ($hub_facilitated == null) if ($hub_facilitated == null)
$row['hub_facilitated'] = ''; $row['hub_facilitated'] = '';
else else
$row['hub_facilitated'] = $orow->getFacilitatedBy()->getName(); $row['hub_facilitated'] = $orow->getFacilitatedBy()->getName();
// get the assigned hub, if any
$assigned_hub = $orow->getHub();
if ($assigned_hub == null)
$row['assigned_hub'] = '';
else
$row['assigned_hub'] = $orow->getHub()->getName();
$rows[] = $row; $rows[] = $row;
} }

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

@ -117,12 +117,12 @@
title: 'Customer Area' title: 'Customer Area'
}, },
{ {
field: 'hub_facilitated', field: 'assigned_hub',
title: 'Battery Facilitated By' title: 'Assigned Hub'
}, },
{ {
field: 'type', field: 'service_type',
title: 'Schedule' title: 'Transaction Type'
}, },
{ {
field: 'date_schedule', field: 'date_schedule',