Merge pull request 'refs #4204 Added param URL labelCount and' (!1204) from 4204-collection-label-labelCount into dev

Reviewed-on: #1204
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

modules/ticket/back/methods/ticket/collectionLabel.js

@@ -11,7 +11,12 @@ module.exports = Self => {
                 required: true,
                 description: 'The ticket id',
                 http: {source: 'path'}
-            },
+            }, {
+                arg: 'labelCount',
+                type: 'number',
+                required: false,
+                description: 'The number of labels'
+            }
         ],
         returns: [
             {

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

@@ -13,11 +13,12 @@ html {
 	font-size: 29px;
 	margin-left: -13px;
 }
-.outline {
+#outline {
 	border: 1px solid black;
 	padding: 5px;
 	height: 37px;
 	width: 100px;
+	max-width: 100px;
 }
 #nickname {
 	font-size: 22px;

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

@@ -12,13 +12,13 @@
                 </tr>
                 <tr>
                     <td rowspan="3"><div v-html="getBarcode(labelData.ticketFk)" id="barcode"></div></td>
-                    <td class="outline">{{labelData.workerCode || '---'}}</td>
+                    <td id="outline" class="ellipsize">{{labelData.workerCode || '---'}}</td>
                 </tr>
                 <tr>
-                    <td class="outline">{{labelData.labelCount || 0}}</td>
+                    <td id="outline" class="ellipsize">{{labelCount || labelData.labelCount || 0}}</td>
                 </tr>
                 <tr>
-                    <td class="outline">{{labelData.code == 'V' ? (labelData.size || 0) + 'cm' : (labelData.volume || 0) + 'm³'}}</td>
+                    <td id="outline" class="ellipsize">{{labelData.code == 'V' ? (labelData.size || 0) + 'cm' : (labelData.volume || 0) + 'm³'}}</td>
                 </tr>
                 <tr>
                     <td><div id="agencyDescripton" class="ellipsize">{{labelData.agencyDescription ? labelData.agencyDescription.toUpperCase() : '---'}}</div></td>

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

@@ -11,6 +11,11 @@ module.exports = {
             type: Number,
             required: true,
             description: 'The ticket or collection id'
+        },
+        labelCount: {
+            type: Number,
+            required: false,
+            description: 'The number of labels'
         }
     },
     async serverPrefetch() {

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

@@ -12,8 +12,8 @@ SELECT c.itemPackingTypeFk code,
 		TIME_FORMAT(t.shipped, '%H:%i') shippedHour,
 		TIME_FORMAT(zo.`hour`, '%H:%i') zoneHour,
 		DATE_FORMAT(t.shipped, '%d/%m/%y') shipped,
-		t.nickName,
 		tt.labelCount,
+		t.nickName,
 		COUNT(*) lineCount
 	FROM vn.ticket t
 		JOIN vn.ticketCollection tc ON tc.ticketFk = t.id