From 1d0aaa211a3b967b638a06ee2bf996cf2e33a76b Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Sun, 4 Feb 2018 19:41:46 +0800 Subject: [PATCH] Display owner in job order list --- src/Controller/JobOrderController.php | 2 ++ src/Entity/User.php | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php index c80be8e8..bb5b0158 100644 --- a/src/Controller/JobOrderController.php +++ b/src/Controller/JobOrderController.php @@ -257,6 +257,8 @@ class JobOrderController extends BaseController $row['status'] = $statuses[$orow->getStatus()]; $row['flag_advance'] = $orow->isAdvanceOrder(); + $row['owner'] = $orow->getProcessedBy()->getFullName(); + // add crud urls $row['meta']['update_url'] = $this->generateUrl($tier_params['edit_route'], ['id' => $row['id']]); diff --git a/src/Entity/User.php b/src/Entity/User.php index 0ccba586..9bfea188 100644 --- a/src/Entity/User.php +++ b/src/Entity/User.php @@ -238,6 +238,11 @@ class User implements AdvancedUserInterface, Serializable return $this->last_name; } + public function getFullName() + { + return $this->first_name . ' ' . $this->last_name; + } + public function setContactNumber($num) { $this->contact_num = $num;