Changeset 632e3d8

Timestamp:

02/08/23 14:41:27 (22 months ago)

Author:

milamihajlovska <mila.mihajlovska01@…>

Branches:

master

Children:

2c7a732

Parents:

39a45e6 (diff), 90317ea (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/repository/EventRepository.java (modified) (1 diff)
• java/com/example/moviezone/repository/FilmRepository.java (modified) (1 diff)
• java/com/example/moviezone/service/EventService.java (modified) (1 diff)
• java/com/example/moviezone/service/FilmService.java (modified) (1 diff)
• java/com/example/moviezone/service/Impl/EventServiceImpl.java (modified) (2 diffs)
• java/com/example/moviezone/service/Impl/FilmServiceImpl.java (modified) (1 diff)
• java/com/example/moviezone/web/HomeController.java (modified) (3 diffs)
• resources/templates/event.html (added)
• resources/templates/events.html (modified) (3 diffs)
• resources/templates/films.html (modified) (1 diff)
• resources/templates/projections.html (modified) (1 diff)
• resources/templates/workers.html (modified) (1 diff)

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

@@ -2 +2 @@
 
 import com.example.moviezone.model.Event;
+import com.example.moviezone.model.Film;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.query.Procedure;
+
+import java.util.List;
 
 public interface EventRepository extends JpaRepository<Event,Integer> {
+    @Procedure("project.getEventsFromCinema")
+    List<Event> getFilmsFromCinema(int id);
+    @Procedure("project.getEventsFromNow")
+    List<Event> getFilmsFromCinemaNow();
+
 }

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

@@ -17 +17 @@
     @Procedure("project.getFilmsFromCinema1")
     List<Film> getFilmsFromCinema(int id);
-
+    @Procedure("project.getFilmsFromCinemaNow")
+    List<Film> getFilmsFromCinemaNow(int id);
+    @Procedure("project.getFilmsNow")
+    List<Film> getFilmsNow();
 }

src/main/java/com/example/moviezone/service/EventService.java

@@ -5 +5 @@
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Optional;
 
 public interface EventService {
     List<Event> findAllEvents();
     Event save(LocalDate start_date,String theme,String duration,String repeating,String url);
+    List<Event> getEventsNow();
+    List<Event> getEventsFromCinema(int id);
+    Optional<Event> getEventById(Long id);
 }

src/main/java/com/example/moviezone/service/FilmService.java

@@ -14 +14 @@
     Optional<Film> getFilmById(Long id);
     List<Film> getFilmsFromCinema(int id);
+    List<Film> getFilmsFromCinemaNow(int id);
+    List<Film> getFilmsNow();
 }

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

@@ -7 +7 @@
 
 import java.time.LocalDate;
+import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 
 @Service
@@ -26 +28 @@
         return eventRepository.save(new Event(theme,duration,repeating,start_date,img_url));
     }
+
+    @Override
+    public List<Event> getEventsNow() {
+        return eventRepository.getFilmsFromCinemaNow();
+    }
+
+    @Override
+    public List<Event> getEventsFromCinema(int id) {
+        return eventRepository.getFilmsFromCinema(id);
+    }
+
+    @Override
+    public Optional<Event> getEventById(Long id) {
+        return eventRepository.findAllById(Collections.singleton(id.intValue())).stream().findFirst();
+    }
 }

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

@@ -40 +40 @@
     }
 
+    @Override
+    public List<Film> getFilmsFromCinemaNow(int id) {
+        return filmRepository.getFilmsFromCinemaNow(id);
+    }
+
+    @Override
+    public List<Film> getFilmsNow() {
+        return filmRepository.getFilmsNow();
+    }
+
 }

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

@@ -16 +16 @@
 import org.springframework.web.bind.annotation.*;
 
+import javax.naming.event.EventDirContext;
 import javax.servlet.http.HttpSession;
 import javax.transaction.Transactional;
@@ -79 +80 @@
         return "master-template";
     }
-
+    @GetMapping("/getEvent/{id}")
+    public String getEvent(@PathVariable Long id, Model model) {
+        Event event =eventService.getEventById(id).get();
+        model.addAttribute("event", event);
+        model.addAttribute("bodyContent", "event");
+
+        return "master-template";
+    }
     @GetMapping("/login")
     public String getLoginPage(Model model)
@@ -149 +157 @@
         return "master-template";
     }
-
+    @Transactional
     @GetMapping("/projections")
-    public String getProjectionsPage(Model model)
-    {
-        model.addAttribute("projections",projectionService.findAllProjections());
-        model.addAttribute("bodyContent","projections");
+    public String getProjectionsPage(Model model,@RequestParam(required = false) Integer id_cinema)
+    {
+        model.addAttribute("cinemas",cinemaService.findAllCinemas());
+        if (id_cinema!=null) {
+            model.addAttribute("films",filmService.getFilmsFromCinemaNow(id_cinema));
+        }else{
+            List<FilmsReturnTable> pom=new LinkedList<>();
+            model.addAttribute("films",filmService.getFilmsNow());
+        }
+        model.addAttribute("bodyContent","films");
         return "master-template";
     }
     @GetMapping("/events")
-    public String getEventsPage(Model model)
-    {
-        model.addAttribute("events",eventService.findAllEvents());
+    @Transactional
+    public String getEventsPage(Model model,@RequestParam(required = false) Integer id_cinema)
+    {
+        model.addAttribute("cinemas",cinemaService.findAllCinemas());
+        if (id_cinema!=null) {
+            model.addAttribute("events",eventService.getEventsFromCinema(id_cinema));
+        }else{
+            List<FilmsReturnTable> pom=new LinkedList<>();
+            model.addAttribute("events",eventService.getEventsNow());
+        }
         model.addAttribute("bodyContent","events");
         return "master-template";

src/main/resources/templates/events.html

@@ -194 +194 @@
         border-radius: 20px;
     }
+    .form-group{
+        width: 200px;
+    }
 </style>
+<div>
+    <form th:action="@{'/home/events'}"
+          th:method="GET">
+
+        <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">
+                <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>
+
 <div xmlns:th="http://www.thymeleaf.org">
+    <h1 style="color: white">Настани</h1>
     <div class="main">
         <div th:each="event : ${events}" class="container">
@@ -208 +231 @@
                         <span th:text="${event.getDuration()}"></span>
                     </div>
-                    <form th:action="@{'/home/getFilm/{id}' (id=${event.getId_event()})}"
+                    <form th:action="@{'/home/getEvent/{id}' (id=${event.getId_event()})}"
                           th:method="GET">
                         <button class="button" type="submit">Датали</button>
@@ -218 +241 @@
     </div>
 </div>
+</div>

src/main/resources/templates/films.html

@@ -219 +219 @@
 
 <div xmlns:th="http://www.thymeleaf.org">
-    <div class="main">
+    <div class="main" style="width: available;height: available">
         <div    th:if="${films.isEmpty()} == false"
                 th:each="film : ${films}" class="container">

src/main/resources/templates/projections.html

@@ -198 +198 @@
     <div class="main">
 
-<!--<div th:each="projection: ${projections}">-->
-
-        <div th:each="projection: ${projections}" class="container">
+
+        <div th:each="film: ${films}" class="container">
             <div class="card">
                 <div class="imgBx">
-                    <img th:src="@{${projection.film.getUrl()}}"/>
+                    <img th:src="@{${film.getUrl()}}"/>
                 </div>
                 <div class="contentBx">
-                    <h2  th:text="${projection.film.getName()}"></h2>
+                    <h2  th:text="${film.getName()}"></h2>
                     <div class="size">
                         <h3>Duration :</h3>
-                        <span th:text="${projection.film.getDuration()}"></span>
+                        <span th:text="${film.getDuration()}"></span>
                     </div>
                     <div class="color">
                         <h3>Genre:</h3>
-                        <span th:text="${projection.film.getGenre()}"></span>
+                        <span th:text="${film.getGenre()}"></span>
                     </div>
                 </div>

src/main/resources/templates/workers.html

@@ -1 +1 @@
 <div xmlns:th="http://www.thymeleaf.org">
-  <section class="jumbotron text-center">
-    <div class="container">
-      <h1 class="jumbotron-heading">Вработени</h1>
-    </div>
-  </section>
-
+  <h1 style="color: white">Вработени</h1>
   <div class="container mb-4">
     <div class="row">