Marriage Validation Fixes

src/main/java/scot/carricksoftware/grants/validators/certificates/marriagecertificate/MarriageCertificateNullFieldsValidatorImpl.java

@@ -39,7 +39,7 @@ public class MarriageCertificateNullFieldsValidatorImpl implements MarriageCerti
 
     private void validateWhenMarried(MarriageCertificateCommand marriageCertificateCommand, BindingResult bindingResult) {
         logger.debug("MarriageCertificateNullFieldsValidator::validateWhenDied");
-        validateTypes.validateNullOrEmptyString(marriageCertificateCommand.getWhenMarried(), "whenDied", ValidationConstants.WHEN_MARRIED_IS_NULL, bindingResult);
+        validateTypes.validateNullOrEmptyString(marriageCertificateCommand.getWhenMarried(), "whenMarried", ValidationConstants.WHEN_MARRIED_IS_NULL, bindingResult);
     }
 
     private void validateGroom(MarriageCertificateCommand marriageCertificateCommand, BindingResult bindingResult) {

src/main/java/scot/carricksoftware/grants/validators/certificates/marriagecertificate/MarriageCertificateUntrackedFieldsValidatorImpl.java

@@ -53,7 +53,7 @@ public class MarriageCertificateUntrackedFieldsValidatorImpl implements Marriage
         validateTwoFieldTypes.validatePlaceAndUntrackedPlace(marriageCertificateCommand.getGroomUsualResidence(),
                 marriageCertificateCommand.getGroomUntrackedResidence(),
                 "groomUsualResidence",
-                "untrackedGroomResidence",
+                "groomUntrackedResidence",
                 ValidationConstants.GROOM_USUAL_RESIDENCE_AND_UNTRACKED_USUAL_RESIDENCE,
                 bindingResult);
     }
@@ -63,8 +63,8 @@ public class MarriageCertificateUntrackedFieldsValidatorImpl implements Marriage
         logger.debug("MarriageCertificateUntrackedFieldsValidatorImp::validateBrideUntrackedResidence");
         validateTwoFieldTypes.validatePlaceAndUntrackedPlace(marriageCertificateCommand.getBrideUsualResidence(),
                 marriageCertificateCommand.getBrideUntrackedResidence(),
-                "groomUsualResidence",
-                "untrackedGroomResidence",
+                "brideUsualResidence",
+                "brideUntrackedResidence",
                 ValidationConstants.BRIDE_USUAL_RESIDENCE_AND_UNTRACKED_USUAL_RESIDENCE,
                 bindingResult);
     }

src/main/resources/templates/certificates/birthCertificate/form.html

@@ -471,7 +471,7 @@
         <a class="btn btn-secondary" th:href="@{/birthCertificates}" th:text="${'List all'}">List all</a>
         <a class="btn btn-success" th:href="@{/}" th:text="${'Home'}">Home</a>
         <h6><span style="color: rgb(255,0,0);">*</span><span> Cannot be edited</span></h6>
-    </form>
+    </form>di
 </div>
 </body>
 </html>

src/main/resources/templates/certificates/marriageCertificate/form.html

@@ -349,7 +349,7 @@
                         <div th:if="${#fields.hasErrors('brideUntrackedResidence')}">
                             <ul class="text-danger">
                                 <li th:each="err : ${#fields.errors('brideUntrackedResidence')}" th:text="${err}"/>
-                            </ul>background-color: #F2F542;
+                            </ul>
                         </div>
                     </div>
                 </td>