Changes in / [eb36f39:2a98e34]

Location:

src/main

Files:

• java/com/example/moviezone/web/HomeController.java (modified) (2 diffs)
• resources/templates/films.html (modified) (2 diffs)

src/main/java/com/example/moviezone/web/HomeController.java

@@ -134 +134 @@
 
     }
+//    @GetMapping("/films")
+//    public String getFilmsPage(Model model){
+//        model.addAttribute("cinemas",cinemaService.findAllCinemas());
+//            List<FilmsReturnTable> pom=new LinkedList<>();
+//            model.addAttribute("films",pom);
+//            boolean h=pom.isEmpty();
+//            List<FilmsReturnTable> help=filmService.getFilmsFromCinema(2);
+//        model.addAttribute("bodyContent","films");
+//        return "master-template";
+//    }
+
     @GetMapping("/films")
     @Transactional
@@ -146 +157 @@
     }
 
-    public String getFilmsPage1(Model model,Integer id_cinema){
-        model.addAttribute("cinemas",cinemaService.findAllCinemas());
-        if (id_cinema!=null) {
-            model.addAttribute("films",filmService.getFilmsFromCinema(id_cinema.intValue()));
-        }else{
-            List<FilmsReturnTable> pom=new LinkedList<>();
-            model.addAttribute("films",pom);
-        }
-
-        model.addAttribute("bodyContent","films");
-        return "master-template";
-    }
-    @PostMapping("/getFilmsFromCinema")
-    public String getFilmsFromCinema(@RequestParam Integer cinema, Model model){
-        return getFilmsPage1(model,cinema);
-    }
+
+//    @GetMapping("/films")
+//    public String getFilmsPage1(Model model,@RequestParam(required = false) Integer id_cinema){
+//        model.addAttribute("cinemas",cinemaService.findAllCinemas());
+//        if (id_cinema!=null) {
+//            model.addAttribute("films",filmService.getFilmsFromCinema(id_cinema));
+//        }else{
+////            List<FilmsReturnTable> pom=new LinkedList<>();
+//            model.addAttribute("films",filmService.findAllFilms());
+//        }
+//        model.addAttribute("bodyContent","films");
+//        return "master-template";
+//    }
+
+//    @PostMapping("/getFilmsFromCinema")
+//    public String getFilmsFromCinema(@RequestParam Integer cinema, Model model){
+//        return getFilmsPage1(model,cinema);
+//    }
     @GetMapping("/projections")
     public String getProjectionsPage(Model model)

src/main/resources/templates/films.html

@@ -200 +200 @@
 </style>
 <div>
-    <form th:action="@{'/home/getFilm/{id}' (id=${film.getId_film()})}"
-          th:method="POST">
-
-    <div class="form-group">
-        <label style="color: white;font-size: 20px;font-weight: bold">Кино</label>
-        <select name="cinemas" class="form-control" id="cinema">
-            <option
-                    th:selected="${cinemas.get(1)}"
-                    th:each="cinema : ${cinemas}"
-                    th:value="${cinema.getId_cinema()}"
-                    th:text="${cinema.getName()}">
-            </option>
+<!--    <form th:action="@{'/home/getFilm/{id}' (id=${film.getId_film()})}"-->
+<!--          th:method="POST">-->
+
+<!--    <div class="form-group">-->
+<!--        <label style="color: white;font-size: 20px;font-weight: bold">Кино</label>-->
+<!--        <select name="cinemas" class="form-control" id="cinema">-->
+<!--            <option-->
+<!--                    th:selected="${cinemas.get(1)}"-->
+<!--                    th:each="cinema : ${cinemas}"-->
+<!--                    th:value="${cinema.getId_cinema()}"-->
+<!--                    th:text="${cinema.getName()}">-->
+<!--            </option>-->
+<!--        </select>-->
+
+<!--    </div>-->
+<!--        <button class="button" type="submit">Filter</button>-->
+<!--</form>-->
+    <form id="filter-form">
+
+        <label for="f2">Cinema</label>
+        <select name="id_cinema" id="f2">
+            <option value="">All</option>
+            <option th:each="cinema : ${cinemas}" th:value="${cinema.id_cinema}" th:text="${cinema.name}"> [course]</option>
         </select>
-
-    </div>
-        <button class="button" type="submit">Filter</button>
-</form>
+        <button id="filter" type="submit">Filter</button>
+    </form>
 
 </div>
@@ -225 +234 @@
             <div class="card">
                 <div class="imgBx">
-                    <img th:src=""/>
+                    <img th:src="@{${film.getUrl()}}"/>
                 </div>
                 <div class="contentBx">