verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 55 Releases Wiki Activity

refs #4550 collection-label fixes
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Guillermo Bonet 2022-11-29 08:22:32 +01:00
parent 7121dcb25c
commit b262b29627
5 changed files with 40 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
print/templates/reports/collection-label/assets/css/style.css
View File

@ -1,6 +1,6 @@
html { html {
font-family: "Roboto"; font-family: "Roboto";
margin-top: -7px; margin-top: -6px;
} }
* { * {
box-sizing: border-box; box-sizing: border-box;
@ -18,6 +18,7 @@ html {
} }
#nickname { #nickname {
font-size: 22px; font-size: 22px;
max-width: 50px;
} }
#agencyDescripton { #agencyDescripton {
font-size: 32px; font-size: 32px;

67
print/templates/reports/collection-label/collection-label.html
View File

@ -1,35 +1,32 @@
<report-body v-bind="$props"> <!DOCTYPE html>
<template v-slot:header> <html>
<span></span> <body>
</template> <table v-for="labelData in labelsData" style="break-before: page">
<table v-for="labelData in labelsData"> <tbody>
<tbody> <tr>
<tr> <td rowspan="6"><span id="vertical">{{labelData.levelV}}</span></td>
<td rowspan="6"><span id="vertical">{{labelData.levelV}}</span></td> <td id="ticketFk">{{labelData.ticketFk}} / {{labelData.clientFk}}</td>
<td id="ticketFk">{{labelData.ticketFk}} ⬸ {{labelData.clientFk}}</td> <td colspan="2" id="shipped">{{labelData.shipped}}</td>
<td colspan="2" id="shipped">{{labelData.shipped}}</td> </tr>
</tr> <tr>
<tr> <td rowspan="3"><div v-html="getBarcode(labelData.ticketFk)" id="barcode"></div></td>
<td rowspan="3"><div v-html="getBarcode(labelData.ticketFk)" id="barcode"></div></td> <td class="outline">{{labelData.workerCode}}</td>
<td class="outline">{{labelData.workerCode}}</td> </tr>
</tr> <tr>
<tr> <td class="outline">{{labelData.labelCount}}</td>
<td class="outline">{{labelData.labelCount}}</td> </tr>
</tr> <tr>
<tr> <td class="outline">{{labelData.value}}</td>
<td class="outline">{{labelData.size}}</td> </tr>
</tr> <tr>
<tr> <td><div id="agencyDescripton">{{labelData.agencyDescription}}</div></td>
<td><div id="agencyDescripton">{{labelData.agencyDescription}}</div></td> <td id="bold">{{labelData.lineCount}}</td>
<td id="bold">{{labelData.lineCount}}</td> </tr>
</tr> <tr>
<tr> <td id="nickname">{{labelData.nickName}}</td>
<td id="nickname">{{labelData.nickName}}</td> <td id="bold">{{labelData.agencyHour}}</td>
<td id="bold">{{labelData.agencyHour}}</td> </tr>
</tr> </tbody>
</tbody> </table>
</table> </body>
<template v-slot:footer> </html>
<span></span>
</template>
</report-body>

2
print/templates/reports/collection-label/collection-label.js
View File

@ -40,7 +40,7 @@ module.exports = {
format: 'code128', format: 'code128',
displayValue: false, displayValue: false,
width: 3.8, width: 3.8,
height: 110, height: 115,
}); });
return xmlSerializer.serializeToString(svgNode); return xmlSerializer.serializeToString(svgNode);
}, },

4
print/templates/reports/collection-label/options.json
View File

@ -2,8 +2,8 @@
"width": "10.4cm", "width": "10.4cm",
"height": "4.8cm", "height": "4.8cm",
"margin": { "margin": {
"top": "0cm", "top": "0.2cm",
"right": "0.5cm", "right": "0.6cm",
"bottom": "0cm", "bottom": "0cm",
"left": "0cm" "left": "0cm"
}, },

6
print/templates/reports/collection-label/sql/labelsData.sql
View File

@ -1,18 +1,18 @@
SELECT c.itemPackingTypeFk, SELECT c.itemPackingTypeFk,
CONCAT(tc.collectionFk, ' ', LEFT(cc.code, 4)) color, CONCAT(tc.collectionFk, ' ', LEFT(cc.code, 4)) color,
CONCAT(tc.collectionFk, ' ', SUBSTRING('ABCDEFGH',tc.wagon, 1), '-', tc.`level`) levelV, CONCAT(tc.collectionFk, ' ', SUBSTRING('ABCDEFGH', tc.wagon, 1), '-', tc.`level`) levelV,
tc.ticketFk, tc.ticketFk,
LEFT(COALESCE(et.description, zo.name, am.name),12) agencyDescription, LEFT(COALESCE(et.description, zo.name, am.name),12) agencyDescription,
am.name, am.name,
t.clientFk, t.clientFk,
CONCAT(CAST(SUM(sv.volume) AS DECIMAL(5, 2)), 'm³') m3 , CONCAT(CAST(SUM(sv.volume) AS DECIMAL(5, 2)), 'm³') m3 ,
CAST(IF(ic.code = 'plant', CONCAT(MAX(i.`size`),' cm'), COUNT(*)) AS CHAR) size, IF(ic.code = 'plant', CONCAT(MAX(i.`size`),' cm'), CONCAT(CAST(SUM(sv.volume) AS DECIMAL(5, 2)), 'm³')) `value`,
w.code workerCode, w.code workerCode,
tt.labelCount, tt.labelCount,
IF(HOUR(t.shipped), TIME_FORMAT(t.shipped, '%H:%i'), TIME_FORMAT(zo.`hour`, '%H:%i')) agencyHour, IF(HOUR(t.shipped), TIME_FORMAT(t.shipped, '%H:%i'), TIME_FORMAT(zo.`hour`, '%H:%i')) agencyHour,
DATE_FORMAT(t.shipped, '%d/%m/%y') shipped, DATE_FORMAT(t.shipped, '%d/%m/%y') shipped,
COUNT(*) lineCount, COUNT(*) lineCount,
t.nickName LEFT(t.nickName, 29) nickName
FROM vn.ticket t FROM vn.ticket t
JOIN vn.ticketCollection tc ON tc.ticketFk = t.id JOIN vn.ticketCollection tc ON tc.ticketFk = t.id
JOIN vn.collection c ON c.id = tc.collectionFk JOIN vn.collection c ON c.id = tc.collectionFk