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

added envialia and solved problems with worker popover
gitea/salix/test This commit looks good Details

This commit is contained in:
Gerard 2019-02-21 10:06:38 +01:00
parent 444d531162
commit 8d6fdc4b2f
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/ticket/back/methods/expedition/filter.js
View File

@ -25,23 +25,17 @@ module.exports = Self => {
Self.filter = async filter => {
const stmt = new ParameterizedSQL(
`SELECT
e.id,
e.ticketFk,
e.isBox,
i1.name namePackage,
e.counter,
e.checked,
i2.name nameBox,
e.itemFk,
u.nickname userNickname,
u.id userId,
e.created
e.id, e.ticketFk, e.isBox,
i1.name namePackage, e.counter,
e.checked, i2.name nameBox,
e.itemFk, u.nickname userNickname,
u.id userId, e.created, e.externalId
FROM
vn.expedition e
LEFT JOIN vn.item i2 ON i2.id = e.itemFk
INNER JOIN vn.item i1 ON i1.id = e.isBox
LEFT JOIN vn.worker w ON w.id = e.workerFk
JOIN account.user u ON u.id = w.id
JOIN account.user u ON u.id = w.userFk
`);
stmt.merge(Self.buildSuffix(filter, 'e'));

5
modules/ticket/front/expedition/index.html
View File

@ -13,6 +13,8 @@
<vn-thead>
<vn-tr>
<vn-th></vn-th>
<vn-th field="itemFk" number>Expedition</vn-th>
<vn-th field="itemFk" number>Envialia</vn-th>
<vn-th field="itemFk" number>Item</vn-th>
<vn-th field="name">Name</vn-th>
<vn-th field="isBox">Package type</vn-th>
@ -30,6 +32,8 @@
vn-tooltip="Delete expedition">
</vn-icon-button>
</vn-td>
<vn-td number>{{expedition.id | zeroFill:6}}</vn-td>
<vn-td number>{{expedition.externalId | zeroFill:6}}</vn-td>
<vn-td number>
<span
ng-class="{link: expedition.itemFk}"
@ -41,7 +45,6 @@
<vn-td>{{::expedition.nameBox}}</vn-td>
<vn-td number>{{::expedition.counter}}</vn-td>
<vn-td number>{{::expedition.checked}}</vn-td>
<vn-td>{{::expedition.userNickname}}</vn-td>
<vn-td expand>
<span
class="link"