Changeset cb5debb

Timestamp:

02/07/23 15:29:55 (23 months ago)

Author:

milamihajlovska <mila.mihajlovska01@…>

Branches:

master

Children:

8d49568, 93341f8

Parents:

9eba1fb (diff), 3650316 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/DenicaKj/MovieZone

Location:

src/main

Files:

• java/com/example/moviezone/model/procedures/FilmsReturnTable.java (added)
• java/com/example/moviezone/repository/FilmRepository.java (modified) (2 diffs)
• java/com/example/moviezone/web/HomeController.java (modified) (2 diffs)
• resources/templates/films.html (modified) (1 diff)

src/main/java/com/example/moviezone/repository/FilmRepository.java

@@ -2 +2 @@
 
 import com.example.moviezone.model.Film;
+import com.example.moviezone.model.procedures.FilmsReturnTable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.query.Procedure;
@@ -9 +10 @@
 
 public interface FilmRepository extends JpaRepository<Film,Integer> {
-
+    @Procedure("project.getFilmsFromCinema")
+    List<FilmsReturnTable> getFilmsFromCinema(int id);
 }

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

@@ -33 +33 @@
 private final ProjectionIsPlayedInRoomRepository projectionIsPlayedInRoomRepository;
 
+
     public HomeController(FilmService filmService, UserService userService, ProjectionService projectionService, EventService eventService, TicketService ticketService, WorkerService workerService, CustomerRatesFilmService customerRatesFilmService, CinemaService cinemaService, CinemaOrganizesEventService cinemaOrganizesEventService, CinemaPlaysFilmService cinemaPlaysFilmService, ProjectionIsPlayedInRoomRepository projectionIsPlayedInRoomRepository) {
+        
         this.filmService = filmService;
         this.userService = userService;
@@ -128 +130 @@
     @GetMapping("/films")
     public String getFilmsPage(Model model){
+        model.addAttribute("cinemas",cinemaService.findAllCinemas());
         model.addAttribute("films",filmService.findAllFilms());
         model.addAttribute("bodyContent","films");

src/main/resources/templates/films.html

@@ -194 +194 @@
         border-radius: 20px;
     }
+    .form-group{
+        width: 200px;
+    }
+
 </style>
+<div>
+    <div class="form-group">
+        <label style="color: white;font-size: 20px;font-weight: bold">Кино</label>
+        <select name="cinemas" class="form-control">
+            <option
+                    th:selected="${cinemas.get(1)}"
+                    th:each="cinema : ${cinemas}"
+                    th:value="${cinema.getId_cinema()}"
+                    th:text="${cinema.getName()}">
+            </option>
+        </select>
+    </div>
+
+</div>
 <div xmlns:th="http://www.thymeleaf.org">
     <div class="main">