Changeset 2a98e34

Timestamp:

02/08/23 12:10:52 (23 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

Location:

src/main/java/com/example/moviezone

Files:

• model/procedures/FilmsReturnTable.java (modified) (2 diffs)
• repository/FilmRepository.java (modified) (2 diffs)
• web/HomeController.java (modified) (2 diffs)

src/main/java/com/example/moviezone/model/procedures/FilmsReturnTable.java

@@ -9 +9 @@
 @Data
 public class FilmsReturnTable {
-    Integer id_film;
+    int id_film;
     LocalDate start_date;
     String name;
@@ -19 +19 @@
     }
 
-    public Integer getId_film() {
+    public int getId_film() {
         return id_film;
     }

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

@@ -6 +6 @@
 import org.springframework.data.jpa.repository.query.Procedure;
 import org.springframework.data.repository.query.Param;
+import org.springframework.jdbc.core.JdbcTemplate;
 
+import javax.swing.tree.RowMapper;
 import javax.transaction.Transactional;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.List;
 @Transactional
@@ -13 +17 @@
     @Procedure("project.getFilmsFromCinema")
     List<FilmsReturnTable> getFilmsFromCinema(int id);
+
 }

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){