Changeset bcb4acc

Timestamp:

08/24/23 03:31:06 (15 months ago)

Author:

DenicaKj <dkorvezir@…>

Branches:

master

Children:

4158cac

Parents:

1e7126f

Message:

filter for genre

Location:

src/main

Files:

• java/com/example/moviezone/service/Impl/SeatServiceImpl.java (modified) (1 diff)
• java/com/example/moviezone/web/HomeController.java (modified) (2 diffs)
• resources/templates/events.html (modified) (1 diff)
• resources/templates/films.html (modified) (2 diffs)
• resources/templates/projections.html (modified) (1 diff)

src/main/java/com/example/moviezone/service/Impl/SeatServiceImpl.java

@@ -43 +43 @@
         List<Ticket> tickets=ticketService.findAllTickets();
         List<Seat> seats=seatRepository.findAllByCategoryAndProjection(category,projectionRoom);
-
+        List<Seat> pom = new ArrayList<>();
         for (int i = 0; i < tickets.size(); i++) {
             if(tickets.get(i).getProjection()==projection){
-                if(seats.contains(tickets.get(i).getSeat())){
-                    seats.remove(tickets.get(i).getSeat());
+                if(!seats.contains(tickets.get(i).getSeat())){
+                    pom.add(seats.get(i));
                 }
             }
         }
-        return seats;
+        return pom;
     }
 

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

@@ -236 +236 @@
     @GetMapping("/films")
     @Transactional
-    public String getFilmsPage1(Model model,@RequestParam(required = false) Integer id_cinema){
+    public String getFilmsPage1(Model model,@RequestParam(required = false) Integer id_cinema, @RequestParam(required = false) Integer id_genre){
         model.addAttribute("cinemas",cinemaService.findAllCinemas());
-        model.addAttribute("genres", GenreEnum.values());
+        List<GenreEnum> genres = List.of(GenreEnum.values());
+        model.addAttribute("genres", genres);
+        List<Film> films = filmService.findAllFilms();
         if (id_cinema!=null) {
-            model.addAttribute("films",filmService.getFilmsFromCinema(id_cinema));
-        }else{
-            List<FilmsReturnTable> pom=new LinkedList<>();
-            model.addAttribute("films",filmService.findAllFilms());
-        }
+            films = filmService.getFilmsFromCinema(id_cinema);
+        }
+        if ( id_genre != null){
+            List<Film> pom= new ArrayList<>();
+            for (int i = 0; i < films.size(); i++) {
+                if(films.get(i).getGenre().contains(genres.get(id_genre).name().toLowerCase())){
+                   pom.add(films.get(i));
+                }
+            }
+            films=pom;
+        }
+        model.addAttribute("films",films);
         model.addAttribute("bodyContent","films");
         return "master-template";
@@ -270 +279 @@
             model.addAttribute("events",eventService.getEventsFromCinema(id_cinema));
         }else{
-            List<FilmsReturnTable> pom=new LinkedList<>();
             model.addAttribute("events",eventService.getEventsNow());
         }

src/main/resources/templates/events.html

@@ -207 +207 @@
             <label style="color: white;font-size: 20px;font-weight: bold">Избери Кино:</label>
             <select name="id_cinema" class="form-control" id="id_cinema">
+                <option th:value="${null}" text="Please Select"></option>
                 <option
-                        th:selected="${cinemas.get(1)}"
                         th:each="cinema : ${cinemas}"
                         th:value="${cinema.getId_cinema()}"

src/main/resources/templates/films.html

@@ -207 +207 @@
         <label style="color: white;font-size: 20px;font-weight: bold">Избери Кино:</label>
         <select name="id_cinema" class="form-control" id="id_cinema">
+            <option th:value="${null}" text="Please Select"></option>
             <option
-                    th:selected="${cinemas.get(1)}"
                     th:each="cinema : ${cinemas}"
                     th:value="${cinema.getId_cinema()}"
@@ -218 +218 @@
         <div class="form-group">
             <label style="color: white;font-size: 20px;font-weight: bold">Избери Жарн:</label>
-            <select name="id_cinema" class="form-control" id="id_cinema">
+            <select name="id_genre" class="form-control" id="id_genre">
+                <option th:value="${null}" text="Please Select"></option>
                 <option
-                        th:selected="${genres.get(1)}"
                         th:each="genre : ${genres}"
-                        th:value="${}"
-                        th:text="${cinema.getName()}">
+                        th:value="${genre.ordinal}"
+                        th:text="${genre.name}">
                 </option>
             </select>

src/main/resources/templates/projections.html

@@ -206 +206 @@
             <label style="color: white;font-size: 20px;font-weight: bold">Избери Кино:</label>
             <select name="id_cinema" class="form-control" id="id_cinema">
+                <option th:value="${null}" text="Please Select"></option>
                 <option
-                        th:selected="${cinemas.get(1)}"
                         th:each="cinema : ${cinemas}"
                         th:value="${cinema.getId_cinema()}"