From 88c5b6f8a6c620d08edbbd098fdcf4d5607ba81e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20S=C3=A1nchez?= <joan@verdnatura.es>
Date: Thu, 13 Aug 2020 08:23:55 +0200
Subject: [PATCH] Changed ticket problems min date

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

diff --git a/modules/ticket/back/methods/ticket/filter.js b/modules/ticket/back/methods/ticket/filter.js
index 801563b93c..61f2bd2674 100644
--- a/modules/ticket/back/methods/ticket/filter.js
+++ b/modules/ticket/back/methods/ticket/filter.js
@@ -241,9 +241,11 @@ module.exports = Self => {
             CREATE TEMPORARY TABLE tmp.ticketGetProblems 
                 (INDEX (ticketFk))
                 ENGINE = MEMORY
-                SELECT id ticketFk, clientFk, warehouseFk, shipped 
-                    FROM tmp.filter 
-                    WHERE alertLevel = 0 OR alertLevel IS NULL`);
+                SELECT f.id ticketFk, f.clientFk, f.warehouseFk, f.shipped 
+                    FROM tmp.filter f
+                        LEFT JOIN alertLevel al ON al.alertLevel = f.alertLevel
+                    WHERE (f.code = 'FREE' OR f.alertLevel IS NULL)
+                        AND f.shipped >= CURDATE()`);
         stmts.push('CALL ticketGetProblems()');
 
         stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.ticket');
diff --git a/modules/ticket/front/main/index.html b/modules/ticket/front/main/index.html
index bcb77cca5b..a21b28992a 100644
--- a/modules/ticket/front/main/index.html
+++ b/modules/ticket/front/main/index.html
@@ -2,7 +2,7 @@
     vn-id="model"
     url="Tickets/filter"
     limit="20"
-    order="shipped DESC, zoneHour ASC, zoneMinute ASC, clientFk">
+    order="shipped DESC, zoneHour DESC, zoneMinute DESC, clientFk">
 </vn-crud-model>
 <vn-portal slot="topbar">
     <vn-searchbar