Marriage Form Controller - added organisation

src/main/java/scot/carricksoftware/grants/controllers/certificates/marriagecertificates/MarriageCertificateFormControllerImpl.java

@@ -25,6 +25,7 @@ import scot.carricksoftware.grants.converters.certificates.marriagecertificates.
 import scot.carricksoftware.grants.converters.certificates.marriagecertificates.MarriageCertificateConverterImpl;
 import scot.carricksoftware.grants.services.certificates.marriagecertificates.MarriageCertificateService;
 import scot.carricksoftware.grants.services.people.PersonService;
+import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
 import scot.carricksoftware.grants.validators.certificates.marriagecertificate.MarriageCertificateCommandValidator;
 
 @SuppressWarnings("LoggingSimilarMessage")
@@ -38,13 +39,14 @@ public class MarriageCertificateFormControllerImpl implements MarriageCertificat
     private final MarriageCertificateConverterImpl marriageCertificateConverter;
     private final MarriageCertificateCommandValidator marriageCertificateCommandValidator;
     private final PersonService personService;
+    private final OrganisationService organisationService;
 
 
     public MarriageCertificateFormControllerImpl(MarriageCertificateService marriageCertificateService,
                                                  MarriageCertificateCommandConverterImpl marriageCertificateCommandConverter,
                                                  MarriageCertificateConverterImpl marriageCertificateConverter,
                                                  MarriageCertificateCommandValidator marriageCertificateCommandValidator,
-                                                 PersonService personService) {
+                                                 PersonService personService, OrganisationService organisationService) {
         this.marriageCertificateService = marriageCertificateService;
         this.marriageCertificateCommandConverter = marriageCertificateCommandConverter;
 
@@ -52,6 +54,7 @@ public class MarriageCertificateFormControllerImpl implements MarriageCertificat
         this.marriageCertificateConverter = marriageCertificateConverter;
         this.marriageCertificateCommandValidator = marriageCertificateCommandValidator;
         this.personService = personService;
+        this.organisationService = organisationService;
     }
 
     @SuppressWarnings("SameReturnValue")
@@ -61,6 +64,7 @@ public class MarriageCertificateFormControllerImpl implements MarriageCertificat
         logger.debug("MarriageCertificateFormControllerImpl::getNewMarriageCertificate");
         model.addAttribute(AttributeConstants.MARRIAGE_CERTIFICATE_COMMAND, new MarriageCertificateCommandImpl());
         model.addAttribute(AttributeConstants.PEOPLE, personService.findAll());
+        model.addAttribute(AttributeConstants.ORGANISATIONS, organisationService.findAll());
         return ViewConstants.MARRIAGE_CERTIFICATE_FORM;
     }
 
@@ -71,6 +75,7 @@ public class MarriageCertificateFormControllerImpl implements MarriageCertificat
         logger.debug("MarriageCertificateFormControllerImpl::marriageCertificateEdit");
         model.addAttribute(AttributeConstants.MARRIAGE_CERTIFICATE_COMMAND, marriageCertificateService.findById(Long.valueOf(id)));
         model.addAttribute(AttributeConstants.PEOPLE, personService.findAll());
+        model.addAttribute(AttributeConstants.ORGANISATIONS, organisationService.findAll());
         return ViewConstants.MARRIAGE_CERTIFICATE_FORM;
     }
 
@@ -86,12 +91,14 @@ public class MarriageCertificateFormControllerImpl implements MarriageCertificat
         if (bindingResult.hasErrors()) {
             bindingResult.getAllErrors().forEach(error -> logger.debug(error.getDefaultMessage()));
             model.addAttribute(AttributeConstants.PEOPLE, personService.findAll());
+            model.addAttribute(AttributeConstants.ORGANISATIONS, organisationService.findAll());
             return ViewConstants.MARRIAGE_CERTIFICATE_FORM;
         }
 
         MarriageCertificateCommand savedCommand = marriageCertificateService.saveMarriageCertificateCommand(marriageCertificateCommand);
         model.addAttribute(AttributeConstants.MARRIAGE_CERTIFICATE_COMMAND, savedCommand);
         model.addAttribute(AttributeConstants.PEOPLE, personService.findAll());
+        model.addAttribute(AttributeConstants.ORGANISATIONS, organisationService.findAll());
         return MappingConstants.REDIRECT + CertificateMappingConstants.MARRIAGE_CERTIFICATE_SHOW.replace("{id}", "" + savedCommand.getId());
     }
 
@@ -104,6 +111,7 @@ public class MarriageCertificateFormControllerImpl implements MarriageCertificat
         MarriageCertificateCommand savedCommand = marriageCertificateConverter.convert(marriageCertificateService.findById(Long.valueOf(id)));
         model.addAttribute(AttributeConstants.MARRIAGE_CERTIFICATE_COMMAND, savedCommand);
         model.addAttribute(AttributeConstants.PEOPLE, personService.findAll());
+        model.addAttribute(AttributeConstants.ORGANISATIONS, organisationService.findAll());
         return ViewConstants.MARRIAGE_CERTIFICATE_FORM;
     }
 

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

@@ -493,7 +493,7 @@
                 <td style="text-align: left;">
                     <div>
                         <input class="groomUntrackedResidence" id="groomUntrackedResidence"
-                               th:field="*{brideUntrackedResidence}" type="text">
+                               th:field="*{groomUntrackedResidence}" type="text">
                         <div th:if="${#fields.hasErrors('groomUntrackedResidence')}">
                             <ul class="text-danger">
                                 <li th:each="err : ${#fields.errors('groomUntrackedResidence')}" th:text="${err}"/>
@@ -527,7 +527,7 @@
                     <div>
                         <input class="groomUntrackedFather" id="groomUntrackedFather"
                                th:field="*{groomUntrackedFather}" type="text">
-                        <div th:if="${#fields.hasErrors('brideUntrackedFather')}">
+                        <div th:if="${#fields.hasErrors('groomUntrackedFather')}">
                             <ul class="text-danger">
                                 <li th:each="err : ${#fields.errors('groomUntrackedFather')}" th:text="${err}"/>
                             </ul>
@@ -555,7 +555,7 @@
         </table>
         <button type="submit" class="btn btn-primary">Commit</button>
         <a class="btn btn-secondary" th:href="@{/marriageCertificates}" th:text="${'List all'}">List all</a>
-        <a class="btn btn-success" th:href="@{/static}" th:text="${'Home'}">Home</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>
 </div>