瀏覽代碼

Marriage Certificate vDetails not sticking

Andrew Grant 4 月之前
父節點
當前提交
9fe107cb53

+ 5 - 0
src/main/java/scot/carricksoftware/grants/converters/certificates/marriagecertificates/helpers/certificate/MarriageCertificateCertificateConverterImpl.java

@@ -16,6 +16,11 @@ public class MarriageCertificateCertificateConverterImpl implements MarriageCert
     public void convert(MarriageCertificate source, MarriageCertificateCommand target) {
 
         target.setId(source.getId());
+        target.setCertificateNumber(source.getCertificateNumber());
+        target.setCertificateNumber(source.getCertificateNumber());
+        target.setCertificateDate(source.getCertificateDate());
+        target.setCertificateType(source.getCertificateType());
+        target.setCertificateSource(source.getCertificateSource());
         target.setNumber(source.getNumber());
         target.setRegistrationAuthority(source.getRegistrationAuthority());
         target.setUntrackedWhereMarried(source.getUntrackedWhereMarried());

+ 4 - 0
src/main/java/scot/carricksoftware/grants/converters/certificates/marriagecertificates/helpers/command/MarriageCertificateCertificateCommandConverterImpl.java

@@ -16,6 +16,10 @@ public class MarriageCertificateCertificateCommandConverterImpl implements Marri
     public void convert(MarriageCertificateCommand source, MarriageCertificate target) {
 
         target.setWhereMarried(source.getWhereMarried());
+        target.setCertificateSource(source.getCertificateSource());
+        target.setCertificateNumber(source.getCertificateNumber());
+        target.setCertificateDate(source.getCertificateDate());
+        target.setCertificateType(source.getCertificateType());
         target.setWhenMarried(source.getWhenMarried());
         target.setVolume(source.getVolume());
         target.setUntrackedWhereMarried(source.getUntrackedWhereMarried());

+ 16 - 0
src/main/resources/templates/certificates/marriageCertificate/form.html

@@ -157,6 +157,22 @@
                     </div>
                 </td>
             </tr>
+            <tr>
+                <td style="text-align: right;">
+                    <label for="whenMarried">When Married :&nbsp;</label>
+                </td>
+                <td style="text-align: left;">
+                    <div>
+                        <input class="whenMarried" id="whenMarried"
+                               th:field="*{whenMarried}" type="text">
+                        <div th:if="${#fields.hasErrors('whenMarried')}">
+                            <ul class="text-danger">
+                                <li th:each="err : ${#fields.errors('whenMarried')}" th:text="${err}"/>
+                            </ul>
+                        </div>
+                    </div>
+                </td>
+            </tr>
             <tr>
                 <td style="text-align:right; background-color: #FFC300;">
                     <label for="whereMarried">Where Married :&nbsp;</label>