fixup! Simple font size implementation, fixes #4650

Author: carlobeltrame

frontend/src/components/print/__tests__/repairPrintConfig.spec.js

@@ -625,53 +625,94 @@ describe('repairConfig', () => {
     })
   })
 
-  const pageSizes = [('A5', 'A4', 'A3')]
-  pageSizes.forEach((pageSize) => {
-    test(`allows pageSize ${pageSize}`, async () => {
-      // given
-      const config = {
-        camp: '/camps/1a2b3c4d',
-        contents: [
-          {
-            type: 'Picasso',
-            options: {
-              periods: ['/periods/1a2b3c4d'],
-              orientation: 'L',
-              filter: defaultFilter,
-            },
+  test.each(['A5', 'A4', 'A3'])('allows pageSize %p', async (pageSize) => {
+    // given
+    const config = {
+      camp: '/camps/1a2b3c4d',
+      contents: [
+        {
+          type: 'Picasso',
+          options: {
+            periods: ['/periods/1a2b3c4d'],
+            orientation: 'L',
+            filter: defaultFilter,
           },
-        ],
-        documentName: 'test camp',
-        options: {
-          pageNumbers: false,
-          pageSize,
         },
-        language: 'de-CH-scout',
-      }
+      ],
+      documentName: 'test camp',
+      options: {
+        pageNumbers: false,
+        pageSize,
+      },
+      language: 'de-CH-scout',
+    }
 
-      // when
-      const result = repairConfig(config, ...args)
+    // when
+    const result = repairConfig(config, ...args)
 
-      // then
-      expect(result).toEqual({
-        camp: '/camps/1a2b3c4d',
-        contents: [
-          {
-            type: 'Picasso',
-            options: {
-              periods: ['/periods/1a2b3c4d'],
-              orientation: 'L',
-              filter: defaultFilter,
-            },
+    // then
+    expect(result).toEqual({
+      camp: '/camps/1a2b3c4d',
+      contents: [
+        {
+          type: 'Picasso',
+          options: {
+            periods: ['/periods/1a2b3c4d'],
+            orientation: 'L',
+            filter: defaultFilter,
           },
-        ],
-        documentName: 'test camp',
-        options: {
-          pageNumbers: false,
-          pageSize,
         },
-        language: 'de-CH-scout',
-      })
+      ],
+      documentName: 'test camp',
+      options: {
+        pageNumbers: false,
+        pageSize,
+      },
+      language: 'de-CH-scout',
+    })
+  })
+
+  test('repairs invalid pageSize', async () => {
+    // given
+    const config = {
+      camp: '/camps/1a2b3c4d',
+      contents: [
+        {
+          type: 'Picasso',
+          options: {
+            periods: ['/periods/1a2b3c4d'],
+            orientation: 'L',
+            filter: defaultFilter,
+          },
+        },
+      ],
+      documentName: 'test camp',
+      options: {
+        pageNumbers: false,
+        pageSize: 'tiny',
+      },
+      language: 'de-CH-scout',
+    }
+
+    // when
+    const result = repairConfig(config, ...args)
+
+    // then
+    expect(result).toEqual({
+      camp: '/camps/1a2b3c4d',
+      contents: [
+        {
+          type: 'Picasso',
+          options: {
+            periods: ['/periods/1a2b3c4d'],
+            orientation: 'L',
+            filter: defaultFilter,
+          },
+        },
+      ],
+      documentName: 'test camp',
+      options: defaultOptions,
+      language: 'de-CH-scout',
     })
   })
 

pdf/src/campPrint/picasso/ScheduleEntry.vue

@@ -52,11 +52,14 @@ export default {
       return `#scheduleEntry_${this.scheduleEntry.id}`
     },
     fontSizeScalingFactor() {
-      return {
-        A3: 5,
-        A4: 3,
-        A5: 2.5,
-      }[this.config.options?.pageSize || 'A4']
+      switch (this.config.options?.pageSize) {
+        case 'A3':
+          return 5
+        case 'A5':
+          return 2.5
+        default:
+          return 3
+      }
     },
     fontSize() {
       return Math.min(8, this.fontSizeScalingFactor * this.percentageHeight) + 'pt'