diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php index c80be8e8..14ff27e8 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['processor'] = $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; diff --git a/templates/job-order/list.html.twig b/templates/job-order/list.html.twig index da8afcb5..1743be1e 100644 --- a/templates/job-order/list.html.twig +++ b/templates/job-order/list.html.twig @@ -94,8 +94,8 @@ title: 'Status' }, { - field: 'owner', - title: 'Owner' + field: 'processor', + title: 'Processor' }, { field: 'Actions', @@ -122,4 +122,4 @@ }); -{% endblock %} \ No newline at end of file +{% endblock %}