@legalplace/prerenderx 2.3.2 → 2.3.4

package/dist/libs/DataPopulator.d.ts

@@ -36,6 +36,7 @@ export interface ConditionDataMap {
     c: {
         o: number[];
         s: number[];
+        v: number[];
     };
 }
 export interface ConditionData {
@@ -44,6 +45,7 @@ export interface ConditionData {
     c: {
         o: Record<string, boolean[]>;
         s: Record<string, boolean[]>;
+        v: Record<string, boolean[]>;
     };
 }
 export default DataPopulator;

package/dist/libs/DataPopulator.js

@@ -14,7 +14,8 @@ var DataPopulator = (function () {
             v: {},
             c: {
                 o: {},
-                s: {}
+                s: {},
+                v: {}
             }
         };
         this.id = id;
@@ -41,16 +42,30 @@ var DataPopulator = (function () {
             var optionCondition = this.optionConditionValue(optionId);
             this.data.c.o[optionId] = optionCondition === undefined ? [false] : optionCondition;
         }
+        for (var i = 0; i < this.dataMap.c.v.length; i += 1) {
+            var variableId = this.dataMap.c.v[i];
+            var variableCondition = this.variableConditionValue(variableId);
+            this.data.c.v[variableId] = variableCondition === undefined ? [false] : variableCondition;
+        }
     };
     DataPopulator.prototype.populateVariables = function () {
-        for (var i = 0; i < this.dataMap.v.length; i += 1) {
-            var variableId = this.dataMap.v[i];
-            var variableReference = this.references.variables[variableId];
-            var values = this.getVariableValues(variableId);
+        var _loop_1 = function (i) {
+            var variableId = this_1.dataMap.v[i];
+            var variableReference = this_1.references.variables[variableId];
+            var values = this_1.getVariableValues(variableId);
+            var parseNumber = function (v) {
+                var result = parseFloat(v);
+                return Number.isNaN(result) ? 0 : result;
+            };
             if (variableReference.type === 'number') {
-                values = values.map(function (v) { return (typeof v === 'number' ? v : parseFloat(v)); });
+                values = values.map(function (v) { return (typeof v === 'number' ? v : parseNumber(v)); });
             }
-            this.data.v[variableId] = __spreadArrays(values);
+            this_1.data.v[variableId] = __spreadArrays(values);
+            console.log(variableId, values);
+        };
+        var this_1 = this;
+        for (var i = 0; i < this.dataMap.v.length; i += 1) {
+            _loop_1(i);
         }
     };
     DataPopulator.prototype.getVariableValues = function (variableId) {
@@ -130,9 +145,13 @@ var DataPopulator = (function () {
         if (conditions === undefined)
             return undefined;
         var inputs = this.ovc.variables[variableId];
-        return inputs.map(function (input, index) {
+        var result = inputs.map(function (input, index) {
             return _this.conditionsRunner.executeCondition(conditions, variableId, index, 'variables');
         });
+        console.log(variableId, 281);
+        if (variableId === 281)
+            console.log(result);
+        return result;
     };
     DataPopulator.prototype.sectionConditionValue = function (sectionId) {
         var conditions = this.references.conditions.sections.main[sectionId];

package/dist/libs/FillPdfForm.js

@@ -53,11 +53,9 @@ var FillPdfForm = (function (_super) {
             var currentValue = this.getVariableValue(variable.id);
             if (currentValue !== false) {
                 var dateRegex = /^([0-9]{2})\/([0-9]{2})\/([0-9]{4})$/;
-                console.log('Value for', variable.id, currentValue, dateRegex.test(currentValue));
                 if (variable.date && dateRegex.test(currentValue)) {
                     switch (variable.date) {
                         case 'DD':
-                            console.log('Value s', variable.id, input.name, currentValue.replace(dateRegex, '$1'), dateRegex.test(currentValue));
                             return currentValue.replace(dateRegex, '$1');
                         case 'MM':
                             return currentValue.replace(dateRegex, '$2');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/prerenderx",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "description": "PrerenderX",
   "main": "dist/index.js",
   "repository": "https://git.legalplace.eu/legalplace/prerenderx",
@@ -14,7 +14,7 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@legalplace/lplogic": "^2.0.0",
+    "@legalplace/lplogic": "^2.1.4",
     "@legalplace/models-v3-types": "^3.4.47",
     "@legalplace/referencesparser": "^1.4.1",
     "crypto": "^1.0.1",

package/src/libs/DataPopulator.ts

@@ -28,7 +28,8 @@ class DataPopulator {
     v: {},
     c: {
       o: {},
-      s: {}
+      s: {},
+      v: {}
     }
   }
 
@@ -71,6 +72,13 @@ class DataPopulator {
       const optionCondition = this.optionConditionValue(optionId)
       this.data.c.o[optionId] = optionCondition === undefined ? [false] : optionCondition
     }
+
+    // Variables
+    for (let i = 0; i < this.dataMap.c.v.length; i += 1) {
+      const variableId = this.dataMap.c.v[i]
+      const variableCondition = this.variableConditionValue(variableId)
+      this.data.c.v[variableId] = variableCondition === undefined ? [false] : variableCondition
+    }
   }
 
   /**
@@ -82,13 +90,18 @@ class DataPopulator {
       const variableReference = this.references.variables[variableId]
       let values = this.getVariableValues(variableId)
 
+      const parseNumber = (v: string) => {
+        const result = parseFloat(v)
+        return Number.isNaN(result) ? 0 : result
+      }
       // If variable is of type number
       if (variableReference.type === 'number') {
-        values = values.map(v => (typeof v === 'number' ? v : parseFloat(v)))
+        values = values.map(v => (typeof v === 'number' ? v : parseNumber(v)))
       }
 
       // Adding variables
       this.data.v[variableId] = [...values]
+      console.log(variableId, values)
     }
   }
 
@@ -216,9 +229,14 @@ class DataPopulator {
     // Getting variable inputs length
     const inputs = this.ovc.variables[variableId]
 
-    return inputs.map((input, index) => {
+    const result = inputs.map((input, index) => {
       return this.conditionsRunner.executeCondition(conditions, variableId, index, 'variables')
     })
+
+    console.log(variableId, 281)
+    if (variableId === 281) console.log(result)
+
+    return result
   }
 
   /**
@@ -239,6 +257,7 @@ export interface ConditionDataMap {
   c: {
     o: number[]
     s: number[]
+    v: number[]
   }
 }
 
@@ -248,6 +267,7 @@ export interface ConditionData {
   c: {
     o: Record<string, boolean[]>
     s: Record<string, boolean[]>
+    v: Record<string, boolean[]>
   }
 }
 

package/src/libs/FillPdfForm.ts

@@ -51,11 +51,9 @@ class FillPdfForm extends FillPdfFormBase {
       if (currentValue !== false) {
         // Date values
         const dateRegex = /^([0-9]{2})\/([0-9]{2})\/([0-9]{4})$/
-        console.log('Value for', variable.id, currentValue, dateRegex.test(currentValue))
         if (variable.date && dateRegex.test(currentValue)) {
           switch (variable.date) {
             case 'DD':
-              console.log('Value s', variable.id, input.name, currentValue.replace(dateRegex, '$1'), dateRegex.test(currentValue))
               return currentValue.replace(dateRegex, '$1')
             case 'MM':
               return currentValue.replace(dateRegex, '$2')