From c793d802ef25cd6a84d71b2c5d1ce4b37a0c87c8 Mon Sep 17 00:00:00 2001 From: parap Date: Tue, 2 May 2023 09:10:59 +0400 Subject: [PATCH] lab5 full --- data.mv.db | Bin 155648 -> 155648 bytes .../films/controller/ActorController.java | 2 +- .../films/controller/FilmMvcController.java | 2 +- .../ru/ip/labs/labs/films/dto/ActorDTO.java | 12 -- .../resources/templates/actors-catalog.html | 4 + .../resources/templates/films-catalog.html | 130 +++++++++++++++++- .../resources/templates/genres-catalog.html | 1 + 7 files changed, 133 insertions(+), 18 deletions(-) diff --git a/data.mv.db b/data.mv.db index c3014e005eb6ee4b4e435ae1af131a3f0c7a4e18..ed8c9f8ed6cfceb6e99540ca3b6f9951e5cb0a30 100644 GIT binary patch literal 155648 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 AP5=M^ delta 6269 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 diff --git a/src/main/java/ru/ip/labs/labs/films/controller/ActorController.java b/src/main/java/ru/ip/labs/labs/films/controller/ActorController.java index 4b18489..20fbd2e 100644 --- a/src/main/java/ru/ip/labs/labs/films/controller/ActorController.java +++ b/src/main/java/ru/ip/labs/labs/films/controller/ActorController.java @@ -32,7 +32,7 @@ public class ActorController { return new ActorDTO(actorService.addActor(actor.getName(), actor.getSurname())); } - @PatchMapping("") + @PatchMapping("/{id}") public ActorDTO updateActor(@PathVariable Long id, @RequestBody @Valid ActorDTO actor) { return new ActorDTO(actorService.updateActor(id, actor.getName(), actor.getSurname())); } diff --git a/src/main/java/ru/ip/labs/labs/films/controller/FilmMvcController.java b/src/main/java/ru/ip/labs/labs/films/controller/FilmMvcController.java index 399ac93..f076496 100644 --- a/src/main/java/ru/ip/labs/labs/films/controller/FilmMvcController.java +++ b/src/main/java/ru/ip/labs/labs/films/controller/FilmMvcController.java @@ -49,7 +49,7 @@ public class FilmMvcController { model.addAttribute("errors", bindingResult.getAllErrors()); return "films-catalog"; } - Long filmId = filmDTO.getId(); + Long filmId = id; if (id == null || id <= 0) { Film result = filmService.addFilm(filmDTO.getName()); diff --git a/src/main/java/ru/ip/labs/labs/films/dto/ActorDTO.java b/src/main/java/ru/ip/labs/labs/films/dto/ActorDTO.java index 0d800e2..fe5ec11 100644 --- a/src/main/java/ru/ip/labs/labs/films/dto/ActorDTO.java +++ b/src/main/java/ru/ip/labs/labs/films/dto/ActorDTO.java @@ -16,7 +16,6 @@ public class ActorDTO { private String name; private String surname; private String fullName; - private byte[] photo; private List films; @@ -26,7 +25,6 @@ public class ActorDTO { this.id = actor.getId(); this.name = actor.getName(); this.surname = actor.getSurname(); - this.photo = actor.getPhoto(); this.fullName = this.name + this.surname; } public ActorDTO(Long id, String name, String surname, byte[] photo) { @@ -34,16 +32,6 @@ public class ActorDTO { this.name = name; this.surname = surname; this.fullName = this.name + this.surname; - this.photo = photo; - } - - public byte[] getPhoto() { - return photo; - } - - public void setPhoto(String path) throws IOException { - File f = new File(path); - photo = Files.readAllBytes(f.toPath()); } public Long getId() { diff --git a/src/main/resources/templates/actors-catalog.html b/src/main/resources/templates/actors-catalog.html index fa306dd..64cc196 100644 --- a/src/main/resources/templates/actors-catalog.html +++ b/src/main/resources/templates/actors-catalog.html @@ -78,6 +78,9 @@ editForm.action = "/actor"; editForm.previousElementSibling.children[0].textContent = "Добавление"; editForm.children[1].children[1].textContent = "Добавить"; + + editForm.name.value = ""; + editForm.surname.value = ""; } editBtn.onclick = () => { @@ -92,6 +95,7 @@ editForm.previousElementSibling.children[0].textContent = "Изменение"; submitBtn.textContent = "Изменить"; editForm.name.value = elem.children[1].textContent; + editForm.surname.value = elem.children[2].textContent; } diff --git a/src/main/resources/templates/films-catalog.html b/src/main/resources/templates/films-catalog.html index 480e06a..d16afce 100644 --- a/src/main/resources/templates/films-catalog.html +++ b/src/main/resources/templates/films-catalog.html @@ -44,12 +44,34 @@ - + - + + + +
+
+
+ + + +