diff --git a/src/main/java/ru/ulstu/paper/model/PaperDto.java b/src/main/java/ru/ulstu/paper/model/PaperDto.java index cdfa2f9..52d0a5d 100644 --- a/src/main/java/ru/ulstu/paper/model/PaperDto.java +++ b/src/main/java/ru/ulstu/paper/model/PaperDto.java @@ -1,20 +1,14 @@ package ru.ulstu.paper.model; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import org.hibernate.validator.constraints.NotEmpty; -import org.springframework.format.annotation.DateTimeFormat; import ru.ulstu.deadline.model.DeadlineDto; -import ru.ulstu.deadline.model.DeadlineDto; -import ru.ulstu.user.model.UserDto; -import javax.validation.constraints.Future; -import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.util.Date; import java.util.List; -import java.util.List; import java.util.Set; -import java.util.stream.Collectors; import static ru.ulstu.core.util.StreamApiUtils.convert; @@ -26,7 +20,7 @@ public class PaperDto { private Paper.PaperStatus status; private Date createDate; private Date updateDate; - private final List deadlines; + private List deadlines; private String comment; private Boolean locked; private String tmpFileName; @@ -35,6 +29,10 @@ public class PaperDto { private Date fileCreateDate; private Set authors; + public PaperDto() { + + } + @JsonCreator public PaperDto(@JsonProperty("id") Integer id, @JsonProperty("title") String title, diff --git a/src/main/resources/templates/papers/paper.html b/src/main/resources/templates/papers/paper.html index 318dcb7..d83ded6 100644 --- a/src/main/resources/templates/papers/paper.html +++ b/src/main/resources/templates/papers/paper.html @@ -58,8 +58,8 @@
- -

+

Incorrect title

diff --git a/src/main/resources/templates/papers/papers.html b/src/main/resources/templates/papers/papers.html index b3989ee..1a3b882 100644 --- a/src/main/resources/templates/papers/papers.html +++ b/src/main/resources/templates/papers/papers.html @@ -90,7 +90,6 @@ $(paperRow).css("background-color", "white"); $(paperRow).closest(".paper-row").find(".remove-paper").addClass("d-none"); }); - showPapers("#paper-list", ".paper-row"); jQuery('.filter').on('change','#year',function(){ filterPapers("#paper-list", ".paper-row",'1','2018');