From 06864c7ec8d8c6003fc3bfa22c5f4024cbd5ea72 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Wed, 14 Nov 2018 15:15:23 +0400
Subject: [PATCH] read dashboard

---
 .../java/ru/ulstu/paper/model/PaperDto.java   |   8 ++
 src/main/resources/public/js/papers.js        |  23 ++-
 .../resources/templates/papers/dashboard.html | 136 ++----------------
 3 files changed, 38 insertions(+), 129 deletions(-)

diff --git a/src/main/java/ru/ulstu/paper/model/PaperDto.java b/src/main/java/ru/ulstu/paper/model/PaperDto.java
index dc48fcd..d9a1229 100644
--- a/src/main/java/ru/ulstu/paper/model/PaperDto.java
+++ b/src/main/java/ru/ulstu/paper/model/PaperDto.java
@@ -8,6 +8,7 @@ import ru.ulstu.user.model.UserDto;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import static ru.ulstu.core.util.StreamApiUtils.convert;
 
@@ -121,4 +122,11 @@ public class PaperDto {
     public Set<UserDto> getAuthors() {
         return authors;
     }
+
+    public String getAuthorsString() {
+        return authors
+                .stream()
+                .map(author -> author.getLastName() + author.getFirstName())
+                .collect(Collectors.joining(", "));
+    }
 }
diff --git a/src/main/resources/public/js/papers.js b/src/main/resources/public/js/papers.js
index 3b78d8a..4523d4c 100644
--- a/src/main/resources/public/js/papers.js
+++ b/src/main/resources/public/js/papers.js
@@ -12,7 +12,7 @@ function showPapers(papersElement, paperRowClass) {
                 "                  <i class='fa fa-file-text-o fa-stack-1x fa-inverse'></i>" +
                 "                </span>" +
                 "                    <a href='paper?id=" + paper.id + "" +
-                "'><span>" + paper.title + "</span></a></div>" +
+                "'><span>" + (index+1) + ". " + paper.title + "</span></a></div>" +
                 "<div class='col-md-1'>" +
                 "<span class='remove-paper d-none' onclick=\"deletePaper(" + paper.id + ",'" + papersElement + "', '" + paperRowClass + "')\">" +
                 "<i class=\"fa fa-trash\" aria-hidden=\"true\"></i></span>" +
@@ -75,4 +75,25 @@ function getPaperStatusClass(status) {
         default:
             return "";
     }
+}
+
+function showPaperDashboard(dashboardElement) {
+    getFromRest(urlPapers, function (paperList) {
+        paperList.forEach(function (paper, index) {
+            $(dashboardElement).append("<div class=\"col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card\">" +
+                "<div class=\"row\">" +
+                "<div class=\"col-2\">" +
+                "<span class=\"fa-stack fa-1x\">" +
+                "<i class=\"fa fa-circle fa-stack-2x text-primary\"></i>" +
+                "<i class=\"fa fa-file-text-o fa-stack-1x fa-inverse\"></i>" +
+                "</span>" +
+                "</div>" +
+                "<div class=\"col col-10 text-right\">" +
+                "<h7 class=\"service-heading\">" + paper.title + "</h7>" +
+                "<p class=\"text-muted\">" + paper.authorsString + "</p>" +
+                "</div>" +
+                "</div>" +
+                "</div>");
+        });
+    });
 }
\ No newline at end of file
diff --git a/src/main/resources/templates/papers/dashboard.html b/src/main/resources/templates/papers/dashboard.html
index b4e18d7..2549c17 100644
--- a/src/main/resources/templates/papers/dashboard.html
+++ b/src/main/resources/templates/papers/dashboard.html
@@ -15,137 +15,17 @@
                     <h2 class="section-heading text-uppercase">Dashboard</h2>
                 </div>
             </div>
-            <div class="row justify-content-center">
-                <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card">
-                    <div class="row">
-                        <div class="col-2">
-                                <span class="fa-stack fa-1x">
-                                  <i class="fa fa-circle fa-stack-2x text-primary"></i>
-                                  <i class="fa fa-file-text-o fa-stack-1x fa-inverse"></i>
-                                </span>
-                        </div>
-                        <div class="col col-10 text-right">
-                            <h7 class="service-heading">Название статьи</h7>
-                            <p class="text-muted">Список авторов И.О.</p>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card">
-                    <div class="row">
-                        <div class="col-2">
-                                <span class="fa-stack fa-1x">
-                                  <i class="fa fa-circle fa-stack-2x text-primary"></i>
-                                  <i class="fa fa-file-text-o fa-stack-1x fa-inverse"></i>
-                                </span>
-                        </div>
-                        <div class="col col-10 text-right">
-                            <h7 class="service-heading">Название статьи</h7>
-                            <p class="text-muted">Список авторов И.О.</p>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card">
-                    <div class="row">
-                        <div class="col-2">
-                                <span class="fa-stack fa-1x">
-                                  <i class="fa fa-circle fa-stack-2x text-primary"></i>
-                                  <i class="fa fa-file-text-o fa-stack-1x fa-inverse"></i>
-                                </span>
-                        </div>
-                        <div class="col col-10 text-right">
-                            <h7 class="service-heading">Название статьи</h7>
-                            <p class="text-muted">Список авторов И.О.</p>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card">
-                    <div class="row">
-                        <div class="col-2">
-                                <span class="fa-stack fa-1x">
-                                  <i class="fa fa-circle fa-stack-2x text-primary"></i>
-                                  <i class="fa fa-file-text-o fa-stack-1x fa-inverse"></i>
-                                </span>
-                        </div>
-                        <div class="col col-10 text-right">
-                            <h7 class="service-heading">Название статьи</h7>
-                            <p class="text-muted">Список авторов И.О.</p>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card">
-                    <div class="row">
-                        <div class="col-2">
-                                <span class="fa-stack fa-1x">
-                                  <i class="fa fa-circle fa-stack-2x text-primary"></i>
-                                  <i class="fa fa-file-text-o fa-stack-1x fa-inverse"></i>
-                                </span>
-                        </div>
-                        <div class="col col-10 text-right">
-                            <h7 class="service-heading">Название статьи</h7>
-                            <p class="text-muted">Список авторов И.О.</p>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card">
-                    <div class="row">
-                        <div class="col-2">
-                                <span class="fa-stack fa-1x">
-                                  <i class="fa fa-circle fa-stack-2x text-primary"></i>
-                                  <i class="fa fa-file-text-o fa-stack-1x fa-inverse"></i>
-                                </span>
-                        </div>
-                        <div class="col col-10 text-right">
-                            <h7 class="service-heading">Название статьи</h7>
-                            <p class="text-muted">Список авторов И.О.</p>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card">
-                    <div class="row">
-                        <div class="col-2">
-                                <span class="fa-stack fa-1x">
-                                  <i class="fa fa-circle fa-stack-2x text-primary"></i>
-                                  <i class="fa fa-file-text-o fa-stack-1x fa-inverse"></i>
-                                </span>
-                        </div>
-                        <div class="col col-10 text-right">
-                            <h7 class="service-heading">Название статьи</h7>
-                            <p class="text-muted">Список авторов И.О.</p>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card">
-                    <div class="row">
-                        <div class="col-2">
-                                <span class="fa-stack fa-1x">
-                                  <i class="fa fa-circle fa-stack-2x text-primary"></i>
-                                  <i class="fa fa-file-text-o fa-stack-1x fa-inverse"></i>
-                                </span>
-                        </div>
-                        <div class="col col-10 text-right">
-                            <h7 class="service-heading">Название статьи</h7>
-                            <p class="text-muted">Список авторов И.О.</p>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card">
-                    <div class="row">
-                        <div class="col-2">
-                                <span class="fa-stack fa-1x">
-                                  <i class="fa fa-circle fa-stack-2x text-primary"></i>
-                                  <i class="fa fa-file-text-o fa-stack-1x fa-inverse"></i>
-                                </span>
-                        </div>
-                        <div class="col col-10 text-right">
-                            <h7 class="service-heading">Название статьи</h7>
-                            <p class="text-muted">Список авторов И.О.</p>
-                        </div>
-                    </div>
-                </div>
+            <div class="row justify-content-center" id="dashboard">
+
             </div>
         </div>
     </section>
-
+    <script src="/js/papers.js"></script>
+    <script>
+        $(document).ready(function () {
+            showPaperDashboard("#dashboard");
+        });
+    </script>
 </div>
 
 </body>