From 8d6fdc4b2f6ccb5e1421ab0cfb507918654dfc23 Mon Sep 17 00:00:00 2001
From: Gerard <gerard@verdnatura.es>
Date: Thu, 21 Feb 2019 10:06:38 +0100
Subject: [PATCH] added envialia and solved problems with worker popover

---
 .../ticket/back/methods/expedition/filter.js   | 18 ++++++------------
 modules/ticket/front/expedition/index.html     |  5 ++++-
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/modules/ticket/back/methods/expedition/filter.js b/modules/ticket/back/methods/expedition/filter.js
index b8c634553..74c542806 100644
--- a/modules/ticket/back/methods/expedition/filter.js
+++ b/modules/ticket/back/methods/expedition/filter.js
@@ -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'));
 
diff --git a/modules/ticket/front/expedition/index.html b/modules/ticket/front/expedition/index.html
index 1b713a9e6..d10a4bdcb 100644
--- a/modules/ticket/front/expedition/index.html
+++ b/modules/ticket/front/expedition/index.html
@@ -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"