updated with medical expenses

codeforamerica · Dec 20, 2023 · 4feeeda · 4feeeda
1 parent 6f1718a
commit 4feeeda
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/src/main/java/org/ladocuploader/app/submission/conditions/BasicArrayCondition.java b/src/main/java/org/ladocuploader/app/submission/conditions/BasicArrayCondition.java
@@ -11,12 +11,18 @@ public class BasicArrayCondition implements Condition {
      */
     public Boolean run(Submission submission, String key) {
         var inputData = submission.getInputData();
+        ArrayList<String> other = new ArrayList<>();
+        other.add("Other");
         if (inputData.containsKey(key)){
             var array = (ArrayList) submission.getInputData().get(key);
             if(array.isEmpty()){
                 return false;
+            } else {
+                if(array.equals(other)){
+                    return false;
+                }
+                return !array.contains("None");
             }
-            return !array.contains("None");
         }
         return false;
     }

diff --git a/src/main/resources/flows-config.yaml b/src/main/resources/flows-config.yaml
@@ -358,7 +358,7 @@ flow:
     nextScreens:
       - name: expensesDependentCareAmount
         condition: HasDependentCareExpenses
-      - name: expensesInsurance
+      - name: householdMedicalExpenses
   expensesDependentCareAmount:
     nextScreens:
       - name: expensesChildSupport
@@ -367,7 +367,7 @@ flow:
       - name: expensesChildSupportAmount
   expensesChildSupportAmount:
     nextScreens:
-      - name: expensesInsurance
+      - name: householdMedicalExpenses
   householdMedicalExpenses:
     nextScreens:
       - name: householdMedicalExpensesAmount

diff --git a/src/main/resources/templates/laDigitalAssister/householdMedicalExpenses.html b/src/main/resources/templates/laDigitalAssister/householdMedicalExpenses.html
@@ -14,20 +14,20 @@
             <th:block th:ref="insuranceExpenses">
               <div class="form-card__content">
                 <th:block th:replace="~{fragments/inputs/checkboxFieldset ::
-                  checkboxFieldset(inputName='householdInsuranceExpenses',
+                  checkboxFieldset(inputName='householdMedicalExpenses',
                   ariaLabel=#{insurance-expenses.header},
                   content=~{::whichHouseholdExpenses})}">
                     <th:block th:ref="whichHouseholdExpenses">
                       <th:block
-                        th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='householdInsuranceExpenses',value=#{insurance-expenses.medical-insurance-premium}, label=#{insurance-expenses.medical-insurance-premium})}"/>
+                        th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='householdMedicalExpenses',value=#{insurance-expenses.medical-insurance-premium}, label=#{insurance-expenses.medical-insurance-premium})}"/>
                       <th:block
-                          th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='householdInsuranceExpenses',value=#{insurance-expenses.dental-insurance-premium}, label=#{insurance-expenses.dental-insurance-premium})}"/>
+                          th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='householdMedicalExpenses',value=#{insurance-expenses.dental-insurance-premium}, label=#{insurance-expenses.dental-insurance-premium})}"/>
                       <th:block
-                          th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='householdInsuranceExpenses',value=#{insurance-expenses.vision-insurance-premium}, label=#{insurance-expenses.vision-insurance-premium})}"/>
+                          th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='householdMedicalExpenses',value=#{insurance-expenses.vision-insurance-premium}, label=#{insurance-expenses.vision-insurance-premium})}"/>
                       <th:block
-                          th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='householdInsuranceExpenses',value=#{insurance-expenses.medical-bills}, label=#{insurance-expenses.medical-bills})}"/>
+                          th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='householdMedicalExpenses',value=#{insurance-expenses.medical-bills}, label=#{insurance-expenses.medical-bills})}"/>
                       <th:block
-                          th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='householdInsuranceExpenses',value=#{insurance-expenses.none}, label=#{insurance-expenses.none}, noneOfTheAbove=true)}"/>
+                          th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='householdMedicalExpenses',value='None', label=#{insurance-expenses.none}, noneOfTheAbove=true)}"/>
                     </th:block>
                 </th:block>