diff --git a/src/main/java/ru/ulstu/conference/controller/ConferenceController.java b/src/main/java/ru/ulstu/conference/controller/ConferenceController.java index c4a2433..0f76881 100644 --- a/src/main/java/ru/ulstu/conference/controller/ConferenceController.java +++ b/src/main/java/ru/ulstu/conference/controller/ConferenceController.java @@ -48,11 +48,12 @@ public class ConferenceController { public void getConference(ModelMap modelMap, @RequestParam(value = "id") Integer id) { if (id != null && id > 0) { ConferenceDto conferenceDto = conferenceService.findOneDto(id); + conferenceDto.setNotSelectedPapers(getNotSelectPapers(conferenceDto.getPaperIds())); modelMap.put("conferenceDto", conferenceDto); - modelMap.put("allPapers", getAllPapers(conferenceDto.getPaperIds())); } else { - modelMap.put("conferenceDto", new ConferenceDto()); - modelMap.put("allPapers", getAllPapers(new ArrayList())); + ConferenceDto conferenceDto = new ConferenceDto(); + conferenceDto.setNotSelectedPapers(getNotSelectPapers(new ArrayList())); + modelMap.put("conferenceDto", conferenceDto); } } @@ -93,7 +94,7 @@ public class ConferenceController { return CONFERENCE_PAGE; } - public List getAllPapers(List paperIds) { + public List getNotSelectPapers(List paperIds) { return conferenceService.getConferencePapers(paperIds); } diff --git a/src/main/java/ru/ulstu/conference/model/ConferenceDto.java b/src/main/java/ru/ulstu/conference/model/ConferenceDto.java index 9e6e26d..ec9ec92 100644 --- a/src/main/java/ru/ulstu/conference/model/ConferenceDto.java +++ b/src/main/java/ru/ulstu/conference/model/ConferenceDto.java @@ -41,6 +41,9 @@ public class ConferenceDto { private Set userIds = new HashSet<>(); private List paperIds = new ArrayList<>(); private List papers = new ArrayList<>(); + + + private List notSelectedPapers = new ArrayList<>(); private Set users = new HashSet<>(); private Integer filterUserId; @@ -59,7 +62,8 @@ public class ConferenceDto { @JsonProperty("userIds") Set userIds, @JsonProperty("paperIds") List paperIds, @JsonProperty("users") Set users, - @JsonProperty("papers") List papers) { + @JsonProperty("papers") List papers, + @JsonProperty("notSelectedPapers") List notSelectedPapers) { this.id = id; this.title = title; this.description = description; @@ -72,6 +76,7 @@ public class ConferenceDto { this.paperIds = paperIds; this.users = users; this.papers = papers; + this.notSelectedPapers = notSelectedPapers; } public ConferenceDto(Conference conference) { @@ -202,4 +207,12 @@ public class ConferenceDto { this.removedDeadlineIds = removedDeadlineIds; } + public List getNotSelectedPapers() { + return notSelectedPapers; + } + + public void setNotSelectedPapers(List notSelectedPapers) { + this.notSelectedPapers = notSelectedPapers; + } + } diff --git a/src/main/resources/public/css/conference.css b/src/main/resources/public/css/conference.css index bc63bfe..fa3666e 100644 --- a/src/main/resources/public/css/conference.css +++ b/src/main/resources/public/css/conference.css @@ -7,6 +7,10 @@ body { border-radius: .25rem; } +.filter-option-inner-inner { + color: white; +} + @@ -49,6 +53,8 @@ body { .paper { margin: 0; + min-height: 40px; + height: 40px; } .paper-name { @@ -104,13 +110,14 @@ body { float: right; } -@media (max-width: 1199px) { +@media (max-width: 1199px) and (min-width: 768px){ .paper-control { display: block!important; } } @media (max-width: 991px) { + .dates-panel { display: block!important; } diff --git a/src/main/resources/templates/conferences/conference.html b/src/main/resources/templates/conferences/conference.html index 13686b3..1ed2859 100644 --- a/src/main/resources/templates/conferences/conference.html +++ b/src/main/resources/templates/conferences/conference.html @@ -62,7 +62,6 @@ - @@ -136,6 +135,7 @@
+
- Удалить +
+