From 8ed1434353da87d8ac1324b2c8279ab9dc768a37 Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Wed, 8 Nov 2023 15:17:32 +0800
Subject: [PATCH] Add service type to View All page. Replace Battery
 Facilitated By to Assigned Hub in View All Page. #769

---
 src/Service/JobOrderHandler/ResqJobOrderHandler.php | 8 ++++++++
 templates/job-order/list.all.html.twig              | 8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
index 3e86f434..f03d8b0f 100644
--- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
@@ -241,12 +241,20 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
             else
                 $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();
             if ($hub_facilitated == null)
                 $row['hub_facilitated'] = '';
             else
                 $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;
         }
 
diff --git a/templates/job-order/list.all.html.twig b/templates/job-order/list.all.html.twig
index a2c6b7c6..19332331 100644
--- a/templates/job-order/list.all.html.twig
+++ b/templates/job-order/list.all.html.twig
@@ -117,12 +117,12 @@
                     title: 'Customer Area'
                 },
                 {
-                    field: 'hub_facilitated',
-                    title: 'Battery Facilitated By'
+                    field: 'assigned_hub',
+                    title: 'Assigned Hub'
                 },
                 {
-                    field: 'type',
-                    title: 'Schedule'
+                    field: 'service_type',
+                    title: 'Transaction Type'
                 },
                 {
                     field: 'date_schedule',
-- 
2.43.5