Fix alternative schemes not rendering correctly (#357)

* Fix: #356 rendering of alternative schemes * [tests] Fix alternative schemes
schoero · Dec 5, 2021 · a02ae18 · a02ae18
1 parent eabc226
commit a02ae18
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 25 deletions.
diff --git a/src/pdf/pdf.ts b/src/pdf/pdf.ts
@@ -383,35 +383,41 @@ export class PDF_ extends ExtendedPDF {
     //-- AV1 and AV2
 
     if(this._data.av1 !== undefined){
+
+      const [scheme, data] = this._data.av1.split(/(\/.+)/);
+
       this.fontSize(7);
       this.font("Helvetica-Bold");
-      this.text("Name AV1:", utils.mm2pt(67), this._marginTop + utils.mm2pt(90), {
-        width: utils.mm2pt(15),
+      this.text(scheme, utils.mm2pt(67), this._marginTop + utils.mm2pt(90), {
+        width: utils.mm2pt(138),
+        continued: true,
         lineGap: 1
       });
 
-      this.fontSize(7);
       this.font("Helvetica");
-      this.text((this._data.av1.length > 87 ? this._data.av1.substr(0, 87) + "..." : this._data.av1), utils.mm2pt(81), this._marginTop + utils.mm2pt(90), {
-        width: utils.mm2pt(37),
-        lineGap: -.5
+      this.text(this._data.av1.length > 90 ? data.substr(0, 87) + "..." : data, {
+        continued: false
       });
+
     }
 
     if(this._data.av2 !== undefined){
+
+      const [scheme, data] = this._data.av2.split(/(\/.+)/);
+
       this.fontSize(7);
       this.font("Helvetica-Bold");
-      this.text("Name AV2:", utils.mm2pt(67), this._marginTop + utils.mm2pt(93), {
-        width: utils.mm2pt(15),
+      this.text(scheme, utils.mm2pt(67), this._marginTop + utils.mm2pt(93), {
+        width: utils.mm2pt(138),
+        continued: true,
         lineGap: 1
       });
 
-      this.fontSize(7);
       this.font("Helvetica");
-      this.text((this._data.av2.length > 87 ? this._data.av2.substr(0, 87) + "..." : this._data.av2), utils.mm2pt(81), this._marginTop + utils.mm2pt(93), {
-        width: utils.mm2pt(37),
+      this.text(this._data.av2.length > 90 ? data.substr(0, 87) + "..." : data, {
         lineGap: -.5
       });
+
     }
 
 

diff --git a/src/shared/shared.ts b/src/shared/shared.ts
@@ -237,16 +237,18 @@ export function validateData(data: Data) {
   //-- AV1
 
   if(data.av1 !== undefined){
-    if(data.av1.length > 100){ throw new Error("AV1 must be a maximum of 100 characters."); }
     if(typeof data.av1 !== "string"){ throw new Error("AV1 must be a string."); }
+    if(data.av1.length > 100){ throw new Error("AV1 must be a maximum of 100 characters."); }
+    if(data.av1.split(/(\/.+)/).length <= 2){ throw new Error("AV1 must contain a separator (e.g. /)"); }
   }
 
 
   //-- AV2
 
   if(data.av2 !== undefined){
-    if(data.av2.length > 100){ throw new Error("AV2 must be a maximum of 100 characters."); }
     if(typeof data.av2 !== "string"){ throw new Error("AV2 must be a string."); }
+    if(data.av2.length > 100){ throw new Error("AV2 must be a maximum of 100 characters."); }
+    if(data.av2.split(/(\/.+)/).length <= 2){ throw new Error("AV2 must contain a separator (e.g. /)"); }
   }
 
 }
diff --git a/src/svg/svg.ts b/src/svg/svg.ts
@@ -307,32 +307,32 @@ export class SVG_ {
 
     if(this._data.av1 !== undefined){
 
-      alternativeSchemeContainer.addTSpan("Name AV1:")
+      const [scheme, data] = this._data.av1.split(/(\/.+)/);
+
+      alternativeSchemeContainer.addTSpan(scheme)
         .x(0)
         .fontFamily("Arial")
         .fontWeight("bold")
         .fontSize("7pt");
 
-      alternativeSchemeContainer.addTSpan(this._data.av1.length > 87 ? this._data.av1.substr(0, 87) + "..." : this._data.av1)
-        .x(0)
-        .dx("15mm")
+      alternativeSchemeContainer.addTSpan(this._data.av1.length > 90 ? data.substr(0, 87) + "..." : data)
         .fontFamily("Arial")
         .fontWeight("normal")
         .fontSize("7pt");
 
     }
     if(this._data.av2 !== undefined){
 
-      alternativeSchemeContainer.addTSpan("Name AV2:")
+      const [scheme, data] = this._data.av2.split(/(\/.+)/);
+
+      alternativeSchemeContainer.addTSpan(scheme)
         .x(0)
         .dy("8pt")
         .fontFamily("Arial")
         .fontWeight("bold")
         .fontSize("7pt");
 
-      alternativeSchemeContainer.addTSpan(this._data.av2.length > 87 ? this._data.av2.substr(0, 87) + "..." : this._data.av2)
-        .x(0)
-        .dx("15mm")
+      alternativeSchemeContainer.addTSpan(this._data.av2.length > 90 ? data.substr(0, 87) + "..." : data)
         .fontFamily("Arial")
         .fontWeight("normal")
         .fontSize("7pt");

diff --git a/tests/av1av2.js b/tests/av1av2.js
@@ -5,8 +5,8 @@ const data = {
   currency: "CHF",
   amount: 1199.95,
   reference: "210000000003139471430009017",
-  av1: "eBillUV;UltraPay005;12345",
-  av2: "eBillXY;XYService;54321",
+  av1: "eBill/UV;UltraPay005;12345",
+  av2: "eBill/XY;XYService;54321",
   creditor: {
     name: "Robert Schneider AG",
     address: "Rue du Lac 1268",

diff --git a/tests/no-debtor-no-amount-no-reference.js b/tests/no-debtor-no-amount-no-reference.js
@@ -3,8 +3,8 @@ const { writeFileSync } = require("fs");
 
 const data = {
   currency: "CHF",
-  av1: "eBillUV;UltraPay005;12345",
-  av2: "eBillXY;XYService;54321",
+  av1: "eBill/UV;UltraPay005;12345",
+  av2: "eBill/XY;XYService;54321",
   creditor: {
     name: "Robert Schneider ultra long name of the company to use multiple lines",
     address: "Rue du Lac 1268 Ultra long address nam eto use multiple lines",