verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 54 Releases Wiki Activity

Changed ticket problems min date
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Joan Sanchez 2020-08-13 08:23:55 +02:00
parent de1a70aee7
commit 88c5b6f8a6
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/ticket/back/methods/ticket/filter.js
View File

@ -241,9 +241,11 @@ module.exports = Self => {
CREATE TEMPORARY TABLE tmp.ticketGetProblems CREATE TEMPORARY TABLE tmp.ticketGetProblems
(INDEX (ticketFk)) (INDEX (ticketFk))
ENGINE = MEMORY ENGINE = MEMORY
SELECT id ticketFk, clientFk, warehouseFk, shipped SELECT f.id ticketFk, f.clientFk, f.warehouseFk, f.shipped
FROM tmp.filter FROM tmp.filter f
WHERE alertLevel = 0 OR alertLevel IS NULL`); 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('CALL ticketGetProblems()');
stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.ticket'); stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.ticket');

2
modules/ticket/front/main/index.html
View File

@ -2,7 +2,7 @@
vn-id="model" vn-id="model"
url="Tickets/filter" url="Tickets/filter"
limit="20" limit="20"
order="shipped DESC, zoneHour ASC, zoneMinute ASC, clientFk"> order="shipped DESC, zoneHour DESC, zoneMinute DESC, clientFk">
</vn-crud-model> </vn-crud-model>
<vn-portal slot="topbar"> <vn-portal slot="topbar">
<vn-searchbar <vn-searchbar