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

Merge pull request 'refs #4550 collection-label fixes' (!1184) from #4550-HOTFIX-collection-label into master
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #1184
This commit is contained in:
Guillermo Bonet 2022-11-29 11:23:27 +00:00
parent 7121dcb25c 2faacb169a
commit a9b4526493
6 changed files with 65 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
print/common/css/misc.css
View File

@ -50,3 +50,9 @@
.page-break-after { .page-break-after {
page-break-after: always; page-break-after: always;
} }
.ellipsize {
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}

5
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;
@ -9,7 +9,7 @@ html {
} }
#vertical { #vertical {
writing-mode: vertical-rl; writing-mode: vertical-rl;
height: 226px; height: 240px;
margin-left: -13px; margin-left: -13px;
} }
.outline { .outline {
@ -18,6 +18,7 @@ html {
} }
#nickname { #nickname {
font-size: 22px; font-size: 22px;
max-width: 50px;
} }
#agencyDescripton { #agencyDescripton {
font-size: 32px; font-size: 32px;

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

@ -1,35 +1,36 @@
<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" class="ellipsize">
<td id="ticketFk">{{labelData.ticketFk}} ⬸ {{labelData.clientFk}}</td> {{labelData.collectionFk ? `${labelData.collectionFk} ~ ${labelData.wagon}-${labelData.level}` : '-'.repeat(23)}}
<td colspan="2" id="shipped">{{labelData.shipped}}</td> </span></td>
<td id="ticketFk">
{{labelData.clientFk ? `${labelData.ticketFk} « ${labelData.clientFk}` : labelData.ticketFk}}
</td>
<td colspan="2" id="shipped">{{labelData.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 ? labelData.workerCode : '---'}}</td>
</tr> </tr>
<tr> <tr>
<td class="outline">{{labelData.labelCount}}</td> <td class="outline">{{labelData.labelCount ? labelData.labelCount : 0}}</td>
</tr> </tr>
<tr> <tr>
<td class="outline">{{labelData.size}}</td> <td class="outline">{{labelData.code == 'plant' ? labelData.size + 'cm' : labelData.volume + 'm³'}}</td>
</tr> </tr>
<tr> <tr>
<td><div id="agencyDescripton">{{labelData.agencyDescription}}</div></td> <td><div id="agencyDescripton" class="ellipsize">{{labelData.agencyDescription}}</div></td>
<td id="bold">{{labelData.lineCount}}</td> <td id="bold">{{labelData.lineCount ? labelData.lineCount : 0}}</td>
</tr> </tr>
<tr> <tr>
<td id="nickname">{{labelData.nickName}}</td> <td id="nickname" class="ellipsize">{{labelData.nickName ? labelData.nickName : '---'}}</td>
<td id="bold">{{labelData.agencyHour}}</td> <td id="bold">{{labelData.shipped ? labelData.shippedHour : labelData.zoneHour}}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<template v-slot:footer> </body>
<span></span> </html>
</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.3cm",
"right": "0.5cm", "right": "0.6cm",
"bottom": "0cm", "bottom": "0cm",
"left": "0cm" "left": "0cm"
}, },

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

@ -1,21 +1,23 @@
SELECT c.itemPackingTypeFk, SELECT tc.collectionFk,
CONCAT(tc.collectionFk, ' ', LEFT(cc.code, 4)) color, SUBSTRING('ABCDEFGH', tc.wagon, 1) wagon,
CONCAT(tc.collectionFk, ' ', SUBSTRING('ABCDEFGH',tc.wagon, 1), '-', tc.`level`) levelV, tc.`level`,
tc.ticketFk, t.id ticketFk,
LEFT(COALESCE(et.description, zo.name, am.name),12) agencyDescription, COALESCE(et.description, zo.name, am.name) agencyDescription,
am.name, am.name,
t.clientFk, t.clientFk,
CONCAT(CAST(SUM(sv.volume) AS DECIMAL(5, 2)), 'm³') m3 , CAST(SUM(sv.volume) AS DECIMAL(5, 2)) volume,
CAST(IF(ic.code = 'plant', CONCAT(MAX(i.`size`),' cm'), COUNT(*)) AS CHAR) size, MAX(i.`size`) `size`,
ic.code,
w.code workerCode, w.code workerCode,
tt.labelCount, TIME_FORMAT(t.shipped, '%H:%i') shippedHour,
IF(HOUR(t.shipped), TIME_FORMAT(t.shipped, '%H:%i'), TIME_FORMAT(zo.`hour`, '%H:%i')) agencyHour, TIME_FORMAT(zo.`hour`, '%H:%i') zoneHour,
DATE_FORMAT(t.shipped, '%d/%m/%y') shipped, DATE_FORMAT(t.shipped, '%d/%m/%y') shipped,
COUNT(*) lineCount, t.nickName,
t.nickName tt.labelCount,
COUNT(*) lineCount
FROM vn.ticket t FROM vn.ticket t
JOIN vn.ticketCollection tc ON tc.ticketFk = t.id LEFT JOIN vn.ticketCollection tc ON tc.ticketFk = t.id
JOIN vn.collection c ON c.id = tc.collectionFk LEFT JOIN vn.collection c ON c.id = tc.collectionFk
LEFT JOIN vn.collectionColors cc ON cc.shelve = tc.`level` LEFT JOIN vn.collectionColors cc ON cc.shelve = tc.`level`
AND cc.wagon = tc.wagon AND cc.wagon = tc.wagon
AND cc.trainFk = c.trainFk AND cc.trainFk = c.trainFk
@ -24,12 +26,12 @@ SELECT c.itemPackingTypeFk,
JOIN vn.item i ON i.id = s.itemFk JOIN vn.item i ON i.id = s.itemFk
JOIN vn.itemType it ON it.id = i.typeFk JOIN vn.itemType it ON it.id = i.typeFk
JOIN vn.itemCategory ic ON ic.id = it.categoryFk JOIN vn.itemCategory ic ON ic.id = it.categoryFk
JOIN vn.worker w ON w.id = c.workerFk LEFT JOIN vn.worker w ON w.id = c.workerFk
JOIN vn.agencyMode am ON am.id = t.agencyModeFk JOIN vn.agencyMode am ON am.id = t.agencyModeFk
LEFT JOIN vn.ticketTrolley tt ON tt.ticket = t.id LEFT JOIN vn.ticketTrolley tt ON tt.ticket = t.id
LEFT JOIN vn.`zone` zo ON t.zoneFk = zo.id LEFT JOIN vn.`zone` zo ON t.zoneFk = zo.id
LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk
LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk
WHERE tc.ticketFk IN (?) WHERE t.id IN (?)
GROUP BY t.id GROUP BY t.id
ORDER BY cc.`code`; ORDER BY cc.`code`;