updated the household personal situations page

src/main/java/org/ladocuploader/app/data/enums/PersonalSituationType.java

@@ -0,0 +1,37 @@
+package org.ladocuploader.app.data.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+import lombok.Getter;
+
+@Getter
+public enum PersonalSituationType {
+  HOMELESS_SWITCH("experiencing homelessness", "", "personal-situations.which.option1"),
+  DRUGS_ALCOHOL("struggling with drugs or alcohol", "", "personal-situations.which.option2"),
+  DOMESTIC_ABUSE("experiencing domestic abuse", "", "personal-situations.which.option3"),
+  DISABILITY("personal issue or disability", "", "personal-situations.which.option4"),
+  OTHER("other", "", "personal-situations.which.option5");
+
+  private final String value;
+  private final String abbreviation;
+  private final String labelSrc;
+
+  static private final Map<String, PersonalSituationType> MAP_BY_VALUE = new HashMap<>();
+
+  static {
+    for( PersonalSituationType type : PersonalSituationType.values()) {
+      MAP_BY_VALUE.put(type.value, type);
+    }
+  }
+
+  PersonalSituationType(String value, String abbreviation, String labelSrc) {
+    this.value = value;
+    this.abbreviation = abbreviation;
+    this.labelSrc = labelSrc;
+  }
+
+  public static String getAbbreviationFromValue(String value) {
+    PersonalSituationType personalSituationType = (PersonalSituationType) MAP_BY_VALUE.get(value);
+    return personalSituationType != null ? personalSituationType.abbreviation : null;
+  }
+}

src/main/java/org/ladocuploader/app/inputs/LaDigitalAssister.java

@@ -219,16 +219,10 @@ public class LaDigitalAssister extends FlowInputs {
   private String householdHasDomesticViolenceSituation;
 
   private String householdHasCriminalJusticeSituation;
-
-  private String personalSituationHomelessSwitch;
-
-  private String personalSituationOtherIssue;
-
-  private String personalSituationStrugglingDrugsAlcohol;
-
-  private String personalSituationDomesticViolenceFlag;
-
-  private String personalSituationDisability;
+
+  @NotEmpty(message="{error.missing-general}")
+  @DynamicField
+  private List<String> personalSituations;
 
   // Income
   private String householdSearchingForJob;

src/main/resources/templates/laDigitalAssister/householdWhichPersonalSituations.html

@@ -14,26 +14,23 @@
           <th:block th:ref="whichHouseholdSituations">
             <div th:each="individual, iter: ${inputData.get('affectedByPersonalSituations[]')}"
                  class="spacing-below-15">
-              <th:block th:replace="~{'fragments/inputs/checkboxFieldset' ::
-                  checkboxFieldset(inputName='personalSituationsListed',
+                  <th:block th:with="inputName=${'personalSituations' + T(formflow.library.inputs.FieldNameMarkers).DYNAMIC_FIELD_MARKER + individual.uuid}">
+                    <th:block th:replace="~{'fragments/inputs/checkboxFieldset' ::
+                  checkboxFieldset(inputName=${inputName},
                   ariaLabel='header',
                   content=~{::whichPersonalSituations})}"
-                        th:with="messageVariant=${individual.uuid == 'you' ? 'self' : 'householdMember'}">
-                <th:block th:ref="whichPersonalSituations">
-                  <h2 th:text="${messageVariant == 'self' ? #messages.msgWithParams('personal-situations-which-you.subheader', individual.firstName) : #messages.msgWithParams('personal-situations-which.subheader', individual.firstName)}"></h2>
-                  <p th:text="#{general.check-all-that-apply}"></p>
-                  <th:block
-                      th:replace="~{'fragments/inputs/checkboxInSet' :: checkboxInSet(inputName='personalSituationHomelessSwitch',value=${individual.uuid}, label=#{personal-situations.which.option1})}"/>
-                  <th:block
-                      th:replace="~{'fragments/inputs/checkboxInSet' :: checkboxInSet(inputName='personalSituationStrugglingDrugsAlcohol',value=${individual.uuid}, label=#{personal-situations.which.option2})}"/>
-                  <th:block
-                      th:replace="~{'fragments/inputs/checkboxInSet' :: checkboxInSet(inputName='personalSituationDomesticViolenceFlag',value=${individual.uuid}, label=#{personal-situations.which.option3})}"/>
-                  <th:block
-                      th:replace="~{'fragments/inputs/checkboxInSet' :: checkboxInSet(inputName='personalSituationDisability',value=${individual.uuid}, label=#{personal-situations.which.option4})}"/>
-                  <th:block
-                      th:replace="~{'fragments/inputs/checkboxInSet' :: checkboxInSet(inputName='personalSituationOtherIssue',value=${individual.uuid}, label=#{personal-situations.which.option5}, helptext=#{personal-situations.other.helptext})}"/>
-                </th:block>
-              </th:block>
+                              th:with="messageVariant=${individual.uuid == 'you' ? 'self' : 'householdMember'}">
+                      <th:block th:ref="whichPersonalSituations">
+                        <h2 th:text="${messageVariant == 'self' ? #messages.msgWithParams('personal-situations-which-you.subheader', individual.firstName) : #messages.msgWithParams('personal-situations-which.subheader', individual.firstName)}"></h2>
+                        <p th:text="#{general.check-all-that-apply}"></p>
+                        <th:block th:each="personalSituation : ${T(org.ladocuploader.app.data.enums.PersonalSituationType).values()}">
+                          <th:block
+                              th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName=${inputName}, value=${personalSituation.getValue()}, label=#{${personalSituation.getLabelSrc()}})}"/>
+                        </th:block>
+                      </th:block>
+                    </th:block>
+                  </th:block>
+                  <hr/>
             </div>
             <div class="form-card__footer">
               <th:block th:replace="~{fragments/inputs/submitButton :: submitButton(