Changeset 2a98e34 for src/main/java/com/example/moviezone/web

Timestamp:

02/08/23 12:10:52 (22 months ago)

Author:

milamihajlovska <mila.mihajlovska01@…>

Branches:

master

Children:

86e187f

Parents:

c05cd97 (diff), eb36f39 (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

File:

• src/main/java/com/example/moviezone/web/HomeController.java (modified) (2 diffs)

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

@@ -17 +17 @@
 
 import javax.servlet.http.HttpSession;
+import javax.transaction.Transactional;
 import java.time.LocalDate;
 import java.util.LinkedList;
@@ -144 +145 @@
 //    }
 
+    @GetMapping("/films")
+    @Transactional
+    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")
 //    public String getFilmsPage1(Model model,@RequestParam(required = false) Integer id_cinema){