From 941c6c93238360da9636df5a7eca3afe5a8cec7b Mon Sep 17 00:00:00 2001
From: Sree P <sprasad@codeforamerica.org>
Date: Fri, 23 Feb 2024 12:46:30 -0800
Subject: [PATCH 1/6] Adding a checkbox set fragment that works with
 InputOption enums

---
 src/main/java/org/ilgcc/app/utils/Gender.java | 24 +++++++++++++++++++
 .../java/org/ilgcc/app/utils/InputOption.java |  8 +++++++
 .../fragments/inputs/checkboxes.html          | 17 +++++++++++++
 .../templates/gcc/children-ccap-info.html     | 17 ++++---------
 4 files changed, 54 insertions(+), 12 deletions(-)
 create mode 100644 src/main/java/org/ilgcc/app/utils/Gender.java
 create mode 100644 src/main/java/org/ilgcc/app/utils/InputOption.java
 create mode 100644 src/main/resources/templates/fragments/inputs/checkboxes.html

diff --git a/src/main/java/org/ilgcc/app/utils/Gender.java b/src/main/java/org/ilgcc/app/utils/Gender.java
new file mode 100644
index 000000000..b891eaa28
--- /dev/null
+++ b/src/main/java/org/ilgcc/app/utils/Gender.java
@@ -0,0 +1,24 @@
+package org.ilgcc.app.utils;
+
+import lombok.Getter;
+
+@Getter
+public enum Gender implements InputOption {
+
+  MALE("general.inputs.male"),
+  FEMALE("general.inputs.female"),
+  NONBINARY("general.inputs.non-binary"),
+  TRANSGENDER("general.inputs.transgender"),
+  NO_ANSWER("general.inputs.prefer-not-to-answer");
+
+  private final String displayName;
+
+  Gender(String displayName) {
+    this.displayName = displayName;
+  }
+
+  @Override
+  public String getValue() {
+    return this.name();
+  }
+}
diff --git a/src/main/java/org/ilgcc/app/utils/InputOption.java b/src/main/java/org/ilgcc/app/utils/InputOption.java
new file mode 100644
index 000000000..421f0636d
--- /dev/null
+++ b/src/main/java/org/ilgcc/app/utils/InputOption.java
@@ -0,0 +1,8 @@
+package org.ilgcc.app.utils;
+
+
+public interface InputOption {
+
+  String getDisplayName();
+  String getValue();
+}
diff --git a/src/main/resources/templates/fragments/inputs/checkboxes.html b/src/main/resources/templates/fragments/inputs/checkboxes.html
new file mode 100644
index 000000000..bd992429c
--- /dev/null
+++ b/src/main/resources/templates/fragments/inputs/checkboxes.html
@@ -0,0 +1,17 @@
+<th:block th:fragment="checkboxes">
+  <th:block
+      th:replace="~{'fragments/inputs/checkboxFieldset' ::
+        checkboxFieldset(inputName=${inputName},
+          label=${label},
+          content=~{::checkboxContent})}">
+    <th:block th:ref="checkboxContent">
+      <th:block th:each="option : ${options}">
+        <th:block
+            th:replace="~{fragments/inputs/checkboxInSet ::
+              checkboxInSet(inputName=${inputName},
+                value=${option.getValue()},
+                label=#{${option.getDisplayName()}})}"/>
+      </th:block>
+    </th:block>
+  </th:block>
+</th:block>
\ No newline at end of file
diff --git a/src/main/resources/templates/gcc/children-ccap-info.html b/src/main/resources/templates/gcc/children-ccap-info.html
index 8a3fd28da..20c04d840 100644
--- a/src/main/resources/templates/gcc/children-ccap-info.html
+++ b/src/main/resources/templates/gcc/children-ccap-info.html
@@ -12,19 +12,12 @@
         <th:block
             th:replace="~{fragments/cardHeader :: cardHeader(header=#{children-ccap-info.header(${fieldData.get('childFirstName')})}, subtext=#{children-ccap-info.subheader})}"/>
         <th:block th:replace="~{fragments/form :: form(action=${formAction}, content=~{::formContent})}">
-          <th:block th:ref="formContent">
+          <th:block th:ref="formContent" th:with="options=${T(org.ilgcc.app.utils.Gender).values()}">
             <div class="form-card__content">
-              <th:block th:replace="~{'fragments/inputs/checkboxFieldset' ::
-                  checkboxFieldset(inputName='childGender',
-                  label=#{children-ccap-info.gender-question},
-                  content=~{::genderContent})}">
-                <th:block th:ref="genderContent">
-                  <th:block th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='childGender', value='MALE', label=#{general.inputs.male})}"/>
-                  <th:block th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='childGender', value='FEMALE', label=#{general.inputs.female})}"/>
-                  <th:block th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='childGender', value='NONBINARY', label=#{general.inputs.non-binary})}"/>
-                  <th:block th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='childGender', value='TRANSGENDER', label=#{general.inputs.transgender})}"/>
-                  <th:block th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='childGender', value='NO_ANSWER', label=#{general.inputs.prefer-not-to-answer})}"/>
-                </th:block>
+              <th:block th:replace="~{fragments/inputs/checkboxes ::
+                  checkboxes(inputName='childGender',
+                    label=#{children-ccap-info.gender-question},
+                    options=${options})}">
               </th:block>
 
               <th:block th:replace="~{fragments/inputs/radioFieldset ::

From dff0f9ae3c8521a3a9398bc78d7da4201e46e5d6 Mon Sep 17 00:00:00 2001
From: Sree P <sprasad@codeforamerica.org>
Date: Fri, 23 Feb 2024 12:55:28 -0800
Subject: [PATCH 2/6] refactoring

---
 .../utils/{Gender.java => GenderOption.java}  |  4 +--
 .../ilgcc/app/utils/RaceEthnicityOption.java  | 27 +++++++++++++++++++
 .../templates/gcc/children-ccap-info.html     | 26 +++++++-----------
 3 files changed, 38 insertions(+), 19 deletions(-)
 rename src/main/java/org/ilgcc/app/utils/{Gender.java => GenderOption.java} (82%)
 create mode 100644 src/main/java/org/ilgcc/app/utils/RaceEthnicityOption.java

diff --git a/src/main/java/org/ilgcc/app/utils/Gender.java b/src/main/java/org/ilgcc/app/utils/GenderOption.java
similarity index 82%
rename from src/main/java/org/ilgcc/app/utils/Gender.java
rename to src/main/java/org/ilgcc/app/utils/GenderOption.java
index b891eaa28..ddc7bef60 100644
--- a/src/main/java/org/ilgcc/app/utils/Gender.java
+++ b/src/main/java/org/ilgcc/app/utils/GenderOption.java
@@ -3,7 +3,7 @@
 import lombok.Getter;
 
 @Getter
-public enum Gender implements InputOption {
+public enum GenderOption implements InputOption {
 
   MALE("general.inputs.male"),
   FEMALE("general.inputs.female"),
@@ -13,7 +13,7 @@ public enum Gender implements InputOption {
 
   private final String displayName;
 
-  Gender(String displayName) {
+  GenderOption(String displayName) {
     this.displayName = displayName;
   }
 
diff --git a/src/main/java/org/ilgcc/app/utils/RaceEthnicityOption.java b/src/main/java/org/ilgcc/app/utils/RaceEthnicityOption.java
new file mode 100644
index 000000000..47d8c5d7b
--- /dev/null
+++ b/src/main/java/org/ilgcc/app/utils/RaceEthnicityOption.java
@@ -0,0 +1,27 @@
+package org.ilgcc.app.utils;
+
+import lombok.Getter;
+
+@Getter
+public enum RaceEthnicityOption implements InputOption {
+
+  ASIAN("general.inputs.race-ethnicity.asian"),
+  BLACK("general.inputs.race-ethnicity.black-or-african-american"),
+  HISPANIC("general.inputs.race-ethnicity.hispanic-latino-or-spanish"),
+  MIDDLE_EASTERN("general.inputs.race-ethnicity.middle-eastern-or-north-african"),
+  NATIVE_AMERICAN("general.inputs.race-ethnicity.native-american-or-alaska-native"),
+  NATIVE_HAWAIIAN("general.inputs.race-ethnicity.native-hawaiian-or-pacific-islander"),
+  WHITE("general.inputs.race-ethnicity.white"),
+  OTHER("general.inputs.race-ethnicity.other");
+
+  private final String displayName;
+
+  RaceEthnicityOption(String displayName) {
+    this.displayName = displayName;
+  }
+
+  @Override
+  public String getValue() {
+    return this.name();
+  }
+}
diff --git a/src/main/resources/templates/gcc/children-ccap-info.html b/src/main/resources/templates/gcc/children-ccap-info.html
index 20c04d840..d915c3ed4 100644
--- a/src/main/resources/templates/gcc/children-ccap-info.html
+++ b/src/main/resources/templates/gcc/children-ccap-info.html
@@ -12,12 +12,15 @@
         <th:block
             th:replace="~{fragments/cardHeader :: cardHeader(header=#{children-ccap-info.header(${fieldData.get('childFirstName')})}, subtext=#{children-ccap-info.subheader})}"/>
         <th:block th:replace="~{fragments/form :: form(action=${formAction}, content=~{::formContent})}">
-          <th:block th:ref="formContent" th:with="options=${T(org.ilgcc.app.utils.Gender).values()}">
+          <th:block th:ref="formContent"
+                    th:with="
+                      genderOptions=${T(org.ilgcc.app.utils.GenderOption).values()},
+                      raceEthnicityOptions=${T(org.ilgcc.app.utils.RaceEthnicityOption).values()}">
             <div class="form-card__content">
               <th:block th:replace="~{fragments/inputs/checkboxes ::
                   checkboxes(inputName='childGender',
                     label=#{children-ccap-info.gender-question},
-                    options=${options})}">
+                    options=${genderOptions})}">
               </th:block>
 
               <th:block th:replace="~{fragments/inputs/radioFieldset ::
@@ -52,21 +55,10 @@
                 </th:block>
               </th:block>
 
-              <th:block th:replace="~{'fragments/inputs/checkboxFieldset' ::
-                  checkboxFieldset(inputName='childRaceEthnicity',
-                  label=#{children-ccap-info.race-ethnicity-question},
-                  fieldsetHelpText=#{children-ccap-info.race-ethnicity-help-text},
-                  content=~{::raceEthnicityContent})}">
-                <th:block th:ref="raceEthnicityContent">
-                  <th:block th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='childRaceEthnicity', value='ASIAN', label=#{general.inputs.race-ethnicity.asian})}"/>
-                  <th:block th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='childRaceEthnicity', value='BLACK', label=#{general.inputs.race-ethnicity.black-or-african-american})}"/>
-                  <th:block th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='childRaceEthnicity', value='HISPANIC', label=#{general.inputs.race-ethnicity.hispanic-latino-or-spanish})}"/>
-                  <th:block th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='childRaceEthnicity', value='MIDDLE_EASTERN', label=#{general.inputs.race-ethnicity.middle-eastern-or-north-african})}"/>
-                  <th:block th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='childRaceEthnicity', value='NATIVE_AMERICAN', label=#{general.inputs.race-ethnicity.native-american-or-alaska-native})}"/>
-                  <th:block th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='childRaceEthnicity', value='NATIVE_HAWAIIAN', label=#{general.inputs.race-ethnicity.native-hawaiian-or-pacific-islander})}"/>
-                  <th:block th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='childRaceEthnicity', value='WHITE', label=#{general.inputs.race-ethnicity.white})}"/>
-                  <th:block th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='childRaceEthnicity', value='other', label=#{general.inputs.race-ethnicity.other})}"/>
-                </th:block>
+              <th:block th:replace="~{fragments/inputs/checkboxes ::
+                  checkboxes(inputName='childRaceEthnicity',
+                    label=#{children-ccap-info.race-ethnicity-question},
+                    options=${raceEthnicityOptions})}">
               </th:block>
             </div>
             <div class="form-card__footer">

From d2e01d3aa4ce5c7aa8d2f706d55bce8f216a7912 Mon Sep 17 00:00:00 2001
From: Sree P <sprasad@codeforamerica.org>
Date: Fri, 23 Feb 2024 15:11:24 -0800
Subject: [PATCH 3/6] Refactoring

---
 .../org/ilgcc/app/utils/GenderOption.java     | 11 +++--
 .../java/org/ilgcc/app/utils/InputOption.java |  5 +-
 .../ilgcc/app/utils/RaceEthnicityOption.java  | 12 +++--
 .../fragments/inputs/checkboxFieldset.html    | 46 +++++++++++++++++++
 .../fragments/inputs/checkboxes.html          | 17 -------
 .../fragments/inputs/radioFieldset.html       | 45 ++++++++++++++++++
 .../templates/gcc/children-ccap-info.html     |  8 ++--
 7 files changed, 116 insertions(+), 28 deletions(-)
 create mode 100644 src/main/resources/templates/fragments/inputs/checkboxFieldset.html
 delete mode 100644 src/main/resources/templates/fragments/inputs/checkboxes.html
 create mode 100644 src/main/resources/templates/fragments/inputs/radioFieldset.html

diff --git a/src/main/java/org/ilgcc/app/utils/GenderOption.java b/src/main/java/org/ilgcc/app/utils/GenderOption.java
index ddc7bef60..5dad7a52f 100644
--- a/src/main/java/org/ilgcc/app/utils/GenderOption.java
+++ b/src/main/java/org/ilgcc/app/utils/GenderOption.java
@@ -11,14 +11,19 @@ public enum GenderOption implements InputOption {
   TRANSGENDER("general.inputs.transgender"),
   NO_ANSWER("general.inputs.prefer-not-to-answer");
 
-  private final String displayName;
+  private final String label;
 
-  GenderOption(String displayName) {
-    this.displayName = displayName;
+  GenderOption(String label) {
+    this.label = label;
   }
 
   @Override
   public String getValue() {
     return this.name();
   }
+
+  @Override
+  public String getHelpText() {
+    return null;
+  }
 }
diff --git a/src/main/java/org/ilgcc/app/utils/InputOption.java b/src/main/java/org/ilgcc/app/utils/InputOption.java
index 421f0636d..b69aea9a8 100644
--- a/src/main/java/org/ilgcc/app/utils/InputOption.java
+++ b/src/main/java/org/ilgcc/app/utils/InputOption.java
@@ -3,6 +3,9 @@
 
 public interface InputOption {
 
-  String getDisplayName();
+  String getLabel();
+
   String getValue();
+
+  String getHelpText();
 }
diff --git a/src/main/java/org/ilgcc/app/utils/RaceEthnicityOption.java b/src/main/java/org/ilgcc/app/utils/RaceEthnicityOption.java
index 47d8c5d7b..48dcd74e3 100644
--- a/src/main/java/org/ilgcc/app/utils/RaceEthnicityOption.java
+++ b/src/main/java/org/ilgcc/app/utils/RaceEthnicityOption.java
@@ -14,14 +14,20 @@ public enum RaceEthnicityOption implements InputOption {
   WHITE("general.inputs.race-ethnicity.white"),
   OTHER("general.inputs.race-ethnicity.other");
 
-  private final String displayName;
+  private final String label;
 
-  RaceEthnicityOption(String displayName) {
-    this.displayName = displayName;
+  RaceEthnicityOption(String label) {
+    this.label = label;
   }
 
   @Override
   public String getValue() {
     return this.name();
   }
+
+  @Override
+  public String getHelpText() {
+    return null;
+  }
+
 }
diff --git a/src/main/resources/templates/fragments/inputs/checkboxFieldset.html b/src/main/resources/templates/fragments/inputs/checkboxFieldset.html
new file mode 100644
index 000000000..fdce4a09a
--- /dev/null
+++ b/src/main/resources/templates/fragments/inputs/checkboxFieldset.html
@@ -0,0 +1,46 @@
+<th:block
+    th:fragment="checkboxFieldset"
+    th:with="
+      hasHelpText=${!#strings.isEmpty(fieldsetHelpText)},
+      hasLabel=${!#strings.isEmpty(label)},
+      hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
+      hasOptions=${options != null},
+      hasContent=${!hasOptions},
+      hasError=${
+        errorMessages != null &&
+        errorMessages.get(inputName) != null &&
+        (#arrays.length(errorMessages.get(inputName)) > 0) }"
+    th:assert="
+      ${!#strings.isEmpty(inputName)},
+      ${hasLabel || hasAriaLabel},
+      ${content != null || hasOptions}">
+  <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
+    <fieldset th:attr="
+      aria-describedby=${hasHelpText ? inputName + '-help-text' : ''},
+      aria-labelledby=${hasAriaLabel ? ariaLabel : ''}">
+      <legend class="form-question"
+              th:if="${hasLabel}"
+              th:id="${inputName + '-legend'}"
+              th:inline="text">
+        [[${label}]]
+        <p class="text--help spacing-below-0 text--normal"
+           th:if="${hasHelpText}"
+           th:id="${inputName + '-help-text'}"
+           th:text="${fieldsetHelpText}"></p>
+      </legend>
+      <input type="hidden" th:id="${inputName} + 'Hidden'" th:name="${inputName} + '[]'" value="">
+      <th:block th:if="${hasContent}" th:replace="${content}"/>
+      <th:block th:if="${hasOptions}">
+        <th:block th:each="option : ${options}">
+          <th:block th:replace="~{fragments/inputs/checkboxInSet ::
+            checkboxInSet(inputName=${inputName},
+              value=${option.getValue()},
+              label=${#strings.isEmpty(option.getLabel()) ? null : #messages.msg(option.getLabel())},
+              checkboxHelpText=${#strings.isEmpty(option.getHelpText()) ? null : #messages.msg(option.getHelpText())})}"/>
+        </th:block>
+      </th:block>
+      <th:block
+          th:replace="~{fragments/inputError :: validationError(inputName=${inputName})}"></th:block>
+    </fieldset>
+  </div>
+</th:block>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/inputs/checkboxes.html b/src/main/resources/templates/fragments/inputs/checkboxes.html
deleted file mode 100644
index bd992429c..000000000
--- a/src/main/resources/templates/fragments/inputs/checkboxes.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<th:block th:fragment="checkboxes">
-  <th:block
-      th:replace="~{'fragments/inputs/checkboxFieldset' ::
-        checkboxFieldset(inputName=${inputName},
-          label=${label},
-          content=~{::checkboxContent})}">
-    <th:block th:ref="checkboxContent">
-      <th:block th:each="option : ${options}">
-        <th:block
-            th:replace="~{fragments/inputs/checkboxInSet ::
-              checkboxInSet(inputName=${inputName},
-                value=${option.getValue()},
-                label=#{${option.getDisplayName()}})}"/>
-      </th:block>
-    </th:block>
-  </th:block>
-</th:block>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/inputs/radioFieldset.html b/src/main/resources/templates/fragments/inputs/radioFieldset.html
new file mode 100644
index 000000000..0bd6cbd7f
--- /dev/null
+++ b/src/main/resources/templates/fragments/inputs/radioFieldset.html
@@ -0,0 +1,45 @@
+<th:block
+    th:fragment="radioFieldset"
+    th:with="
+      hasHelpText=${!#strings.isEmpty(fieldsetHelpText)},
+      hasLabel=${!#strings.isEmpty(label)},
+      hasAriaLabel=${!#strings.isEmpty(ariaLabel)},
+      hasOptions=${options != null},
+      hasContent=${!hasOptions},
+      hasError=${
+        errorMessages != null &&
+        errorMessages.get(inputName) != null &&
+        (#arrays.length(errorMessages.get(inputName)) > 0) }"
+    th:assert="
+      ${!#strings.isEmpty(inputName)},
+      ${hasLabel || hasAriaLabel},
+      ${content != null || hasOptions}">
+  <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
+    <fieldset th:attr="
+      aria-describedby=${hasHelpText ? inputName + '-help-text' : ''},
+      aria-labelledby=${hasAriaLabel ? ariaLabel : ''}">
+      <legend class="form-question"
+              th:id="${inputName + '-legend'}"
+              th:inline="text">
+        [[${label}]]
+        <p class="text--help spacing-below-0 text--normal"
+           th:if="${hasHelpText}"
+           th:id="${inputName + '-help-text'}"
+           th:text="${fieldsetHelpText}"></p>
+      </legend>
+      <input type="hidden" th:id="${inputName} + 'Hidden'" th:name="${inputName}" value="">
+      <th:block th:if="${hasContent}" th:replace="${content}"/>
+      <th:block th:if="${hasOptions}">
+        <th:block th:each="option : ${options}">
+          <th:block th:replace="~{fragments/inputs/radio ::
+            radio(inputName=${inputName},
+              value=${option.getValue()},
+              label=#{${option.getLabel()}},
+              radioHelpText=#{${option.getHelpText()}})}"/>
+        </th:block>
+      </th:block>
+    </fieldset>
+    <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/gcc/children-ccap-info.html b/src/main/resources/templates/gcc/children-ccap-info.html
index d915c3ed4..4f19e5e2d 100644
--- a/src/main/resources/templates/gcc/children-ccap-info.html
+++ b/src/main/resources/templates/gcc/children-ccap-info.html
@@ -17,8 +17,8 @@
                       genderOptions=${T(org.ilgcc.app.utils.GenderOption).values()},
                       raceEthnicityOptions=${T(org.ilgcc.app.utils.RaceEthnicityOption).values()}">
             <div class="form-card__content">
-              <th:block th:replace="~{fragments/inputs/checkboxes ::
-                  checkboxes(inputName='childGender',
+              <th:block th:replace="~{fragments/inputs/checkboxFieldset ::
+                  checkboxFieldset(inputName='childGender',
                     label=#{children-ccap-info.gender-question},
                     options=${genderOptions})}">
               </th:block>
@@ -55,8 +55,8 @@
                 </th:block>
               </th:block>
 
-              <th:block th:replace="~{fragments/inputs/checkboxes ::
-                  checkboxes(inputName='childRaceEthnicity',
+              <th:block th:replace="~{fragments/inputs/checkboxFieldset ::
+                  checkboxFieldset(inputName='childRaceEthnicity',
                     label=#{children-ccap-info.race-ethnicity-question},
                     options=${raceEthnicityOptions})}">
               </th:block>

From dc3fd82b133e188356022249b37939dc9efd91b5 Mon Sep 17 00:00:00 2001
From: Sree P <sprasad@codeforamerica.org>
Date: Fri, 23 Feb 2024 15:32:21 -0800
Subject: [PATCH 4/6] cleanup

---
 .../templates/fragments/inputs/checkboxFieldset.html        | 6 ++++--
 .../resources/templates/fragments/inputs/radioFieldset.html | 6 ++++--
 src/main/resources/templates/gcc/children-ccap-info.html    | 6 ++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/templates/fragments/inputs/checkboxFieldset.html b/src/main/resources/templates/fragments/inputs/checkboxFieldset.html
index fdce4a09a..cf7dd9048 100644
--- a/src/main/resources/templates/fragments/inputs/checkboxFieldset.html
+++ b/src/main/resources/templates/fragments/inputs/checkboxFieldset.html
@@ -13,7 +13,7 @@
     th:assert="
       ${!#strings.isEmpty(inputName)},
       ${hasLabel || hasAriaLabel},
-      ${content != null || hasOptions}">
+      ${hasContent || hasOptions}">
   <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
     <fieldset th:attr="
       aria-describedby=${hasHelpText ? inputName + '-help-text' : ''},
@@ -29,7 +29,9 @@
            th:text="${fieldsetHelpText}"></p>
       </legend>
       <input type="hidden" th:id="${inputName} + 'Hidden'" th:name="${inputName} + '[]'" value="">
-      <th:block th:if="${hasContent}" th:replace="${content}"/>
+      <th:block th:if="${hasContent}">
+        <th:block th:replace="${content}"/>
+      </th:block>
       <th:block th:if="${hasOptions}">
         <th:block th:each="option : ${options}">
           <th:block th:replace="~{fragments/inputs/checkboxInSet ::
diff --git a/src/main/resources/templates/fragments/inputs/radioFieldset.html b/src/main/resources/templates/fragments/inputs/radioFieldset.html
index 0bd6cbd7f..c1aa585f9 100644
--- a/src/main/resources/templates/fragments/inputs/radioFieldset.html
+++ b/src/main/resources/templates/fragments/inputs/radioFieldset.html
@@ -13,7 +13,7 @@
     th:assert="
       ${!#strings.isEmpty(inputName)},
       ${hasLabel || hasAriaLabel},
-      ${content != null || hasOptions}">
+      ${hasContent || hasOptions}">
   <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}">
     <fieldset th:attr="
       aria-describedby=${hasHelpText ? inputName + '-help-text' : ''},
@@ -28,7 +28,9 @@
            th:text="${fieldsetHelpText}"></p>
       </legend>
       <input type="hidden" th:id="${inputName} + 'Hidden'" th:name="${inputName}" value="">
-      <th:block th:if="${hasContent}" th:replace="${content}"/>
+      <th:block th:if="${hasContent}">
+        <th:block th:replace="${content}"/>
+      </th:block>
       <th:block th:if="${hasOptions}">
         <th:block th:each="option : ${options}">
           <th:block th:replace="~{fragments/inputs/radio ::
diff --git a/src/main/resources/templates/gcc/children-ccap-info.html b/src/main/resources/templates/gcc/children-ccap-info.html
index 4f19e5e2d..3c2f27855 100644
--- a/src/main/resources/templates/gcc/children-ccap-info.html
+++ b/src/main/resources/templates/gcc/children-ccap-info.html
@@ -20,8 +20,7 @@
               <th:block th:replace="~{fragments/inputs/checkboxFieldset ::
                   checkboxFieldset(inputName='childGender',
                     label=#{children-ccap-info.gender-question},
-                    options=${genderOptions})}">
-              </th:block>
+                    options=${genderOptions})}"/>
 
               <th:block th:replace="~{fragments/inputs/radioFieldset ::
                   radioFieldset(inputName='childHasDisability',
@@ -58,8 +57,7 @@
               <th:block th:replace="~{fragments/inputs/checkboxFieldset ::
                   checkboxFieldset(inputName='childRaceEthnicity',
                     label=#{children-ccap-info.race-ethnicity-question},
-                    options=${raceEthnicityOptions})}">
-              </th:block>
+                    options=${raceEthnicityOptions})}"/>
             </div>
             <div class="form-card__footer">
               <th:block th:replace="~{fragments/inputs/submitButton :: submitButton(text=#{general.inputs.continue})}"/>

From ed6cf3311306252b2e82b157c81de480d9d75c52 Mon Sep 17 00:00:00 2001
From: Sree P <sprasad@codeforamerica.org>
Date: Fri, 23 Feb 2024 15:39:43 -0800
Subject: [PATCH 5/6] null check

---
 .../resources/templates/fragments/inputs/radioFieldset.html   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/templates/fragments/inputs/radioFieldset.html b/src/main/resources/templates/fragments/inputs/radioFieldset.html
index c1aa585f9..c19d35166 100644
--- a/src/main/resources/templates/fragments/inputs/radioFieldset.html
+++ b/src/main/resources/templates/fragments/inputs/radioFieldset.html
@@ -36,8 +36,8 @@
           <th:block th:replace="~{fragments/inputs/radio ::
             radio(inputName=${inputName},
               value=${option.getValue()},
-              label=#{${option.getLabel()}},
-              radioHelpText=#{${option.getHelpText()}})}"/>
+              label=${#strings.isEmpty(option.getLabel()) ? null : #messages.msg(option.getLabel())},
+              radioHelpText=${#strings.isEmpty(option.getHelpText()) ? null : #messages.msg(option.getHelpText())})}"/>
         </th:block>
       </th:block>
     </fieldset>

From 235981695e13149701ad431eab16dce41d354895 Mon Sep 17 00:00:00 2001
From: Sree P <sprasad@codeforamerica.org>
Date: Fri, 23 Feb 2024 16:18:44 -0800
Subject: [PATCH 6/6] codeql

---
 src/main/java/org/ilgcc/app/utils/GenderOption.java       | 8 +++++---
 .../java/org/ilgcc/app/utils/RaceEthnicityOption.java     | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/ilgcc/app/utils/GenderOption.java b/src/main/java/org/ilgcc/app/utils/GenderOption.java
index 5dad7a52f..5efbbbe53 100644
--- a/src/main/java/org/ilgcc/app/utils/GenderOption.java
+++ b/src/main/java/org/ilgcc/app/utils/GenderOption.java
@@ -1,8 +1,5 @@
 package org.ilgcc.app.utils;
 
-import lombok.Getter;
-
-@Getter
 public enum GenderOption implements InputOption {
 
   MALE("general.inputs.male"),
@@ -17,6 +14,11 @@ public enum GenderOption implements InputOption {
     this.label = label;
   }
 
+  @Override
+  public String getLabel() {
+    return label;
+  }
+
   @Override
   public String getValue() {
     return this.name();
diff --git a/src/main/java/org/ilgcc/app/utils/RaceEthnicityOption.java b/src/main/java/org/ilgcc/app/utils/RaceEthnicityOption.java
index 48dcd74e3..caef37dac 100644
--- a/src/main/java/org/ilgcc/app/utils/RaceEthnicityOption.java
+++ b/src/main/java/org/ilgcc/app/utils/RaceEthnicityOption.java
@@ -1,8 +1,5 @@
 package org.ilgcc.app.utils;
 
-import lombok.Getter;
-
-@Getter
 public enum RaceEthnicityOption implements InputOption {
 
   ASIAN("general.inputs.race-ethnicity.asian"),
@@ -20,6 +17,11 @@ public enum RaceEthnicityOption implements InputOption {
     this.label = label;
   }
 
+  @Override
+  public String getLabel() {
+    return label;
+  }
+
   @Override
   public String getValue() {
     return this.name();