Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Alex Moreno 2021-12-20 09:26:54 +01:00
commit 6426a629e0
3 changed files with 13 additions and 5 deletions

View File

@ -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

View File

@ -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">
</vn-crud-model>
<vn-portal slot="topbar">
<vn-searchbar
@ -167,7 +167,7 @@
{{::ticket.state}}
</span>
</td>
<td>
<td name="zone">
<span
title="{{::ticket.zoneName}}"
vn-click-stop="zoneDescriptor.show($event, ticket.zoneFk)"

View File

@ -36,4 +36,12 @@ vn-monitor-sales-tickets {
.highRisk i {
color: $color-alert
}
td[name="nickname"] {
max-width: 200px
}
td[name="zone"] {
max-width: 150px
}
}