@glowgreen/gg-questionnaire-v2 0.0.109 → 0.0.111

package/bundles/glowgreen-gg-questionnaire-v2.umd.js

@@ -738,16 +738,16 @@
             if (noChange && !skipFilter) {
                 return null;
             }
-            var questionnaireForms = this.generateFormsForSections(sections, currentQuestionnaireForm);
+            var questionnaireForms = this.generateFormsForSections(sections, currentQuestionnaireForm, additionalData);
             return { sections: sections, forms: questionnaireForms };
         };
-        FormConstructorService.prototype.generateFormsForSections = function (sections, currentQuestionnaireForm) {
+        FormConstructorService.prototype.generateFormsForSections = function (sections, currentQuestionnaireForm, additionalData) {
             var e_1, _a;
             var questionnaireForms = this.fb.group({});
             try {
                 for (var sections_1 = __values(sections), sections_1_1 = sections_1.next(); !sections_1_1.done; sections_1_1 = sections_1.next()) {
                     var section = sections_1_1.value;
-                    var sectionForms = this.generateFormsForSection(section, currentQuestionnaireForm);
+                    var sectionForms = this.generateFormsForSection(section, currentQuestionnaireForm, additionalData);
                     questionnaireForms.addControl(section.name, sectionForms);
                 }
             }
@@ -767,7 +767,7 @@
          * @returns A filtered form group.
          * @author Will Poulson
          */
-        FormConstructorService.prototype.generateFormsForSection = function (section, currentQuestionnaireForm) {
+        FormConstructorService.prototype.generateFormsForSection = function (section, currentQuestionnaireForm, additionalData) {
             var e_2, _a;
             var sectionForms = this.fb.group({});
             try {
@@ -776,7 +776,7 @@
                     if (question.type === exports.QuestionType.Info) {
                         continue;
                     }
-                    var questionControl = this.generateControlForQuestion(question, section, currentQuestionnaireForm);
+                    var questionControl = this.generateControlForQuestion(question, section, currentQuestionnaireForm, additionalData);
                     sectionForms.addControl(question.name, questionControl);
                 }
             }
@@ -795,10 +795,33 @@
          * @returns An abstract control.
          * @author Will Poulson
          */
-        FormConstructorService.prototype.generateControlForQuestion = function (question, section, currentQuestionnaireForm) {
+        FormConstructorService.prototype.generateControlForQuestion = function (question, section, currentQuestionnaireForm, additionalData) {
             var e_3, _a;
             var convertedValidators = this.convertValidators(question.validators);
             var defaultValue = question.defaultValue ? question.defaultValue : null;
+            if (defaultValue !== null) {
+                defaultValue = this.filterService.getValueForString(defaultValue, currentQuestionnaireForm, additionalData);
+            }
+            var titleRegEx = /(\{\{([^\}]+)\}\})/gi;
+            var titlePlaceholdersFound = null;
+            while ((titlePlaceholdersFound = titleRegEx.exec(question.title)) !== null) {
+                var titleReplacementValue = this.filterService.getValueForString(titlePlaceholdersFound[2], currentQuestionnaireForm, additionalData);
+                var titleReplaceRe = new RegExp('\{\{' + titlePlaceholdersFound[2] + '\}\}', 'g');
+                titleReplacementValue = titleReplacementValue.replace(/\w\S*/g, function (txt) {
+                    return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();
+                });
+                question.title = question.title.replace(titleReplaceRe, titleReplacementValue);
+            }
+            var subTitleRegEx = /(\{\{([^\}]+)\}\})/gi;
+            var subTitlePlaceholdersFound = null;
+            while ((subTitlePlaceholdersFound = subTitleRegEx.exec(question.subtitle)) !== null) {
+                var subTitleReplacementValue = this.filterService.getValueForString(subTitlePlaceholdersFound[2], currentQuestionnaireForm, additionalData);
+                var subTitleReplaceRe = new RegExp('\{\{' + subTitlePlaceholdersFound[2] + '\}\}', 'g');
+                subTitleReplacementValue = subTitleReplacementValue.replace(/\w\S*/g, function (txt) {
+                    return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();
+                });
+                question.subtitle = question.subtitle.replace(subTitleReplaceRe, subTitleReplacementValue);
+            }
             switch (question.type) {
                 case exports.QuestionType.Repeater:
                     var newArray = this.fb.array([], convertedValidators);
@@ -1333,34 +1356,21 @@
                 if (!data) {
                     return null;
                 }
-                var regexp = /(\{\{([^\}]+)\}\})/gi;
-                var placeholdersFound = null;
-                while ((placeholdersFound = regexp.exec(data.title)) !== null) {
-                    var replacementValue = this.filterService.getValueForString(placeholdersFound[2], this.currentQuestionnaireForm, this.additionalData);
-                    var replace_re = new RegExp('\{\{' + placeholdersFound[2] + '\}\}', 'g');
-                    replacementValue = replacementValue.replace(/\w\S*/g, function (txt) {
-                        return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();
-                    });
-                    data.title = data.title.replace(replace_re, replacementValue);
-                }
-                var regexp2 = /(\{\{([^\}]+)\}\})/gi;
-                var subTitlePlaceholdersFound = null;
-                while ((subTitlePlaceholdersFound = regexp2.exec(data.subtitle)) !== null) {
-                    var replacementValue2 = this.filterService.getValueForString(subTitlePlaceholdersFound[2], this.currentQuestionnaireForm, this.additionalData);
-                    var replace_re2 = new RegExp('\{\{' + subTitlePlaceholdersFound[2] + '\}\}', 'g');
-                    replacementValue2 = replacementValue2.replace(/\w\S*/g, function (txt) {
-                        return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();
-                    });
-                    data.subtitle = data.subtitle.replace(replace_re2, replacementValue2);
-                }
                 var formControl = this.currentSection.formGroup.get(data.name);
-                if (data.defaultValue !== '') {
-                    var oriDefaultValue = data.defaultValue;
-                    data.defaultValue = this.filterService.getValueForString(data.defaultValue, this.currentQuestionnaireForm, this.additionalData);
-                    if (oriDefaultValue !== data.defaultValue) {
+                /*
+                    if (data.defaultValue !== null && data.defaultValue !== '') {
+                      const oriDefaultValue = data.defaultValue;
+                      data.defaultValue = this.filterService.getValueForString(
+                        data.defaultValue,
+                        this.currentQuestionnaireForm,
+                        this.additionalData);
+                
+                      if (oriDefaultValue !== data.defaultValue) {
                         formControl.patchValue(data.defaultValue);
+                      }
+                
                     }
-                }
+                */
                 return {
                     data: data,
                     formControl: formControl