updated

bf8d24cb · Rhys Nute · 9cafb6a5 · bf8d24cb · bf8d24cb · bf8d24cb
Commit bf8d24cb authored 1 year ago by Rhys Nute
--- a/src/main/java/Team5/SmartTowns/Landmarks/LandmarksController.java
+++ b/src/main/java/Team5/SmartTowns/Landmarks/LandmarksController.java
@@ -55,3 +55,18 @@ public class LandmarksController {


 }
+    @Autowired
+    private localAuthorityRepository localAuthorityRepository;
+    @PostMapping("/local-auth-data1")
+    public ModelAndView localAuthSent(@Valid @ModelAttribute("localAuthority")localAuthority localAuthority, BindingResult bindingResult, Model model ) {
+        if (bindingResult.hasErrors()){
+            ModelAndView modelAndView = new ModelAndView("local-auth-data.html", model.asMap());
+            return modelAndView;
+        }else{// converts user input using the organisation constructor into a submittable format to the sql table
+
+            localAuthority loc = new localAuthority(localAuthority.getLocalAuthorityName(), localAuthority.getAddress1(), localAuthority.getAddress2(), localAuthority.getCity(), localAuthority.getCounty(), localAuthority.getPostcode(), localAuthority.getWebsite());
+            System.out.println(loc);
+            localAuthorityRepository.addLocalAuthority(loc); //add local authority to local authority table
+            ModelAndView modelAndView = new ModelAndView("redirect:/local-authorities");
+            return modelAndView;
+        }
--- a/src/main/java/Team5/SmartTowns/Organisation/organisationControllers.java
+++ b/src/main/java/Team5/SmartTowns/Organisation/organisationControllers.java
@@ -58,14 +58,14 @@ public class organisationControllers {
        List<addAddTowns> addtowns = addAddTownsRepository.getAllAddTowns();

        if (bindingResult.hasErrors()) {
-            ModelAndView modelAndView = new ModelAndView("towns-data", model.asMap());
+            ModelAndView modelAndView = new ModelAndView("towns-data.html", model.asMap());
            return modelAndView;
        } else {// converts user input using the organisation constructor into a submittable format to the sql table

            addAddTowns tow = new addAddTowns(towns.getTownName(), towns.getAddress1(), towns.getAddress2(), towns.getCity(), towns.getCounty(), towns.getPostcode());
            System.out.println(tow);
            addAddTownsRepository.addTown(tow); //add new towns to Add Towns table
-            ModelAndView modelAndView = new ModelAndView("redirect:/businesses");
+            ModelAndView modelAndView = new ModelAndView("redirect:/towns");
            return modelAndView;
        }
    }

--- a/src/main/resources/templates/towns.html
+++ b/src/main/resources/templates/towns.html
@@ -3,7 +3,7 @@
 <head>
    <meta charset="UTF-8">
    <title>Towns</title>
-    <link rel="stylesheet" th:href="@{css/addTownsPageStyle.css}">
+    <link rel="stylesheet" th:href="@{css/landmarkFormStyle.css}">
    <link rel="stylesheet" th:href="@{css/templatingstyle.css}">
 </head>
 <header th:insert="~{/towns/Templating.html::header}"></header>
@@ -16,7 +16,7 @@
        <li th:text="${towns}"></li>
    </ul>
 </div>
-<a href="/townForm"><button id="submit">Towns log in here</button></a>
+<a href="/townsForm"><button id="submit">Towns log in here</button></a>
 </body>
 <footer th:insert="~{/towns/Templating.html::footer}"></footer>
 </html>
\ No newline at end of file