survery-lib 0.1.55 → 0.1.57

package/fesm2022/survery-lib.mjs

@@ -34,6 +34,18 @@ var LogicActionEnum;
     LogicActionEnum[LogicActionEnum["SetAnswer"] = 5] = "SetAnswer";
 })(LogicActionEnum || (LogicActionEnum = {}));
 
+var InputTypeEnum;
+(function (InputTypeEnum) {
+    InputTypeEnum[InputTypeEnum["Color"] = 1] = "Color";
+    InputTypeEnum[InputTypeEnum["Date"] = 2] = "Date";
+    InputTypeEnum[InputTypeEnum["DateTime"] = 3] = "DateTime";
+    InputTypeEnum[InputTypeEnum["Email"] = 4] = "Email";
+    InputTypeEnum[InputTypeEnum["Number"] = 5] = "Number";
+    InputTypeEnum[InputTypeEnum["Password"] = 6] = "Password";
+    InputTypeEnum[InputTypeEnum["Text"] = 7] = "Text";
+    InputTypeEnum[InputTypeEnum["Phone"] = 8] = "Phone";
+})(InputTypeEnum || (InputTypeEnum = {}));
+
 class SurveyLibService {
     get surveyDataObsrv() {
         return this.surveyDataSubject.asObservable();
@@ -263,18 +275,6 @@ class CheckRulesUsecaseModel {
 class CheckRulesUsecaseResult {
 }
 
-var InputTypeEnum;
-(function (InputTypeEnum) {
-    InputTypeEnum[InputTypeEnum["Color"] = 1] = "Color";
-    InputTypeEnum[InputTypeEnum["Date"] = 2] = "Date";
-    InputTypeEnum[InputTypeEnum["DateTime"] = 3] = "DateTime";
-    InputTypeEnum[InputTypeEnum["Email"] = 4] = "Email";
-    InputTypeEnum[InputTypeEnum["Number"] = 5] = "Number";
-    InputTypeEnum[InputTypeEnum["Password"] = 6] = "Password";
-    InputTypeEnum[InputTypeEnum["Text"] = 7] = "Text";
-    InputTypeEnum[InputTypeEnum["Phone"] = 8] = "Phone";
-})(InputTypeEnum || (InputTypeEnum = {}));
-
 function PhoneValidator(control) {
     if (control.value) {
         var phoneCode = control.value.trim().slice(0, 2);
@@ -468,12 +468,27 @@ class QuestionTextTemplateComponent {
     ngOnInit() {
         this.fCtrls.answer.valueChanges.pipe().pipe(debounceTime(200)).subscribe(value => {
             const formValue = this.rForm.value;
-            this.emitter.emit({
-                QuestionId: formValue.id,
-                IsValid: this.fCtrls.answer.valid,
-                Answer: value,
-                SurveyAnswerId: formValue.surveyAnswerId
-            });
+            if (formValue.inputTypeId == InputTypeEnum.Email) {
+                const isRequired = this.fCtrls.answer.hasValidator(Validators.required);
+                if (!isRequired) {
+                    if (value?.trim()) {
+                        this.fCtrls.answer.addValidators([Validators.email]);
+                    }
+                    else {
+                        this.fCtrls.answer.clearValidators();
+                    }
+                    this.fCtrls.answer.updateValueAndValidity();
+                }
+            }
+            setTimeout(() => {
+                const formValue = this.rForm.value;
+                this.emitter.emit({
+                    QuestionId: formValue.id,
+                    IsValid: this.fCtrls.answer.valid,
+                    Answer: value,
+                    SurveyAnswerId: formValue.surveyAnswerId
+                });
+            }, 100);
         });
         this.fCtrls.answer.setValue(null);
         this._surveyLibService.surveyAnswersObsrv.pipe(map(x => x.defaultAnswers.filter(x => x.QuestionId == this.fCtrls.id.value)))
@@ -1205,8 +1220,13 @@ class SurveryLibComponent {
         var pageArr = [];
         for (let index = 0; index < this.fCtrls.questionArray.value.length; index++) {
             const question = this.fCtrls.questionArray.value[index];
-            if (question.isShow == true && (question.questionType != this.questionTypeEnum.Matrix || question.isMatrixGroup == true)) {
-                pageArr.push(question.surveyPageIndex);
+            if (question.isShow == true) {
+                if (question.questionType != this.questionTypeEnum.Matrix) {
+                    pageArr.push(question.surveyPageIndex);
+                }
+                else if (question.questionType == this.questionTypeEnum.Matrix && question.isMatrixGroup == true) {
+                    pageArr.push(question.surveyPageIndex);
+                }
             }
         }
         const distinctArray = pageArr.filter((n, i) => pageArr.indexOf(n) === i);
@@ -1331,7 +1351,7 @@ class SurveryLibComponent {
                 questionGroup.controls.answerId.setValue(model.Answer);
             }
             if (this.fCtrls.ruleQuestionArray.value.findIndex(x => x.questionId == model.QuestionId) > -1) {
-                this.checkRules();
+                this.checkRules(questionGroup.value.questionId);
             }
         }
     }
@@ -1346,22 +1366,37 @@ class SurveryLibComponent {
         survey.surveyRules.forEach(rule => {
             rule.ruleExps.forEach(ruleExp => {
                 this.fCtrls.ruleQuestionArray.push(this._formBuilder.group({
-                    questionId: ruleExp.questionId
+                    questionId: ruleExp.questionId,
+                    ruleId: rule.ruleId
                 }));
             });
         });
     }
     haveInValidateQuestions() {
         const currentPageIndex = this.fCtrls.currentPageIndex.value;
-        var invalidRecords = this.fCtrls.questionArray.value.filter(x => x.surveyPageIndex == currentPageIndex
-            && x.isRequired == true && x.isValid != true && x.isDisabled == false && x.isShow == true && x.isMatrixGroup != true);
+        var invalidRecords = [];
+        var arr = this.fCtrls.questionArray.value.filter(x => x.surveyPageIndex == currentPageIndex && x.isDisabled == false && x.isShow == true);
+        arr.map(x => {
+            if (x.isRequired == true && x.isValid != true && x.isMatrixGroup != true) {
+                invalidRecords.push(x);
+            }
+            else {
+                if (x.questionType == QuestionTypeEnum.TextInput && x.inputTypeId == InputTypeEnum.Email) {
+                    if (x.answerText?.trim() && x.isValid != true) {
+                        invalidRecords.push(x);
+                    }
+                }
+            }
+        });
         if (invalidRecords.length > 0) {
             $(`#survey-page_${currentPageIndex}`).addClass('survey-page_submitted');
         }
         return invalidRecords;
     }
-    checkRules() {
-        this.surveyData.surveyRules.forEach(rule => {
+    checkRules(questionId) {
+        var selectedRuleIdArr = this.rForm.value.ruleQuestionArray.filter(x => x.questionId == questionId).map(x => Number(x.ruleId));
+        var arr = this.surveyData.surveyRules.filter(x => selectedRuleIdArr.find(c => c == x.ruleId) != null);
+        arr.forEach(rule => {
             this._checkRuleExpsUsecase.execute({
                 ruleExps: rule.ruleExps,
                 questions: this.fCtrls.questionArray.value,
@@ -1444,6 +1479,7 @@ class SurveryLibComponent {
                 surveyPageIndex: pageIndex,
                 questionId: [question.questionId],
                 questionType: [question.questionTypeId],
+                inputTypeId: [question.surveyAnswers[0].inputTypeId],
                 isMatrixGroup: [false],
                 answerId: [null],
                 answerIdArr: [null],
@@ -1461,6 +1497,7 @@ class SurveryLibComponent {
                 surveyPageIndex: pageIndex,
                 questionId: [question.questionId],
                 questionType: [question.questionTypeId],
+                inputTypeId: [question.surveyAnswers[0].inputTypeId],
                 isMatrixGroup: [true],
                 answerId: [null],
                 answerIdArr: [null],
@@ -1476,7 +1513,8 @@ class SurveryLibComponent {
                 this.fCtrls.questionArray.push(this._formBuilder.group({
                     surveyPageIndex: pageIndex,
                     questionId: [subQuestion.questionId],
-                    questionType: [subQuestion.questionTypeId],
+                    questionType: [question.questionTypeId],
+                    inputTypeId: [question.surveyAnswers[0].inputTypeId],
                     isMatrixGroup: [false],
                     answerId: [null],
                     answerIdArr: [null],