#59 added begin-end dates in conferenceRow

5 years ago · 338d7c2e09
parent 34033fac5f
commit 338d7c2e09
4 changed files with 17 additions and 17 deletions
--- 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];
+    }
+
 }
--- 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;
--- 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) {
--- a/src/main/resources/templates/conferences/fragments/confLineFragment.html
+++ b/src/main/resources/templates/conferences/fragments/confLineFragment.html
@ -5,13 +5,14 @@
 </head>
 <body>
 <div th:fragment="confLine (conference)" class="row text-left conference-row h3" style="background-color: white;">
-    <div class="col">
-        <a th:href="@{'conference?id='+${conference.id}}">
+    <div class="col d-flex justify-content-between">
+        <a th:href="@{'conference?id='+${conference.id}}" class="w-100 text-decoration">
            <span class="h5" th:text="${conference.title}"/>
+            <span class="text-muted h6 float-right m-2" th:text="${conference.datesString}"/>
        </a>
        <input class="id-class" type="hidden" th:value="${conference.id}"/>
-        <a class="remove-paper pull-right" th:href="@{'/conferences/delete/'+${conference.id}}"
-           data-confirm="Удалить статью?">
+        <a class="remove-paper pull-right m-auto" th:href="@{'/conferences/delete/'+${conference.id}}"
+           data-confirm="Удалить конференцию?">
            <i class="fa fa-trash" aria-hidden="true"></i>
        </a>
    </div>