From 6cedee61226d7ade77ed4a1ec17dc5344af3b20b Mon Sep 17 00:00:00 2001
From: JuliaBD <juliabuysingdamste@gmail.com>
Date: Mon, 10 Jul 2023 10:45:43 +0200
Subject: [PATCH 1/4] inspect - offline inspection - add amazon matching
 constraints (data-labels, 4mm distance between headers, 'Page' labels) +
 version to 4.0.11

---
 package.json                             |  2 +-
 src/components/svg/svg-category.vue      |  2 +-
 src/components/svg/svg-checkbox.vue      |  6 ++++++
 src/components/svg/svg-fieldset.vue      |  5 +----
 src/components/svg/svg-label.vue         |  2 +-
 src/components/svg/svg-number-box.vue    |  2 +-
 src/components/svg/svg-number.vue        |  1 +
 src/components/svg/svg-print-corners.vue |  9 +++++++++
 src/components/svg/svg-select.vue        |  4 ++++
 src/components/svg/svg-text.vue          |  2 ++
 src/mixins/svgMixin.js                   |  8 ++++----
 src/router/views/new.vue                 | 11 ++++++++++-
 12 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index b01438a6..b9e7cffa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "beep-ui",
-  "version": "4.0.10",
+  "version": "4.0.11",
   "private": true,
   "scripts": {
     "build": "cross-env NODE_ENV=production vue-cli-service build",
diff --git a/src/components/svg/svg-category.vue b/src/components/svg/svg-category.vue
index 1259ca37..bbe1c566 100644
--- a/src/components/svg/svg-category.vue
+++ b/src/components/svg/svg-category.vue
@@ -42,7 +42,7 @@ export default {
       // if page nr is too high (i.e. if nextPage was called but no items are printed afterwards, such that the svg contains 1 empty page)
       // set the max page nr as pagenr - 1 (in the svg the last page will then be omitted)
       if (
-        (this.absoluteY - this.maxRowHeight) / this.pageHeight <
+        (this.absoluteY + this.maxRowHeight) / this.pageHeight <
         this.svgPageNr - 1
       ) {
         setTimeout(() => {
diff --git a/src/components/svg/svg-checkbox.vue b/src/components/svg/svg-checkbox.vue
index 5152548f..2ef28874 100644
--- a/src/components/svg/svg-checkbox.vue
+++ b/src/components/svg/svg-checkbox.vue
@@ -2,6 +2,7 @@
   <rect
     data-type="checkbox"
     :data-category-id="categoryId"
+    :data-label="label"
     :data-parent-category-id="parentId"
     :x="x"
     :y="y"
@@ -32,6 +33,11 @@ export default {
       required: false,
       default: null,
     },
+    label: {
+      type: String,
+      required: false,
+      default: '',
+    },
     parentId: {
       type: [String, Number],
       required: false,
diff --git a/src/components/svg/svg-fieldset.vue b/src/components/svg/svg-fieldset.vue
index 41e3886d..e1df6092 100644
--- a/src/components/svg/svg-fieldset.vue
+++ b/src/components/svg/svg-fieldset.vue
@@ -158,10 +158,7 @@ export default {
         if (fullRowItem || this.svgColumnCounter >= this.columnsPerRow) {
           var columnCounter = 1
           // for new row, set Y (height so far) as previous Y + row height of previous row
-          this.$store.commit(
-            'inspections/setY',
-            this.svgY + this.svgRowHeight - (fullRowItem ? 1 : 0)
-          )
+          this.$store.commit('inspections/setY', this.svgY + this.svgRowHeight)
           // reset row height to current item height for new row
           this.$store.commit('inspections/setRowHeight', itemHeight)
         } else {
diff --git a/src/components/svg/svg-label.vue b/src/components/svg/svg-label.vue
index 769e0faa..c9b2b811 100644
--- a/src/components/svg/svg-label.vue
+++ b/src/components/svg/svg-label.vue
@@ -36,7 +36,7 @@ export default {
   },
   data() {
     return {
-      maxLabelLength: 34,
+      maxLabelLength: 32,
     }
   },
 }
diff --git a/src/components/svg/svg-number-box.vue b/src/components/svg/svg-number-box.vue
index 9f141ce4..eb1b307a 100644
--- a/src/components/svg/svg-number-box.vue
+++ b/src/components/svg/svg-number-box.vue
@@ -17,7 +17,7 @@
 import { svgData } from '@mixins/svgMixin'
 
 export default {
-  // TODO remove whole component if single-digits won't be used for sure
+  // TODO remove whole component if single-digits won't be used for sure, else add :data-label="label" + label prop
   mixins: [svgData],
   props: {
     x: {
diff --git a/src/components/svg/svg-number.vue b/src/components/svg/svg-number.vue
index 1f7e6f64..4d7839b6 100644
--- a/src/components/svg/svg-number.vue
+++ b/src/components/svg/svg-number.vue
@@ -10,6 +10,7 @@
       <rect
         :data-type="inputType === 'date' ? 'text' : 'number'"
         :data-category-id="inputType === 'date' ? 'date-field' : ''"
+        :data-label="label"
         :data-parent-category-id="position.id"
         :x="x + prependOffset + 'mm'"
         :y="y + 2 + 'mm'"
diff --git a/src/components/svg/svg-print-corners.vue b/src/components/svg/svg-print-corners.vue
index ad9d4c1d..ed937899 100644
--- a/src/components/svg/svg-print-corners.vue
+++ b/src/components/svg/svg-print-corners.vue
@@ -18,6 +18,7 @@
       </text>
       <rect
         data-type="number"
+        data-label="Print ID"
         :data-parent-category-id="'svgid'"
         :x="pageWidth - (xMargin + 37) + 'mm'"
         :y="(pageNumber - 1) * pageHeight + 7.5 + 'mm'"
@@ -34,8 +35,16 @@
       >
         {{ checklistSvgId }}
       </text>
+      <text
+        :x="pageWidth - (xMargin + 18.8) + 'mm'"
+        :y="(pageNumber - 1) * pageHeight + 7 + 'mm'"
+        :style="svgLabel"
+      >
+        {{ 'Page' }}
+      </text>
       <rect
         data-type="number"
+        data-label="Page"
         :data-parent-category-id="'pagenr'"
         :data-category-id="pageNumber"
         :x="pageWidth - (xMargin + 18.8) + 'mm'"
diff --git a/src/components/svg/svg-select.vue b/src/components/svg/svg-select.vue
index 3019bbe1..6a9ed2f5 100644
--- a/src/components/svg/svg-select.vue
+++ b/src/components/svg/svg-select.vue
@@ -11,6 +11,7 @@
           :x="x + item.depth * checkBoxSpace + 'mm'"
           :y="y + 2 + index * checkBoxSpace + 'mm'"
           :category-id="item.id"
+          :label="label"
           :parent-id="item.parent_id"
         />
         <text
@@ -29,6 +30,7 @@
     <g v-else-if="flattenedItems.length > maxNrOfItems">
       <rect
         data-type="text"
+        :data-label="label"
         :data-parent-category-id="position.id"
         :x="x + 'mm'"
         :y="y + 2 + 'mm'"
@@ -52,6 +54,7 @@
           :key="'stc-' + stars"
           :x="x + 'mm'"
           :category-id="'stars'"
+          :label="label"
           :parent-id="position.id"
           :y="y + 2 + index * checkBoxSpace + 'mm'"
         />
@@ -81,6 +84,7 @@
           :x="x + 'mm'"
           :y="y + 2 + index * checkBoxSpace + 'mm'"
           :category-id="'score'"
+          :label="label"
           :parent-id="position.id"
         />
         <text
diff --git a/src/components/svg/svg-text.vue b/src/components/svg/svg-text.vue
index ff4c13ff..73583a6d 100644
--- a/src/components/svg/svg-text.vue
+++ b/src/components/svg/svg-text.vue
@@ -42,6 +42,7 @@
     <rect
       v-else-if="!line && !textOnly"
       data-type="text"
+      :data-label="label"
       :data-parent-category-id="position.id"
       :x="x + 'mm'"
       :y="y + 2 + 'mm'"
@@ -55,6 +56,7 @@
     <rect
       v-else-if="line && !textOnly"
       data-type="text"
+      :data-label="label"
       :data-parent-category-id="position.id"
       :x="x + 'mm'"
       :y="y + 2 + 'mm'"
diff --git a/src/mixins/svgMixin.js b/src/mixins/svgMixin.js
index ba9db2ef..7977c652 100644
--- a/src/mixins/svgMixin.js
+++ b/src/mixins/svgMixin.js
@@ -38,14 +38,14 @@ export const svgData = {
       yMargin: 15,
       pageHeight: 296.82,
       pageWidth: 210,
-      maxRowHeight: 40, // 41
+      maxRowHeight: 42.6, // 41
       headerHeight: 6.5,
       numberBoxWidth: 4.65,
       numberBoxHeight: 8,
       numberFields: 3,
       spaceWidth: 3,
       inputHeight: {
-        label: 4,
+        label: 6.7,
         select_item: 5,
         date: 32,
         grade: 23,
@@ -96,8 +96,8 @@ export const svgStyles = {
       colorGreyDark: '#242424; ',
       fontSize: 'font: 3.8mm ',
       fontSizeHeader: 'font: 600 4mm ',
-      fontSizeHeaderSmall: 'font: 600 2.8mm ',
-      fontSizeSmall: 'font: 2.8mm ',
+      fontSizeHeaderSmall: 'font: 600 2.7mm ',
+      fontSizeSmall: 'font: 2.7mm ',
       fontSizeLarge: 'font: 5mm ',
       fontFamily: 'Helvetica, Arial, sans-serif; ',
     }
diff --git a/src/router/views/new.vue b/src/router/views/new.vue
index 01fad287..baf16d30 100644
--- a/src/router/views/new.vue
+++ b/src/router/views/new.vue
@@ -2,7 +2,7 @@
   <Layout :title="$t('Whats_new')">
     <v-container>
       <div class="overline mb-1"
-        ><span class="lowercase">v</span>4.0.10 (06-07-2023) - Current
+        ><span class="lowercase">v</span>4.0.11 (10-07-2023) - Current
         version</div
       >
       <div class="rounded-border mb-4">
@@ -11,6 +11,15 @@
         </ul>
       </div>
 
+      <div class="overline mb-1"
+        ><span class="lowercase">v</span>4.0.10 (06-07-2023)</div
+      >
+      <div class="rounded-border mb-4">
+        <ul>
+          <li>Small improvements</li>
+        </ul>
+      </div>
+
       <div class="overline mb-1"
         ><span class="lowercase">v</span>4.0.9 (29-06-2023)</div
       >

From 43c4e4bb66ddf7ec036baf69b660d1ce9fb71cec Mon Sep 17 00:00:00 2001
From: JuliaBD <juliabuysingdamste@gmail.com>
Date: Thu, 13 Jul 2023 09:29:27 +0200
Subject: [PATCH 2/4] inspect - offline inspection - move page count to left
 side + do not allow double lined labels

---
 package-lock.json                        |  2 +-
 src/components/svg/svg-label.vue         | 10 +++++++---
 src/components/svg/svg-print-corners.vue |  9 +--------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b8377378..a7cfe297 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "beep-ui",
-  "version": "4.0.9",
+  "version": "4.0.11",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/src/components/svg/svg-label.vue b/src/components/svg/svg-label.vue
index c9b2b811..6c9e9365 100644
--- a/src/components/svg/svg-label.vue
+++ b/src/components/svg/svg-label.vue
@@ -1,16 +1,20 @@
 <template>
   <g>
     <text :x="x + 'mm'" :y="y + 'mm'" :style="svgLabel">
-      {{ label.substring(0, maxLabelLength) }}
+      {{
+        label.substring(0, maxLabelLength) + label.length > maxLabelLength
+          ? '...'
+          : ''
+      }}
     </text>
-    <text
+    <!-- <text
       v-if="label.length > maxLabelLength"
       :x="x + 'mm'"
       :y="y + 2 + 'mm'"
       :style="svgLabel"
     >
       {{ label.substring(maxLabelLength) }}
-    </text>
+    </text> -->
   </g>
 </template>
 
diff --git a/src/components/svg/svg-print-corners.vue b/src/components/svg/svg-print-corners.vue
index ed937899..60530365 100644
--- a/src/components/svg/svg-print-corners.vue
+++ b/src/components/svg/svg-print-corners.vue
@@ -6,7 +6,7 @@
         :y="(pageNumber - 1) * pageHeight + 9 + 'mm'"
         :style="svgTextSmall"
       >
-        {{ checklistHeaderText }}
+        {{ checklistHeaderText + '  p.' + pageNumber + ' / ' + totalPages }}
       </text>
 
       <text
@@ -62,13 +62,6 @@
       >
         {{ pageNumber }}
       </text>
-      <text
-        :x="pageWidth - (xMargin + 9) + 'mm'"
-        :y="(pageNumber - 1) * pageHeight + 9 + 'mm'"
-        :style="svgTextSmall"
-      >
-        {{ 'p.' + pageNumber + ' / ' + totalPages }}
-      </text>
     </g>
 
     <g class="A">

From 2a84b0ee98b58976576d538d9a9e436a83093eb5 Mon Sep 17 00:00:00 2001
From: JuliaBD <juliabuysingdamste@gmail.com>
Date: Thu, 13 Jul 2023 09:36:39 +0200
Subject: [PATCH 3/4] inspect - offline inspection - fix labels

---
 src/components/svg/svg-label.vue         | 5 ++---
 src/components/svg/svg-print-corners.vue | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/svg/svg-label.vue b/src/components/svg/svg-label.vue
index 6c9e9365..5a040e64 100644
--- a/src/components/svg/svg-label.vue
+++ b/src/components/svg/svg-label.vue
@@ -2,9 +2,8 @@
   <g>
     <text :x="x + 'mm'" :y="y + 'mm'" :style="svgLabel">
       {{
-        label.substring(0, maxLabelLength) + label.length > maxLabelLength
-          ? '...'
-          : ''
+        label.substring(0, maxLabelLength) +
+          (label.length > maxLabelLength ? '...' : '')
       }}
     </text>
     <!-- <text
diff --git a/src/components/svg/svg-print-corners.vue b/src/components/svg/svg-print-corners.vue
index 60530365..0f0cb54d 100644
--- a/src/components/svg/svg-print-corners.vue
+++ b/src/components/svg/svg-print-corners.vue
@@ -6,7 +6,7 @@
         :y="(pageNumber - 1) * pageHeight + 9 + 'mm'"
         :style="svgTextSmall"
       >
-        {{ checklistHeaderText + '  p.' + pageNumber + ' / ' + totalPages }}
+        {{ checklistHeaderText + ' - p.' + pageNumber + ' / ' + totalPages }}
       </text>
 
       <text

From 56d743ac1fe8c76ba1d0bda49e08a3da678f3855 Mon Sep 17 00:00:00 2001
From: JuliaBD <juliabuysingdamste@gmail.com>
Date: Thu, 13 Jul 2023 09:40:24 +0200
Subject: [PATCH 4/4] new - update text

---
 src/router/views/new.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/router/views/new.vue b/src/router/views/new.vue
index baf16d30..1e2d7ee2 100644
--- a/src/router/views/new.vue
+++ b/src/router/views/new.vue
@@ -2,7 +2,7 @@
   <Layout :title="$t('Whats_new')">
     <v-container>
       <div class="overline mb-1"
-        ><span class="lowercase">v</span>4.0.11 (10-07-2023) - Current
+        ><span class="lowercase">v</span>4.0.11 (13-07-2023) - Current
         version</div
       >
       <div class="rounded-border mb-4">