diff --git a/src/main/java/Team5/SmartTowns/Organisation/organisationControllers.java b/src/main/java/Team5/SmartTowns/Organisation/organisationControllers.java index 71fcc38475863ee458862bb91b58f4fc9dd6f8b7..3f153cf76bcd34977c778fe3f9e0ead22b3ea41c 100644 --- a/src/main/java/Team5/SmartTowns/Organisation/organisationControllers.java +++ b/src/main/java/Team5/SmartTowns/Organisation/organisationControllers.java @@ -44,9 +44,9 @@ public class organisationControllers { return modelAndView; } @GetMapping("/townForm") - public ModelAndView getLocalAuthForm(){ - ModelAndView modelAndView = new ModelAndView("townForm"); - modelAndView.addObject("addAddTowns",new Towns()); + public ModelAndView getLocalAuthPage(){ + ModelAndView modelAndView = new ModelAndView("towns-data"); + modelAndView.addObject("addAddTowns",new addAddTowns()); return modelAndView; } diff --git a/src/main/java/Team5/SmartTowns/addTowns/addAddTowns.java b/src/main/java/Team5/SmartTowns/addTowns/addAddTowns.java index 302caf2999b73023f3cc068bf94ded8abb78cc3d..74135e0a830eab55a75f70796718e76c8f9f2461 100644 --- a/src/main/java/Team5/SmartTowns/addTowns/addAddTowns.java +++ b/src/main/java/Team5/SmartTowns/addTowns/addAddTowns.java @@ -2,9 +2,11 @@ package Team5.SmartTowns.addTowns; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; @Data @AllArgsConstructor +@NoArgsConstructor public class addAddTowns { private String townName; private String address1; diff --git a/src/main/java/Team5/SmartTowns/addTowns/addAddTownsRepositoryJDBC.java b/src/main/java/Team5/SmartTowns/addTowns/addAddTownsRepositoryJDBC.java index c1cf738ab3fbe8af414d701fc9a283856ff3c8fd..b976a1f3593ee7698f2705c8ee4f4d68387c2b0f 100644 --- a/src/main/java/Team5/SmartTowns/addTowns/addAddTownsRepositoryJDBC.java +++ b/src/main/java/Team5/SmartTowns/addTowns/addAddTownsRepositoryJDBC.java @@ -35,7 +35,7 @@ public class addAddTownsRepositoryJDBC implements addAddTownsRepository { @Override public void addTown(addAddTowns tow) { - String sql = "insert into addTowns( townName, address1, address2, city, county, postcode) values (?, ?, ?, ?, ?, ?)"; + String sql = "insert into addTowns( townName, address1, address2, city, county, postcode) values (?, ?, ?, ?, ?, ?)"; jdbc.update(sql, tow.getTownName(), tow.getAddress1(), tow.getAddress2(), tow.getCity(), tow.getCounty(), tow.getPostcode()); } diff --git a/src/main/resources/templates/towns-data.html b/src/main/resources/templates/towns-data.html index cd1aa5902e2ae97bff8ab0f8665fe006d5d40fb6..5d8762910516b1880dd830bc4c7ba87a7cbff9e5 100644 --- a/src/main/resources/templates/towns-data.html +++ b/src/main/resources/templates/towns-data.html @@ -9,23 +9,23 @@ <header th:insert="~{/towns/Templating.html::header}"></header> <body> <div id="container1"> - <h2>Enter your Local authority</h2> - <form action="" method="post" id="data"> - <p> - <label for="townName">Enter your town</label> - <input type="text" name="town_Name" id="townName"> - </p> - <p> - <label for="address1">Please enter first line of your address</label> + <h2>Enter your Town</h2> + <form action="\town-data" method="post" id="data" name="data" th:object="*{towns-data}"> + <label>Enter your town + <input type="text" th:field="*{townName}" name="town_Name" id="townName"> + </label><br><br> + <label for="address1">Please enter first line of your address <input type="text" name="address_1" id="address1"> + </label><br><br> </p> <p> - <label for="address2">Please enter second line of your address (optional)</label> - <input type="text" name="address_2" id="address2"> + <label>Please enter second line of your address (optional)</label> + <input type="text" th:field="*{address2}"> </p> <p> - <label for="city">Please enter the City/Town</label> - <input type="text" name="city" id="city"> + <label>Please enter the City/Town + <input type="text" th:field="*{city}"> + </label> </p> <p> <label for="county">Please enter you county (optional)</label>