From 3f1109aee30e11386bd34ae99119035ed32e9e13 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <jsanchezbarruguer@gmail.com>
Date: Fri, 29 May 2020 12:10:04 +0200
Subject: [PATCH] Test changes

---
 modules/ticket/back/methods/ticket/filter.js | 43 +++++++++++++++++++-
 modules/ticket/front/index/index.html        |  4 +-
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/modules/ticket/back/methods/ticket/filter.js b/modules/ticket/back/methods/ticket/filter.js
index a81f3794a3..a7c5455628 100644
--- a/modules/ticket/back/methods/ticket/filter.js
+++ b/modules/ticket/back/methods/ticket/filter.js
@@ -187,7 +187,7 @@ module.exports = Self => {
 
         stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.filter');
 
-        stmt = new ParameterizedSQL(
+        /*         stmt = new ParameterizedSQL(
             `CREATE TEMPORARY TABLE tmp.filter
                 (INDEX (id))
                 ENGINE = MEMORY
@@ -224,7 +224,46 @@ module.exports = Self => {
                     LEFT JOIN state st ON st.id = ts.stateFk
                     LEFT JOIN client c ON c.id = t.clientFk
                     LEFT JOIN worker wk ON wk.id = c.salesPersonFk
-                    LEFT JOIN account.user u ON u.id = wk.userFk`);
+                    LEFT JOIN account.user u ON u.id = wk.userFk`); */
+        stmt = new ParameterizedSQL(
+            `CREATE TEMPORARY TABLE tmp.filter
+                (INDEX (id))
+                ENGINE = MEMORY
+                SELECT id, shipped, nickname, refFk, routeFk, warehouseFk
+                (SELECT
+                    t.id,
+                    t.shipped,
+                    t.nickname,
+                    t.refFk,
+                    t.routeFk,
+                    t.warehouseFk,
+                    t.clientFk,
+                    a.provinceFk,
+                    p.name AS province,
+                    w.name AS warehouse,
+                    am.name AS agencyMode,
+                    am.id AS agencyModeFk,
+                    st.name AS state,
+                    wk.lastName AS salesPerson,
+                    ts.stateFk as stateFk,
+                    ts.alertLevel as alertLevel,
+                    ts.code as alertLevelCode,
+                    u.nickname userNickname,
+                    c.salesPersonFk,
+                    z.hour zoneLanding,
+                    HOUR(z.hour) zoneHour,
+                    MINUTE(z.hour) zoneMinute
+                FROM ticket t
+                    LEFT JOIN zone z ON z.id = t.zoneFk
+                    LEFT JOIN address a ON a.id = t.addressFk
+                    LEFT JOIN province p ON p.id = a.provinceFk
+                    LEFT JOIN warehouse w ON w.id = t.warehouseFk
+                    LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
+                    LEFT JOIN ticketState ts ON ts.ticketFk = t.id
+                    LEFT JOIN state st ON st.id = ts.stateFk
+                    LEFT JOIN client c ON c.id = t.clientFk
+                    LEFT JOIN worker wk ON wk.id = c.salesPersonFk
+                    LEFT JOIN account.user u ON u.id = wk.userFk)`);
 
         if (args.orderFk) {
             stmt.merge({
diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html
index 150dcde8f7..a10ec6b069 100644
--- a/modules/ticket/front/index/index.html
+++ b/modules/ticket/front/index/index.html
@@ -15,11 +15,11 @@
                 </vn-th>
                 <vn-th></vn-th>
                 <vn-th field="id" number>Id</vn-th>
-                <vn-th field="salesPersonFk" class="expendable">Salesperson</vn-th>
+                <vn-th prefix="t" field="salesPersonFk" class="expendable">Salesperson</vn-th>
                 <vn-th field="shipped">Date</vn-th>
                 <vn-th>Hour</vn-th>
                 <vn-th field="nickname">Alias</vn-th>
-                <vn-th field="provinceFk" class="expendable">Province</vn-th>
+                <vn-th field="province" class="expendable">Province</vn-th>
                 <vn-th field="stateFk" >State</vn-th>
                 <vn-th field="agencyModeFk">Agency</vn-th>
                 <vn-th field="warehouse">Warehouse</vn-th>