Merge branch 'main' of https://github.com/larsyngvelundin/jf-conditio…

…ns-ext
larsyngvelundin · Jul 8, 2024 · 84498c7 · 84498c7
2 parents f632ee7 + b4a8559
commit 84498c7
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 4 deletions.
diff --git a/manifest.json b/manifest.json
@@ -24,6 +24,7 @@
                 "modules/builder/fetchFormProps.js",
                 "modules/builder/fetchHtmlContent.js",
                 "modules/builder/fetchQuestionsProps.js",
+                "modules/builder/getFieldText.js",
                 "modules/builder/main.js",
                 "modules/builder/preprocessConditions.js",
                 "modules/builder/preprocessElements.js",

diff --git a/modules/builder/getFieldText.js b/modules/builder/getFieldText.js
@@ -0,0 +1,23 @@
+function getFieldText(id, questions) {
+    try {
+        fieldName = questions[id].text
+        fieldName = removeSpanTags(fieldName);
+        fieldName = fieldName.trim();
+        if (fieldName == "") {
+            return "Empty Label"
+        }
+        return fieldName.trim();
+    }
+    catch (error) {
+        try{
+            let baseId = id.split("|")[0];
+            let baseField = questions[baseId]
+            let subId = `field_${id.split("|")[1]}`
+            return `${baseField.text} / ${baseField.sublabels[subId]}`
+        }
+        catch (error){
+            fieldName = `Unkown Label ${id}`
+            return fieldName;
+        }
+    }
+}
diff --git a/modules/builder/main.js b/modules/builder/main.js
@@ -40,6 +40,7 @@ async function startInBuilder() {
                             && getActionType(conditions[iCon].action[iAct]) ==
                             getActionType(conditions[iCon2].action[iAct2])) {
                             let className = `conflict-${conditions[iCon].action[iAct].field}-${getActionType(conditions[iCon].action[iAct])}`;
+                            className = className.replace("|", "slash"); //fix for multiline
 
                             conditionElements[iCon].classList.add(className);
                             conditionElements[iCon].classList.add("possibleConflict");
@@ -72,6 +73,7 @@ async function startInBuilder() {
                         if (conditions[iCon].action[iAct].resultField ==
                             conditions[iCon2].action[iAct2].resultField) {
                             let className = `conflict-${conditions[iCon].action[iAct].resultField}-${getActionType(conditions[iCon].action[iAct])}`;
+                            className = className.replace("|", "slash"); //fix for multiline
 
                             conditionElements[iCon].classList.add(className);
                             conditionElements[iCon2].classList.add(className);
@@ -104,6 +106,7 @@ async function startInBuilder() {
                     conditions[iCon].action[0].skipTo ==
                     conditions[iCon2].action[0].skipTo) {
                         let className = `conflict-${conditions[iCon].action[0].skipHide}-${conditions[iCon].action[0].skipTo}`;
+                        className = className.replace("|", "slash"); //fix for multiline
 
                         conditionElements[iCon].classList.add(className);
                         conditionElements[iCon2].classList.add(className);

diff --git a/modules/builder/preprocessElements.js b/modules/builder/preprocessElements.js
@@ -99,17 +99,18 @@ function getActionText(action, questions) {
         switch (actionType) {
             case "HideMultiple":
             case "Hide":
-                return `<b> Hide </b><span class=""></span> <span>${questions[action.field].text}</span>`;
+                return `<b> Hide </b><span class=""></span> <span>${getFieldText(action.field, questions)}</span>`;
             case "ShowMultiple":
             case "Show":
-                return `<b> Show </b><span class=""></span> <span>${questions[action.field].text}</span>`;
+                return `<b> Show </b><span class=""></span> <span>${getFieldText(action.field, questions)}</span>`;
             case "Disable":
-                return `<b> Disable </b><span class=""></span><span class="">${questions[action.field].text}</span>`;
+                return `<b> Disable </b><span class=""></span><span class="">${getFieldText(action.field, questions)}</span>`;
+            case "Enable":
+                return `<b> Enable </b><span class=""></span><span class="">${getFieldText(action.field, questions)}</span>`;
             case "UnrequireMultiple":
             case "RequireMultiple":
             case "Unrequire":
             case "Require":
-            case "Enable":
                 return `'${actionType}' not yet added"`
         }
         return `'${actionType}' (not yet added)`;

diff --git a/modules/list/getFieldLabel.js b/modules/list/getFieldLabel.js
@@ -10,6 +10,9 @@ function getFieldLabel(id) {
         return fieldName.trim();
     }
     catch (error) {
+        let baseId = id.split("|")[0];
+        let baseField = JotForm.getFieldFromID(baseId)
+        // console.log("Here's basefield", baseField);
         fieldName = `Unkown Label ${id}`
         return fieldName;
     }