Эх сурвалжийг харах

CensusEntry Worker added to CensusEntry Form

Andrew Grant 5 сар өмнө
parent
commit
1e490f1fd6

+ 2 - 2
src/main/java/scot/carricksoftware/grants/enums/censusentry/CensusEntryWorker.java

@@ -7,8 +7,8 @@ package scot.carricksoftware.grants.enums.censusentry;
 
 public enum CensusEntryWorker {
     @SuppressWarnings("unused") WORKER("Worker"),
-    @SuppressWarnings("unused") EMPLOYER("Widower"),
-    @SuppressWarnings("unused") OWN_ACCOUNT("Own Account"),;
+    @SuppressWarnings("unused") EMPLOYER("Employer"),
+    OWN_ACCOUNT("Own Account");
 
     @SuppressWarnings("unused")
     public final String label;

+ 10 - 0
src/main/resources/templates/censusentry/form.html

@@ -109,6 +109,16 @@ rounded-3 text-center p-4">
                     </select>
                 </div>
             </div>
+            <div class="col-md-3">
+                <label for="worker">Worker</label>
+                <div>
+                    <select id="worker" style="width: 200px;" name="worker" th:field="*{worker}">
+                        <option th:value="${''}" th:text="${''}"></option>
+                        <option th:each="value : ${T(scot.carricksoftware.grants.enums.censusentry.CensusEntryWorker).values()}"
+                                th:value="${value}" th:text="${value.label}"></option>
+                    </select>
+                </div>
+            </div>
         </div>
         <button type="submit" class="btn btn-primary">Commit</button>
         <a class="btn btn-secondary" th:href="@{/censusEntries}" th:text="${'List all'}">List all</a>