verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

Merge pull request 'added agency and route columns to client.summary tickets' (#697) from 3025-client_summary_additions into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #697
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
This commit is contained in:
Joan Sanchez 2021-07-20 08:55:56 +00:00
parent 7563287e58 3080936963
commit ffa17b21b2
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/client/front/summary/index.html
View File

@ -293,6 +293,8 @@
<vn-tr>
<vn-th field="id" number>Id</vn-th>
<vn-th field="nickname" expand>Nickname</vn-th>
<vn-th field="agencyModeFk" expand>Agency</vn-th>
<vn-th field="routeFk" expand>Route</vn-th>
<vn-th field="packages" shrink>Packages</vn-th>
<vn-th field="shipped" shrink-date>Date</vn-th>
<vn-th>State</vn-th>
@ -313,6 +315,17 @@
{{::ticket.nickname}}
</span>
</vn-td>
<vn-td shrink>
{{::ticket.agencyMode.name}}
</vn-td>
<vn-td shrink>
<span
title="{{::ticket.route}}"
vn-click-stop="routeDescriptor.show($event, ticket.routeFk)"
class="link">
{{::ticket.routeFk}}
</span>
</vn-td>
<vn-td shrink>
{{::ticket.packages}}
</vn-td>
@ -371,6 +384,9 @@
<vn-client-descriptor-popover
vn-id="clientDescriptor">
</vn-client-descriptor-popover>
<vn-route-descriptor-popover
vn-id="routeDescriptor">
</vn-route-descriptor-popover>
<vn-worker-descriptor-popover
vn-id="workerDescriptor">
</vn-worker-descriptor-popover>

8
modules/client/front/summary/index.js
View File

@ -22,7 +22,13 @@ class Controller extends Summary {
scope: {
fields: ['id']
}
}
},
{
relation: 'agencyMode',
scope: {
fields: ['name']
}
},
]
};
}