updated

f63b1bd1 · Rhys Nute · f6149996 · f63b1bd1 · f63b1bd1 · f63b1bd1
Commit f63b1bd1 authored 1 year ago by Rhys Nute
--- a/src/main/java/Team5/SmartTowns/Organisation/organisationControllers.java
+++ b/src/main/java/Team5/SmartTowns/Organisation/organisationControllers.java
@@ -21,6 +21,7 @@ public class organisationControllers {
    public ModelAndView getLocalAuthoritiesPage(){
        ModelAndView mav = new ModelAndView("local-authorities");
        List<localAuthority> localAuthority = localAuthorityRepository.getAllLocalAuthority();
+        mav.addObject("localAuth", localAuthority);
        return mav;
    }
    @GetMapping("/localForm")
@@ -33,6 +34,7 @@ public class organisationControllers {
    private localAuthorityRepository localAuthorityRepository;
    @PostMapping("/local-auth-data")
    public ModelAndView localAuthSent(@Valid @ModelAttribute("localAuthority")localAuthority localAuthority, BindingResult bindingResult, Model model ) {
+        List<localAuthority> localAuthorityList = localAuthorityRepository.getAllLocalAuthority();
        if (bindingResult.hasErrors()){
            ModelAndView modelAndView = new ModelAndView("local-auth-data", model.asMap());
            return modelAndView;

--- a/src/main/java/Team5/SmartTowns/localauthority/localAuthority.java
+++ b/src/main/java/Team5/SmartTowns/localauthority/localAuthority.java
@@ -19,15 +19,15 @@ public class localAuthority {
    private URL website;
    @Override
    public String toString() {
-        return "localAuthority" +
+        return "Local Authority:" + " " +
-                localAuthorityName + '\'' +
+                localAuthorityName + '\'' + " " +
-                address1 + '\'' +
+                address1 + '\'' + " " +
-                address2 + '\'' +
+                address2 + '\'' + " " +
-                city + '\'' +
+                city + '\'' + " " +
-                county + '\'' +
+                county + '\'' + " " +
-                postcode + '\'' +
+                postcode + '\'' + " " +
                website +
-                '.';
+                " ";
    }
    public String getLocalAuthorityName() {

--- a/src/main/resources/templates/local-authorities.html
+++ b/src/main/resources/templates/local-authorities.html
@@ -10,11 +10,11 @@
 <body>
 <h1>Local Authorities</h1>
 <div id="councils">
-    <ul th:each="localAuthority:${localAuthority}">
+    <ul th:each="local:${localAuth}">
-        <li th:text="${localAuthority}"></li>
+        <li th:text="${local}"></li>
    </ul>
 </div>
-<a href="/localForm" id="authority"><button>Local Authorities please enter here</a></button>
+<button><a href="/localForm" id="authority">Local Authorities please enter here</a></button>
 <footer th:insert="~{/towns/Templating.html::footer}"></footer>
 </body>
 </html>
\ No newline at end of file