Add comment

CruGlobal · Oct 22, 2024 · 2075281 · 2075281
1 parent e16d369
commit 2075281
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/app/scripts/services/validateRegistrant.js b/app/scripts/services/validateRegistrant.js
@@ -12,7 +12,7 @@ angular
         conference,
       ) => {
         const blocks = conference
-          ? _.flatten(_.map(conference.registrationPages, 'blocks'))
+          ? _.flatMap(conference.registrationPages, 'blocks')
           : undefined;
 
         let answers = registrant.answers;
@@ -82,24 +82,28 @@ angular
                 ? parseFloat(rule.value)
                 : rule.value;
             }
+            // Hide this block if the question that the rule is based on (parentBlock) is hidden.
+            let parentBlock = _.find(blocks, { id: rule.parentBlockId });
             if (
               conference &&
-              blockVisibleRuleCheck(
-                _.find(blocks, { id: rule.parentBlockId }),
+              !blockVisibleRuleCheck(
+                parentBlock,
                 registrant,
                 ruleType,
                 conference,
               )
             ) {
-              if (rule.operator === '=' && answerValue === ruleValue) {
-                validRuleCount++;
-              } else if (rule.operator === '!=' && answerValue !== ruleValue) {
-                validRuleCount++;
-              } else if (rule.operator === '>' && answerValue > ruleValue) {
-                validRuleCount++;
-              } else if (rule.operator === '<' && answerValue < ruleValue) {
-                validRuleCount++;
-              }
+              return false;
+            }
+
+            if (rule.operator === '=' && answerValue === ruleValue) {
+              validRuleCount++;
+            } else if (rule.operator === '!=' && answerValue !== ruleValue) {
+              validRuleCount++;
+            } else if (rule.operator === '>' && answerValue > ruleValue) {
+              validRuleCount++;
+            } else if (rule.operator === '<' && answerValue < ruleValue) {
+              validRuleCount++;
             }
           }
           if (