From 338d7c2e09a1ede660401d3f7d3353610fe1f403 Mon Sep 17 00:00:00 2001 From: Nightblade73 Date: Fri, 19 Apr 2019 18:32:24 +0400 Subject: [PATCH] #59 added begin-end dates in conferenceRow --- .../ru/ulstu/conference/model/ConferenceDto.java | 7 +++++++ src/main/resources/public/css/conference.css | 6 +++++- src/main/resources/public/js/conference.js | 12 ------------ .../conferences/fragments/confLineFragment.html | 9 +++++---- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/ru/ulstu/conference/model/ConferenceDto.java b/src/main/java/ru/ulstu/conference/model/ConferenceDto.java index a3f80c9..4ea0e2e 100644 --- a/src/main/java/ru/ulstu/conference/model/ConferenceDto.java +++ b/src/main/java/ru/ulstu/conference/model/ConferenceDto.java @@ -18,6 +18,9 @@ import static ru.ulstu.core.util.StreamApiUtils.convert; public class ConferenceDto { + String BEGINDATESTRING = "Начало: "; + String ENDDATESTRING = "Конец: "; + private Integer id; @NotEmpty @Size(min = 2, max = 400) @@ -211,4 +214,8 @@ public class ConferenceDto { this.notSelectedPapers = notSelectedPapers; } + public String getDatesString() { + return BEGINDATESTRING + beginDate.toString().split(" ")[0] + " " + ENDDATESTRING + endDate.toString().split(" ")[0]; + } + } diff --git a/src/main/resources/public/css/conference.css b/src/main/resources/public/css/conference.css index bc70ca4..ad06b3c 100644 --- a/src/main/resources/public/css/conference.css +++ b/src/main/resources/public/css/conference.css @@ -3,7 +3,7 @@ body { } .conference-row .col:hover { - background-color: #eaeaea; + background-color: #f3f3f3; border-radius: .25rem; } @@ -15,6 +15,10 @@ body { margin-bottom: 10px; } +.conference-row .col .text-decoration { + text-decoration: none; +} + .form-group textarea { min-height: 206px; diff --git a/src/main/resources/public/js/conference.js b/src/main/resources/public/js/conference.js index dd843ca..d415ca2 100644 --- a/src/main/resources/public/js/conference.js +++ b/src/main/resources/public/js/conference.js @@ -1,17 +1,5 @@ $(document).ready(function () { - $(".conference-row").mouseenter(function (event) { - var conferenceRow = $(event.target).closest(".conference-row"); - $(conferenceRow).css("background-color", "#f8f9fa"); - $(conferenceRow).find(".remove-conference").removeClass("d-none"); - - }); - $(".conference-row").mouseleave(function (event) { - var conferenceRow = $(event.target).closest(".conference-row"); - $(conferenceRow).css("background-color", "white"); - $(conferenceRow).closest(".conference-row").find(".remove-conference").addClass("d-none"); - }); - $('a[data-confirm]').click(function(ev) { var href = $(this).attr('href'); if (!$('#dataConfirmModal').length) { diff --git a/src/main/resources/templates/conferences/fragments/confLineFragment.html b/src/main/resources/templates/conferences/fragments/confLineFragment.html index d104952..7d948d4 100644 --- a/src/main/resources/templates/conferences/fragments/confLineFragment.html +++ b/src/main/resources/templates/conferences/fragments/confLineFragment.html @@ -5,13 +5,14 @@
-
- +
+ + - +