From 4cb346c2a8d930641d5af700630e6262226e30dd Mon Sep 17 00:00:00 2001 From: joan Date: Fri, 17 Dec 2021 12:40:23 +0100 Subject: [PATCH 1/2] fix(monitor): changed order to prevent row duplication Refs: 3458 --- modules/monitor/back/methods/sales-monitor/salesFilter.js | 6 +++--- modules/monitor/front/index/tickets/index.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/monitor/back/methods/sales-monitor/salesFilter.js b/modules/monitor/back/methods/sales-monitor/salesFilter.js index b5de38f60..1f1d4d88a 100644 --- a/modules/monitor/back/methods/sales-monitor/salesFilter.js +++ b/modules/monitor/back/methods/sales-monitor/salesFilter.js @@ -160,7 +160,7 @@ module.exports = Self => { stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.filter'); stmt = new ParameterizedSQL( `CREATE TEMPORARY TABLE tmp.filter - (INDEX (id)) + (PRIMARY KEY (id)) ENGINE = MEMORY SELECT t.id, @@ -221,7 +221,7 @@ module.exports = Self => { stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.clientGetDebt'); stmts.push(` CREATE TEMPORARY TABLE tmp.clientGetDebt - (INDEX (clientFk)) + (PRIMARY KEY (clientFk)) ENGINE = MEMORY SELECT DISTINCT clientFk FROM tmp.filter`); @@ -232,7 +232,7 @@ module.exports = Self => { stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.tickets'); stmt = new ParameterizedSQL(` CREATE TEMPORARY TABLE tmp.tickets - (INDEX (id)) + (PRIMARY KEY (id)) ENGINE = MEMORY SELECT f.*, r.risk AS debt FROM tmp.filter f diff --git a/modules/monitor/front/index/tickets/index.html b/modules/monitor/front/index/tickets/index.html index 7c0eb83da..a059e0685 100644 --- a/modules/monitor/front/index/tickets/index.html +++ b/modules/monitor/front/index/tickets/index.html @@ -2,7 +2,7 @@ vn-id="model" url="SalesMonitors/salesFilter" limit="20" - order="shippedDate DESC, preparationHour ASC, zoneLanding ASC, id"> + order="shippedDate DESC, theoreticalhour, id"> Date: Fri, 17 Dec 2021 13:09:00 +0100 Subject: [PATCH 2/2] refactor(monitor): limited width to the client and zone columns Refs: 3458 --- modules/monitor/front/index/tickets/index.html | 2 +- modules/monitor/front/index/tickets/style.scss | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/monitor/front/index/tickets/index.html b/modules/monitor/front/index/tickets/index.html index a059e0685..0d7f265f8 100644 --- a/modules/monitor/front/index/tickets/index.html +++ b/modules/monitor/front/index/tickets/index.html @@ -167,7 +167,7 @@ {{::ticket.state}} - +