From 884286015f6615e218ec385f1b17e8f6fdb0602c Mon Sep 17 00:00:00 2001 From: Pau Navarro Date: Mon, 28 Nov 2022 14:01:38 +0100 Subject: [PATCH] fix labels not working on test data refs #4732 @2h --- .../reports/previa-label/assets/css/style.css | 11 ++++++++++- .../templates/reports/previa-label/previa-label.html | 5 ++++- print/templates/reports/previa-label/previa-label.js | 8 ++------ print/templates/reports/previa-label/sql/sector.sql | 10 +++++----- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/print/templates/reports/previa-label/assets/css/style.css b/print/templates/reports/previa-label/assets/css/style.css index 1101604b9..3b096e034 100644 --- a/print/templates/reports/previa-label/assets/css/style.css +++ b/print/templates/reports/previa-label/assets/css/style.css @@ -41,7 +41,7 @@ color: #FFF } -.data .color, +.data .sector, .data .producer { text-transform: uppercase; text-align: right; @@ -51,6 +51,15 @@ overflow: hidden; } +.data .sector-sm { + text-transform: uppercase; + text-align: right; + font-size: 1.2em; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; +} + .data .producer { text-justify: inter-character; } diff --git a/print/templates/reports/previa-label/previa-label.html b/print/templates/reports/previa-label/previa-label.html index 46ca0239c..df662e2d7 100644 --- a/print/templates/reports/previa-label/previa-label.html +++ b/print/templates/reports/previa-label/previa-label.html @@ -11,7 +11,10 @@
PREVIA
-
{{sector.description}}
+
+ {{sector.description}} +
+
{{sector.description}}
Ticket #{{previa.ticketFk}}
diff --git a/print/templates/reports/previa-label/previa-label.js b/print/templates/reports/previa-label/previa-label.js index a598e0179..c5146bfd5 100755 --- a/print/templates/reports/previa-label/previa-label.js +++ b/print/templates/reports/previa-label/previa-label.js @@ -11,14 +11,10 @@ module.exports = { this.barcode = await this.getBarcodeBase64(this.id); if (!this.previa) - throw new Error('Something went wrong'); + throw new Error('Something went wrong - previa'); if (!this.sector) - throw new Error('Something went wrong'); - }, - - computed: { - + throw new Error('Something went wrong - sector'); }, methods: { fetchPrevia(id) { diff --git a/print/templates/reports/previa-label/sql/sector.sql b/print/templates/reports/previa-label/sql/sector.sql index d10a9a630..875874b0e 100644 --- a/print/templates/reports/previa-label/sql/sector.sql +++ b/print/templates/reports/previa-label/sql/sector.sql @@ -1,9 +1,9 @@ select - s.description + `s`.`description` from - vn.collection c + `vn`.`saleGroup` sg join - vn.sector s + `vn`.`sector` s on - s.id = c.sectorFk -where c.id = ? \ No newline at end of file + `sg`.`sectorFk` = `s`.`id` +where `sg`.`id` = ? \ No newline at end of file