From 236c273df5fb3c71191fbb0ba6f66ee8b79a5216 Mon Sep 17 00:00:00 2001
From: Bethany Seeger <bseeger@codeforamerica.org>
Date: Fri, 10 May 2024 16:56:49 -0400
Subject: [PATCH] Adjust code to start to use required fields logic that ffb
 added.

---
 src/main/resources/messages.properties        |  2 +-
 .../templates/fragments/inputs/duedate.html   | 82 -------------------
 .../templates/fragments/inputs/fulldate.html  | 81 ------------------
 .../inputs/householdCheckboxFieldset.html     | 19 -----
 .../templates/fragments/inputs/text.html      | 31 -------
 .../mdBenefitsFlow/selectHelpNeeded.html      |  1 -
 6 files changed, 1 insertion(+), 215 deletions(-)
 delete mode 100644 src/main/resources/templates/fragments/inputs/duedate.html
 delete mode 100644 src/main/resources/templates/fragments/inputs/fulldate.html
 delete mode 100644 src/main/resources/templates/fragments/inputs/householdCheckboxFieldset.html
 delete mode 100644 src/main/resources/templates/fragments/inputs/text.html

diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties
index 467037e2..0b5dd846 100644
--- a/src/main/resources/messages.properties
+++ b/src/main/resources/messages.properties
@@ -171,7 +171,7 @@ select-app.authorized-rep=I am an authorized representative applying for someone
 select-app.other=None of these are true for me
 help-needed.title=Select help
 help-needed.header=What kind of help would you like?
-help-needed.subheader=This helps us show you which benefits programs exist for your needs.
+help-needed.subheader=This helps us show you which benefits programs exist for your needs.<br><br>Check all that apply.
 help-needed.food=Help with food
 help-needed.children=Help with money for children
 help-needed.utilities=Help with utilities
diff --git a/src/main/resources/templates/fragments/inputs/duedate.html b/src/main/resources/templates/fragments/inputs/duedate.html
deleted file mode 100644
index 44e72182..00000000
--- a/src/main/resources/templates/fragments/inputs/duedate.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<th:block
-    th:fragment="duedate(inputName, groupName)"
-    th:with="
-      hasLabel=${!#strings.isEmpty(label)},
-      hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      hasHelpText=${!#strings.isEmpty(groupHelpText)},
-      hasErrorMonth=${
-        errorMessages != null &&
-        errorMessages.get('month' + inputName) != null &&
-        #arrays.length(errorMessages.get('month' + inputName)) > 0 },
-      hasErrorDay=${
-        errorMessages != null &&
-        errorMessages.get('day' + inputName) != null &&
-        #arrays.length(errorMessages.get('day' + inputName)) > 0 },
-      hasErrorYear=${
-        errorMessages != null &&
-        errorMessages.get('year' + inputName) != null &&
-        #arrays.length(errorMessages.get('year' + inputName)) > 0 }"
-    th:assert="${hasLabel || hasAriaLabel}">
-  <div
-      th:class="'form-group' + ${((hasErrorMonth || hasErrorDay || hasErrorYear) ? ' form-group--error' : '')}">
-    <fieldset th:id="${groupName}" class="input-group input-group--inline">
-      <legend th:if="${hasLabel}" th:for="${inputName}" th:text="${label}"
-              class="form-question"/>
-      <p class="text--help">
-        <label th:if="${hasHelpText}" th:for="${inputName}+'-month'"
-               th:id="${inputName}+'-month-label'"
-               th:utext="${groupHelpText}"></label>
-        <label th:if="${!hasHelpText}" th:for="${inputName}+'-month'"
-               th:id="${inputName}+'-month-label'"
-               th:text="#{general.month}+'/'"></label>
-        <label th:if="${!hasHelpText}" th:for="${inputName}+'-day'"
-               th:id="${inputName}+'-day-label'"
-               th:text="#{general.day}+'/'"></label>
-        <label th:if="${!hasHelpText}" th:for="${inputName}+'-year'"
-               th:id="${inputName}+'-year-label'"
-               th:text="#{general.year}"></label>
-      </p>
-      <!-- TODO: figure out the three fields for each date issue -->
-      <input type="text" inputmode="numeric" maxlength="2"
-             class="text-input text-input--inline form-width--month"
-             th:id="${inputName}+'-month'"
-             th:name="'month'+${inputName}"
-             th:placeholder="mm"
-             th:attr="
-              aria-describedby=${inputName + '-month-label'},
-              aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
-              aria-invalid=${hasErrorMonth}"
-             th:value="${fieldData.getOrDefault('month' + inputName, '')}"/>
-      /
-      <input type="text" inputmode="numeric" maxlength="2"
-             class="text-input text-input--inline form-width--day"
-             th:id="${inputName}+'-day'"
-             th:name="'day'+${inputName}"
-             th:placeholder="dd"
-             th:attr="
-              aria-describedby=${inputName}+'-day-label',
-              aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
-              aria-invalid=${hasErrorDay}"
-             th:value="${fieldData.getOrDefault('day' + inputName, '')}"/>
-      /
-      <input type="text" inputmode="numeric" maxlength="4"
-             class="text-input text-input--inline form-width--year"
-             th:id="${inputName}+'-year'"
-             th:name="'year'+${inputName}"
-             th:placeholder="yyyy"
-             th:attr="
-              aria-describedby=${inputName}+'-year-label',
-              aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
-              aria-invalid=${hasErrorYear}"
-             th:value="${fieldData.getOrDefault('year' + inputName, '')}"/>
-    </fieldset>
-    <th:block
-        th:replace="~{fragments/inputError :: validationError(inputName='month'+${inputName})}"></th:block>
-    <th:block
-        th:replace="~{fragments/inputError :: validationError(inputName='day'+${inputName})}"></th:block>
-    <th:block
-        th:replace="~{fragments/inputError :: validationError(inputName='year'+${inputName})}"></th:block>
-    <th:block
-        th:replace="~{fragments/inputError :: validationError(inputName=${groupName})}"></th:block>
-  </div>
-</th:block>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/inputs/fulldate.html b/src/main/resources/templates/fragments/inputs/fulldate.html
deleted file mode 100644
index e6af3439..00000000
--- a/src/main/resources/templates/fragments/inputs/fulldate.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<th:block
-    th:fragment="fulldate"
-    th:with="
-      hasLabel=${!#strings.isEmpty(label)},
-      hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      hasErrorDate=${
-        errorMessages != null &&
-        errorMessages.get(inputName) != null &&
-        #arrays.length(errorMessages.get(inputName)) > 0
-      },
-      hasErrorMonth=${
-        errorMessages != null &&
-        errorMessages.get(inputName + 'Month') != null &&
-        #arrays.length(errorMessages.get(inputName + 'Month')) > 0 },
-      hasErrorDay=${
-        errorMessages != null &&
-        errorMessages.get(inputName + 'Day') != null &&
-        #arrays.length(errorMessages.get(inputName + 'Day')) > 0 },
-      hasErrorYear=${
-        errorMessages != null &&
-        errorMessages.get(inputName + 'Year') != null &&
-        #arrays.length(errorMessages.get(inputName + 'Year')) > 0 },
-      emptyList = ${ {'', '', ''} },
-      dateComponents=${inputData.get(inputName) != null && inputData.get(inputName).size() > 2 ? inputData.get(inputName) : emptyList }"
-    th:assert="${!#strings.isEmpty(inputName)}, ${hasLabel || hasAriaLabel}">
-  <div
-      th:class="'form-group' + ${((hasErrorMonth || hasErrorDay || hasErrorYear) ? ' form-group--error' : '')}">
-    <fieldset class="input-group input-group--inline">
-      <label th:if="${hasLabel}" th:for="${inputName}" th:text="${label}" class="form-question"/>
-      <p class="text--help">
-        <label th:for="${inputName}+'-month'"
-               th:id="${inputName}+'-month-label'"
-               th:text="#{${helpText}+ '.month'}"></label>
-        &nbsp;/&nbsp;
-        <label th:for="${inputName}+'-day'"
-               th:id="${inputName}+'-day-label'"
-               th:text="#{${helpText} + '.day'}"></label>
-        &nbsp;/&nbsp;
-        <label th:for="${inputName}+'-year'"
-               th:id="${inputName}+'-year-label'"
-               th:text="#{${helpText} + '.year'}"></label>
-      </p>
-      <!-- TODO: figure out the three fields for each date issue -->
-      <input type="text" inputmode="numeric" maxlength="2"
-             class="text-input text-input--inline form-width--month dob-input"
-             th:id="${inputName}+'-month'"
-             th:name="${inputName}"
-             th:placeholder="mm"
-             th:attr="
-              aria-describedby=${inputName + '-month-label'},
-              aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
-              aria-invalid=${hasErrorMonth}"
-             th:value="${dateComponents.get(0)}"/>
-      /
-      <input type="text" inputmode="numeric" maxlength="2"
-             class="text-input text-input--inline form-width--day dob-input"
-             th:id="${inputName}+'-day'"
-             th:name="${inputName}"
-             th:placeholder="dd"
-             th:attr="
-              aria-describedby=${inputName}+'-day-label',
-              aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
-              aria-invalid=${hasErrorDay}"
-             th:value="${dateComponents.get(1)}"/>
-      /
-      <input type="text" inputmode="numeric" maxlength="4"
-             class="text-input text-input--inline form-width--year dob-input"
-             th:id="${inputName}+'-year'"
-             th:name="${inputName}"
-             th:placeholder="yyyy"
-             th:attr="
-              aria-describedby=${inputName}+'-year-label',
-              aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
-              aria-invalid=${hasErrorYear}"
-             th:value="${dateComponents.get(2)}"/>
-    </fieldset>
-    <th:block
-      th:replace="~{fragments/inputError :: validationError(inputName=${inputName})}">
-    </th:block>
-  </div>
-</th:block>
diff --git a/src/main/resources/templates/fragments/inputs/householdCheckboxFieldset.html b/src/main/resources/templates/fragments/inputs/householdCheckboxFieldset.html
deleted file mode 100644
index 13fd6a7c..00000000
--- a/src/main/resources/templates/fragments/inputs/householdCheckboxFieldset.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<th:block th:fragment="householdCheckboxFieldset">
-  <th:block th:replace="~{'fragments/inputs/checkboxFieldset' ::
-                    checkboxFieldset(inputName=${inputName},
-                    ariaLabel='header',
-                    content=~{::householdMembers})}">
-    <th:block th:ref="householdMembers">
-      <p th:text="#{general.check-all-that-apply}"></p>
-      <th:block
-          th:replace="~{'fragments/inputs/checkboxInSet' :: checkboxInSet(inputName=${inputName}, value='you', label=${inputData.firstName + ' ' + inputData.lastName} + ' ' + #{general.you})}"/>
-      <th:block th:if="${inputData.get('household') != null}">
-        <th:block th:each="householdMember, iter: ${inputData.household}" class="spacing-below-15">
-          <th:block
-              th:replace="~{'fragments/inputs/checkboxInSet' :: checkboxInSet(inputName=${inputName},value=${householdMember.uuid}, label=${householdMember.householdMemberFirstName + ' ' + householdMember.householdMemberLastName})}"/>
-        </th:block>
-      </th:block>
-
-    </th:block>
-  </th:block>
-</th:block>
diff --git a/src/main/resources/templates/fragments/inputs/text.html b/src/main/resources/templates/fragments/inputs/text.html
deleted file mode 100644
index 158d8128..00000000
--- a/src/main/resources/templates/fragments/inputs/text.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<th:block
-    th:fragment="text"
-    th:with="
-      hasHelpText=${!#strings.isEmpty(helpText)},
-      hasLabel=${!#strings.isEmpty(label)},
-      hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
-      hasValue=${value != null},
-      hasError=${
-        errorMessages != null &&
-        errorMessages.get(inputName) != null &&
-        (#arrays.length(errorMessages.get(inputName)) > 0) }"
-    th:assert="${!#strings.isEmpty(inputName)}, ${hasLabel || hasAriaLabel}">
-  <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
-    <label th:if="${hasLabel}" th:for="${inputName}" th:text="${label}" class="form-question"/>
-    <p class="text--help"
-       th:if="${hasHelpText}"
-       th:id="${inputName + '-help-text'}"
-       th:text="${helpText}"></p>
-    <input type="text" class="text-input"
-           th:id="${inputName}"
-           th:name="${inputName}"
-           th:placeholder="${placeholder}"
-           th:attr="
-            aria-describedby=${hasHelpText ? inputName + '-help-text' : ''},
-            aria-labelledby=${hasAriaLabel ? ariaLabel : ''},
-            aria-invalid=${hasError}"
-           th:value="${hasValue ? value : fieldData.getOrDefault(inputName, '')}">
-    <th:block
-        th:replace="~{fragments/inputError :: validationError(inputName=${inputName})}"></th:block>
-  </div>
-</th:block>
\ No newline at end of file
diff --git a/src/main/resources/templates/mdBenefitsFlow/selectHelpNeeded.html b/src/main/resources/templates/mdBenefitsFlow/selectHelpNeeded.html
index 46d31d18..c15dca24 100644
--- a/src/main/resources/templates/mdBenefitsFlow/selectHelpNeeded.html
+++ b/src/main/resources/templates/mdBenefitsFlow/selectHelpNeeded.html
@@ -18,7 +18,6 @@
               <th:block th:replace="~{fragments/inputs/checkboxFieldset :: checkboxFieldset(
                                     inputName='helpNeeded',
                                     ariaLabel='header',
-                                    label=#{general.check-all-that-apply},
                                     content=~{::content})}">
                 <th:block th:ref="content">
                   <th:block