Index: src/main/java/com/example/moviezone/repository/EventRepository.java
===================================================================
--- src/main/java/com/example/moviezone/repository/EventRepository.java	(revision 39a45e62a3282af51d7c3631c2e02cb17d7b2b93)
+++ src/main/java/com/example/moviezone/repository/EventRepository.java	(revision 632e3d8e2786600e2229aa757ddf61732e25947d)
@@ -2,6 +2,15 @@
 
 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();
+
 }
Index: src/main/java/com/example/moviezone/repository/FilmRepository.java
===================================================================
--- src/main/java/com/example/moviezone/repository/FilmRepository.java	(revision 39a45e62a3282af51d7c3631c2e02cb17d7b2b93)
+++ src/main/java/com/example/moviezone/repository/FilmRepository.java	(revision 632e3d8e2786600e2229aa757ddf61732e25947d)
@@ -17,4 +17,7 @@
     @Procedure("project.getFilmsFromCinema1")
     List<Film> getFilmsFromCinema(int id);
-
+    @Procedure("project.getFilmsFromCinemaNow")
+    List<Film> getFilmsFromCinemaNow(int id);
+    @Procedure("project.getFilmsNow")
+    List<Film> getFilmsNow();
 }
Index: src/main/java/com/example/moviezone/service/EventService.java
===================================================================
--- src/main/java/com/example/moviezone/service/EventService.java	(revision 39a45e62a3282af51d7c3631c2e02cb17d7b2b93)
+++ src/main/java/com/example/moviezone/service/EventService.java	(revision 632e3d8e2786600e2229aa757ddf61732e25947d)
@@ -5,7 +5,11 @@
 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);
 }
Index: src/main/java/com/example/moviezone/service/FilmService.java
===================================================================
--- src/main/java/com/example/moviezone/service/FilmService.java	(revision 39a45e62a3282af51d7c3631c2e02cb17d7b2b93)
+++ src/main/java/com/example/moviezone/service/FilmService.java	(revision 632e3d8e2786600e2229aa757ddf61732e25947d)
@@ -14,3 +14,5 @@
     Optional<Film> getFilmById(Long id);
     List<Film> getFilmsFromCinema(int id);
+    List<Film> getFilmsFromCinemaNow(int id);
+    List<Film> getFilmsNow();
 }
Index: src/main/java/com/example/moviezone/service/Impl/EventServiceImpl.java
===================================================================
--- src/main/java/com/example/moviezone/service/Impl/EventServiceImpl.java	(revision 39a45e62a3282af51d7c3631c2e02cb17d7b2b93)
+++ src/main/java/com/example/moviezone/service/Impl/EventServiceImpl.java	(revision 632e3d8e2786600e2229aa757ddf61732e25947d)
@@ -7,5 +7,7 @@
 
 import java.time.LocalDate;
+import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 
 @Service
@@ -26,3 +28,18 @@
         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();
+    }
 }
Index: src/main/java/com/example/moviezone/service/Impl/FilmServiceImpl.java
===================================================================
--- src/main/java/com/example/moviezone/service/Impl/FilmServiceImpl.java	(revision 39a45e62a3282af51d7c3631c2e02cb17d7b2b93)
+++ src/main/java/com/example/moviezone/service/Impl/FilmServiceImpl.java	(revision 632e3d8e2786600e2229aa757ddf61732e25947d)
@@ -40,3 +40,13 @@
     }
 
+    @Override
+    public List<Film> getFilmsFromCinemaNow(int id) {
+        return filmRepository.getFilmsFromCinemaNow(id);
+    }
+
+    @Override
+    public List<Film> getFilmsNow() {
+        return filmRepository.getFilmsNow();
+    }
+
 }
Index: src/main/java/com/example/moviezone/web/HomeController.java
===================================================================
--- src/main/java/com/example/moviezone/web/HomeController.java	(revision 39a45e62a3282af51d7c3631c2e02cb17d7b2b93)
+++ src/main/java/com/example/moviezone/web/HomeController.java	(revision 632e3d8e2786600e2229aa757ddf61732e25947d)
@@ -16,4 +16,5 @@
 import org.springframework.web.bind.annotation.*;
 
+import javax.naming.event.EventDirContext;
 import javax.servlet.http.HttpSession;
 import javax.transaction.Transactional;
@@ -79,5 +80,12 @@
         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,16 +157,29 @@
         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";
Index: src/main/resources/templates/event.html
===================================================================
--- src/main/resources/templates/event.html	(revision 632e3d8e2786600e2229aa757ddf61732e25947d)
+++ src/main/resources/templates/event.html	(revision 632e3d8e2786600e2229aa757ddf61732e25947d)
@@ -0,0 +1,45 @@
+<style>
+    .genres{
+        width: 100px;
+        text-align: center;
+        background-color: #ff5019;
+        border-radius: 20px;
+        color: #111111;
+        font-size: 20px;
+        font-weight: 200;
+        margin: 20px;
+    }
+    .main{
+        display: flex;
+        justify-content: space-between;
+        align-items: flex-start;
+        margin-left: 100px;
+    }
+    .slika{
+        margin-right: 100px;
+    }
+    img{
+        width: 300px;
+        height: 350px;
+        border-radius: 20px;
+    }
+</style>
+<div xmlns:th="http://www.thymeleaf.org">
+    <div class="main">
+        <div class="container-1">
+            <h1 style="color: white; font-weight: 600" class="name" th:text="${event.getTheme()}">
+            </h1>
+            <h4 style="color: white;"> Почетен Датум:
+                <span th:text="${event.start_date}"></span>
+            </h4>
+            <h4 style="color: white"> Траење на настанот:
+                <span th:text="${event.duration}"></span>
+                минути
+            </h4>
+        </div>
+        <div class="slika">
+            <img th:src="@{${event.img_url}}"/>
+        </div>
+
+    </div>
+</div>
Index: src/main/resources/templates/events.html
===================================================================
--- src/main/resources/templates/events.html	(revision 39a45e62a3282af51d7c3631c2e02cb17d7b2b93)
+++ src/main/resources/templates/events.html	(revision 632e3d8e2786600e2229aa757ddf61732e25947d)
@@ -194,6 +194,29 @@
         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,5 +231,5 @@
                         <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,2 +241,3 @@
     </div>
 </div>
+</div>
Index: src/main/resources/templates/films.html
===================================================================
--- src/main/resources/templates/films.html	(revision 39a45e62a3282af51d7c3631c2e02cb17d7b2b93)
+++ src/main/resources/templates/films.html	(revision 632e3d8e2786600e2229aa757ddf61732e25947d)
@@ -219,5 +219,5 @@
 
 <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">
Index: src/main/resources/templates/projections.html
===================================================================
--- src/main/resources/templates/projections.html	(revision 39a45e62a3282af51d7c3631c2e02cb17d7b2b93)
+++ src/main/resources/templates/projections.html	(revision 632e3d8e2786600e2229aa757ddf61732e25947d)
@@ -198,20 +198,19 @@
     <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>
Index: src/main/resources/templates/workers.html
===================================================================
--- src/main/resources/templates/workers.html	(revision 39a45e62a3282af51d7c3631c2e02cb17d7b2b93)
+++ src/main/resources/templates/workers.html	(revision 632e3d8e2786600e2229aa757ddf61732e25947d)
@@ -1,9 +1,4 @@
 <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">