rough towns trails list complete

src/main/java/Team5/SmartTowns/data/Location.java

@@ -7,7 +7,6 @@ import lombok.NoArgsConstructor;
 
 @Data
 @AllArgsConstructor
-@NoArgsConstructor
 public class Location {
 //    private int locationID;
     private String locationName;
@@ -64,14 +63,6 @@ public class Location {
 
     }
 
-    public Location(String locationName, String locationEmail, String locationDescription, String locationPlace, int locationTrailID, boolean locationApproved) {
-        this.locationName = locationName;
-        this.locationEmail = locationEmail;
-        this.locationDescription = locationDescription;
-        this.locationPlace = locationPlace;
-        this.locationTrailID = locationTrailID;
-        this.locationApproved = locationApproved;
-    }
 
 
     public void setLocationName(String locationName) {

src/main/java/Team5/SmartTowns/data/TrailsRepository.java

@@ -6,4 +6,6 @@ import java.util.List;
 public interface TrailsRepository {
     List<Trail> getAllTrails();
     String getTrailNameWithID(String trailsID);
+
+    int getTrailIDFromTrailName(String trailsName);
 }

src/main/java/Team5/SmartTowns/data/TrailsRepositoryJDBC.java

@@ -35,5 +35,10 @@ public class TrailsRepositoryJDBC implements TrailsRepository {
 
     }
 
+    @Override
+    public int getTrailIDFromTrailName(String trailsName){
+        return jdbc.queryForObject("SELECT trailID FROM trails WHERE trailName=?", Integer.class, trailsName);
+    }
+
 
 }

src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesController.java

@@ -37,6 +37,47 @@ public class PlacesController {
         return  modelAndView;
     }
 
+    @RequestMapping(value="/town", method= RequestMethod.POST)
+    public String sendHtmlFragmentTown(Model map) {
+        map.addAttribute("foo", "bar");
+        return "checkpoint/checkpoint";
+    }
+
+    @GetMapping("/towns/{town}")
+    public ModelAndView getResultBySearchKeyTowns(@PathVariable String town) {
+        List<TownWithTrails> townsList = placeRepo.getAllTownCoords();
+        List<Trail> trailslocations =  trailsRepo.getAllTrails();
+        List<Trail> correctTrails = new ArrayList<>();
+        String townNamee="";
+        int indexTown=999;
+        for (int i=0;i<townsList.size();i++){
+            if (Objects.equals(townsList.get(i).getTownName(), town)){
+                indexTown=i;
+                townNamee=town;
+            }
+        }
+        if (indexTown!=999){
+            int townIDFromTable= placeRepo.getTownIDFromName(townNamee);
+            for (int i=0;i<trailslocations.size();i++){
+                int trailID = trailsRepo.getTrailIDFromTrailName(trailslocations.get(i).getTrailName());
+                if ((trailID>100)&&(trailID<200)){
+                    correctTrails.add(trailslocations.get(i));
+                }
+                if ((trailID>200)&&(trailID<300)){
+                    correctTrails.add(trailslocations.get(i));
+                }
+                if ((trailID>300)&&(trailID<400)){
+                    correctTrails.add(trailslocations.get(i));
+                }
+            }
+        }
+
+        ModelAndView modelAndView= new ModelAndView("fragments/townsPageFrags :: townSection");
+        modelAndView.addObject("town", townsList.get(indexTown));
+        modelAndView.addObject("trails", correctTrails);
+
+        return modelAndView;
+    }
 
     @GetMapping("/checkpoints")
     public ModelAndView getLocationPages(){
@@ -58,6 +99,8 @@ public class PlacesController {
 
 
 
+
+
         @GetMapping("/checkpoints/{location}")
     public ModelAndView getResultBySearchKeyLocation(@PathVariable String location) {
             List<LocationsCoordinates> locCoords = reorderCoordsWRTLocations(placeRepo.getAllLocationCoords());

src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesCoordinatesRepository.java

@@ -17,6 +17,8 @@ public interface PlacesCoordinatesRepository {
 
     Boolean checkIfCoordsAreWithinTownBoundary(LocationsCoordinates loc);
 
+    int getTownIDFromName(String townsName);
+
 //    List<Location> getFullApprovedLocations(JdbcTemplate aJdbc);
 
 

src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesCoordinatesRepositoryJDBC.java

@@ -162,8 +162,10 @@ public class PlacesCoordinatesRepositoryJDBC implements PlacesCoordinatesReposit
         } return false; // if location outside boundary, return true won't function and it wil return false.
     }
 
-
-
+    @Override
+    public int getTownIDFromName(String townsName){
+        return jdbc.queryForObject("SELECT townID FROM townswithtrails WHERE townName=?", Integer.class, townsName);
+    }
 
     // Method used to approve and add locations with associated coordinates. List<Location> unapprovedLocations
 //    public void approveLocationAndAddCoords(String locationsName, Double latCoords, Double longCoords,JdbcTemplate jdbc) {

src/main/resources/templates/fragments/townsPageFrags.html

+<!DOCTYPE html>
+<html lang="en" th:fragment="townSection" class="townPageFrag">
+<head>
+    <meta charset="UTF-8">
+    <title th:text="${town.getTownName()}"></title>
+    <link rel="stylesheet" th:href="@{/css/templatingstyle.css}">
+    <link rel="stylesheet" th:href="@{/css/locationPageFragsStyle.css}">
+</head>
+<body >
+<header th:insert="~{/fragments/Templating.html::header}"></header>
+<main>
+
+    <hr style="height:40px; visibility:hidden;" />
+
+    <hr style="height:40px; visibility:hidden;" />
+</main>
+
+<footer th:insert="~{/fragments/Templating.html::footer}"></footer>
+</body>
+</html>
\ No newline at end of file

src/main/resources/templates/userTrails/userTrailsTemplate.html

-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Trails</title>
-</head>
-<body>
-<main>
-    <H1>Caerphilly</H1>
-    <div th:each="location:${locations}">
+<!--<!DOCTYPE html>-->
+<!--<html lang="en">-->
+<!--<head>-->
+<!--    <meta charset="UTF-8">-->
+<!--    <title>Trails</title>-->
+<!--</head>-->
+<!--<body>-->
+<!--<main>-->
+<!--    <H1>Caerphilly</H1>-->
+<!--    <div th:each="location:${locations}">-->
 
-        <H2></H2>
+<!--        <H2></H2>-->
 
-        <ul>
-        <li th:text="${location.getLocationPlace()}"></li>
-        </ul>
+<!--        <ul>-->
+<!--        <li th:text="${location.getLocationPlace()}"></li>-->
+<!--        </ul>-->
 
 
 
@@ -26,16 +26,16 @@
 
 
 
-    </div>
+<!--    </div>-->
 
 
 
 
-</main>
+<!--</main>-->
 
 
 
 
 
-</body>
-</html>
\ No newline at end of file
+<!--</body>-->
+<!--</html>-->
\ No newline at end of file