Mother residences added to validator

src/main/java/scot/carricksoftware/grants/constants/ValidationConstants.java

@@ -45,8 +45,10 @@ public class ValidationConstants {
     public static final String WHEN_BORN_INCORRECT_FORMAT = "The format should be dd/MM/yyyy hh:mm.";
     public static final String WHEN_BORN_IS_NULL = "When born cannot be null.";
     public static final String FATHER_AND_UNTRACKED_FATHER = "One and only one father and untracked father must be specified.";
+    public static final String MOTHER_AND_UNTRACKED_FATHER = "One and only one father and untracked father may be specified.";
     public static final String WHERE_BORN_AND_UNTRACKED_WHERE_BORN = "One and only one where born and untracked where born must be specified.";
-    public static final String FATHER_USUAL_RESIDENCE_AND_UNTRACKED_FATHER_USUAL_RESIDENCE = "Only one usual residence and untracked usual residence may be specified.";
+    public static final String MOTHER_USUAL_RESIDENCE_AND_UNTRACKED_MOTHER_USUAL_RESIDENCE = "Only one usual residence and untracked usual residence may be specified.";
+    public static final String FATHER_USUAL_RESIDENCE_AND_UNTRACKED_FATHER_USUAL_RESIDENCE = "Only one usual residence and untracked usual residence must be specified.";
     public static final String BRIDE_IS_NULL = "The bride cannot be null.";
     public static final String GROOM_IS_NULL = "The groom cannot be null.";
     public static final String SAME_BRIDE_AND_GROOM = "The bride and groom cannot be the same person.";

src/main/java/scot/carricksoftware/grants/validators/certificates/birthcertificate/BirthCertificateCommandPartThreeValidatorImpl.java

@@ -40,7 +40,8 @@ public class BirthCertificateCommandPartThreeValidatorImpl implements BirthCerti
         validateFatherAndUntrackedFather(birthCertificateCommand, bindingResult);
         validateWhereBornAndUntrackedWhereBorn(birthCertificateCommand, bindingResult);
         validateWhenRegistered(birthCertificateCommand, bindingResult);
-        validateUsualResidences(birthCertificateCommand, bindingResult);
+        validateFatherUsualResidencesAndUntrackedFatherUsualResidence(birthCertificateCommand, bindingResult);
+        validateMotherUsualResidencesAndUntrackedMotherUsualResidence(birthCertificateCommand, bindingResult);
     }
 
     private void validateSex(BirthCertificateCommand birthCertificateCommand, BindingResult bindingResult) {
@@ -70,12 +71,18 @@ public class BirthCertificateCommandPartThreeValidatorImpl implements BirthCerti
                 "whereBorn", "untrackedWhereBorn", ValidationConstants.WHERE_BORN_AND_UNTRACKED_WHERE_BORN,bindingResult);
     }
 
-    private void validateUsualResidences(BirthCertificateCommand birthCertificateCommand, BindingResult bindingResult) {
-        logger.debug("Validating where Usual Residence and untracked usual residence");
+    private void validateFatherUsualResidencesAndUntrackedFatherUsualResidence(BirthCertificateCommand birthCertificateCommand, BindingResult bindingResult) {
+        logger.debug("Validating father Usual Residence and untracked usual residence");
         validateTwoFieldTypes.validateOptionalPlaceAndUntrackedPlace(birthCertificateCommand.getFatherUsualResidence(), birthCertificateCommand.getUntrackedFatherUsualResidence(),
                 "fatherUsualResidence", "untrackedFatherUsualResidence", ValidationConstants.FATHER_USUAL_RESIDENCE_AND_UNTRACKED_FATHER_USUAL_RESIDENCE,bindingResult);
     }
 
+    private void validateMotherUsualResidencesAndUntrackedMotherUsualResidence(BirthCertificateCommand birthCertificateCommand, BindingResult bindingResult) {
+        logger.debug("Validating mother Usual Residence and untracked usual residence");
+        validateTwoFieldTypes.validateOptionalPlaceAndUntrackedPlace(birthCertificateCommand.getMotherUsualResidence(), birthCertificateCommand.getUntrackedMotherUsualResidence(),
+                "motherUsualResidence", "untrackedMotherUsualResidence", ValidationConstants.MOTHER_USUAL_RESIDENCE_AND_UNTRACKED_MOTHER_USUAL_RESIDENCE,bindingResult);
+    }
+
     private void validateWhenRegistered(BirthCertificateCommand birthCertificateCommand, BindingResult bindingResult) {
         logger.debug("Validating birth certificate Registration Date");
         validateDateTypes.validatePastDate(birthCertificateCommand.getWhenRegistered(),

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

@@ -343,11 +343,11 @@
             </tr>
             <!---------------------------->
             <tr>
-            <td style="text-align: right; background-color: #FFFF00;">
+            <td style="text-align: right; background-color: #73ff00;">
                 <label for="motherUsualResidence">Mother Usual Residence :&nbsp;</label>
             </td>
             <td style="text-align: left;">
-                <select id="motherUsualResidence" name="motherUsualResidence" th:field="*{fatherUsualResidence}">
+                <select id="motherUsualResidence" name="motherUsualResidence" th:field="*{motherUsualResidence}">
                     <option th:value="${''}" th:text="${''}"></option>
                     <option th:each="place : ${places}"
                             th:value="${place.id}" th:text="${place.toString()}"></option>
@@ -360,7 +360,7 @@
             </td>
             </tr>
             <tr>
-                <td style="text-align: right;  background-color: #FFFF00;">
+                <td style="text-align: right;  background-color: #73ff00;">
                     <label for="untrackedMotherUsualResidence">Mother Usual Residence (untracked) :&nbsp;</label>
                 </td>
                 <td style="text-align: left; ">