refs #4550 collection-label more fixes

print/common/css/misc.css

@@ -49,4 +49,10 @@
 
 .page-break-after {
     page-break-after: always;
+}
+
+.ellipsize {
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
 }

print/templates/reports/collection-label/assets/css/style.css

@@ -9,7 +9,7 @@ html {
 }
 #vertical {
 	writing-mode: vertical-rl;
-	height: 226px;
+	height: 240px;
 	margin-left: -13px;
 }
 .outline {

print/templates/reports/collection-label/collection-label.html

@@ -4,27 +4,31 @@
         <table v-for="labelData in labelsData" style="break-before: page">
             <tbody>
                 <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>
                     <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>
-                    <td class="outline">{{labelData.labelCount}}</td>
+                    <td class="outline">{{labelData.labelCount ? labelData.labelCount : 0}}</td>
                 </tr>
                 <tr>
-                    <td class="outline">{{labelData.value}}</td>
+                    <td class="outline">{{labelData.code == 'plant' ? labelData.size + 'cm' : labelData.volume + 'm³'}}</td>
                 </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>
-                    <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>
             </tbody>
         </table>

print/templates/reports/collection-label/options.json

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

print/templates/reports/collection-label/sql/labelsData.sql

@@ -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,
 		t.clientFk,
-		CONCAT(CAST(SUM(sv.volume) AS DECIMAL(5, 2)), 'm³') m3 ,
+		CAST(SUM(sv.volume) AS DECIMAL(5, 2)) volume,
-		IF(ic.code = 'plant', CONCAT(MAX(i.`size`),' cm'), CONCAT(CAST(SUM(sv.volume) AS DECIMAL(5, 2)), 'm³')) `value`,
+		MAX(i.`size`) `size`,
+		ic.code,
 		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,
-		COUNT(*) lineCount,
+		t.nickName,
-		LEFT(t.nickName, 29) nickName
+		tt.labelCount,
+		COUNT(*) lineCount
 	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`
 			AND cc.wagon = tc.wagon
 			AND cc.trainFk = c.trainFk
@@ -24,12 +26,12 @@ SELECT c.itemPackingTypeFk,
 		JOIN vn.item i ON i.id = s.itemFk
 		JOIN vn.itemType it ON it.id = i.typeFk
 		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
 		LEFT JOIN vn.ticketTrolley tt ON tt.ticket = t.id
 		LEFT JOIN vn.`zone` zo ON t.zoneFk = zo.id
 		LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk
 		LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk	
-	WHERE tc.ticketFk IN (?)
+	WHERE t.id IN (?)
 	GROUP BY t.id
 	ORDER BY cc.`code`;