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

Merge branch 'master' of gitlab.com:jankstudio/resq

Browse source
This commit is contained in:
Ramon Gutierrez 2018-02-04 19:47:15 +08:00
commit 83518679ea
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Controller/JobOrderController.php
View file

@ -257,6 +257,8 @@ class JobOrderController extends BaseController
$row['status'] = $statuses[$orow->getStatus()]; $row['status'] = $statuses[$orow->getStatus()];
$row['flag_advance'] = $orow->isAdvanceOrder(); $row['flag_advance'] = $orow->isAdvanceOrder();
$row['processor'] = $orow->getProcessedBy()->getFullName();
// add crud urls // add crud urls
$row['meta']['update_url'] = $this->generateUrl($tier_params['edit_route'], ['id' => $row['id']]); $row['meta']['update_url'] = $this->generateUrl($tier_params['edit_route'], ['id' => $row['id']]);

5
src/Entity/User.php
View file

@ -238,6 +238,11 @@ class User implements AdvancedUserInterface, Serializable
return $this->last_name; return $this->last_name;
} }
public function getFullName()
{
return $this->first_name . ' ' . $this->last_name;
}
public function setContactNumber($num) public function setContactNumber($num)
{ {
$this->contact_num = $num; $this->contact_num = $num;

4
templates/job-order/list.html.twig
View file

@ -94,8 +94,8 @@
title: 'Status' title: 'Status'
}, },
{ {
field: 'owner', field: 'processor',
title: 'Owner' title: 'Processor'
}, },
{ {
field: 'Actions', field: 'Actions',