Procházet zdrojové kódy

Bachelor and Spinster added to condition

Andrew Grant před 4 měsíci
rodič
revize
d7c283dd2e

+ 7 - 5
src/main/java/scot/carricksoftware/grants/enums/censusentry/CensusEntryCondition.java

@@ -7,11 +7,13 @@ package scot.carricksoftware.grants.enums.censusentry;
 
 public enum CensusEntryCondition {
 
-    @SuppressWarnings("unused") WIDOW("Widow"),
-    @SuppressWarnings("unused") WIDOWED("Widowed"),
-    @SuppressWarnings("unused") WIDOWER("Widower"),
-    @SuppressWarnings("unused") MARRIED("Married"),
-    @SuppressWarnings("unused") SINGLE("Single");
+    BACHELOR("Bachelor"),
+    MARRIED("Married"),
+    SINGLE("Single"),
+    SPINSTER ("Spinster"),
+    WIDOW("Widow"),
+    WIDOWED("Widowed"),
+    WIDOWER("Widower");
 
     @SuppressWarnings("unused")
     public final String label;

+ 10 - 18
src/main/resources/templates/certificates/marriageCertificate/form.html

@@ -278,15 +278,11 @@
                     <label for="brideCondition">Bride Condition :&nbsp;</label>
                 </td>
                 <td style="text-align: left;">
-                    <div>
-                        <input class="brideCondition" id="brideCondition"
-                               th:field="*{brideCondition}" type="text">
-                        <div th:if="${#fields.hasErrors('brideCondition')}">
-                            <ul class="text-danger">
-                                <li th:each="err : ${#fields.errors('brideCondition')}" th:text="${err}"/>
-                            </ul>
-                        </div>
-                    </div>
+                    <select id="brideCondition" style="width: 200px;" name="brideCondition" th:field="*{brideCondition}">
+                        <option th:value="${''}" th:text="${''}"></option>
+                        <option th:each="value : ${T(scot.carricksoftware.grants.enums.censusentry.CensusEntryCondition).values()}"
+                                th:value="${value}" th:text="${value.label}"></option>
+                    </select>
                 </td>
             </tr>
             <tr>
@@ -426,15 +422,11 @@
                     <label for="groomCondition">Groom Condition :&nbsp;</label>
                 </td>
                 <td style="text-align: left;">
-                    <div>
-                        <input class="groomCondition" id="groomCondition"
-                               th:field="*{groomCondition}" type="text">
-                        <div th:if="${#fields.hasErrors('groomCondition')}">
-                            <ul class="text-danger">
-                                <li th:each="err : ${#fields.errors('groomCondition')}" th:text="${err}"/>
-                            </ul>
-                        </div>
-                    </div>
+                    <select id="groomCondition" style="width: 200px;" name="groomCondition" th:field="*{groomCondition}">
+                        <option th:value="${''}" th:text="${''}"></option>
+                        <option th:each="value : ${T(scot.carricksoftware.grants.enums.censusentry.CensusEntryCondition).values()}"
+                                th:value="${value}" th:text="${value.label}"></option>
+                    </select>
                 </td>
             </tr>
             <tr>