From 181b14d2e75d0a1865371747fda330abc0101be1 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Tue, 30 Apr 2019 19:04:37 +0400
Subject: [PATCH] #fix paper status

---
 .../ru/ulstu/paper/service/PaperService.java  |  2 +-
 .../resources/static/papers/paper-item.vue    | 30 +++++++++++-----
 .../resources/static/papers/paper-status.vue  | 35 +++++++++++++++++++
 3 files changed, 57 insertions(+), 10 deletions(-)
 create mode 100644 src/main/resources/static/papers/paper-status.vue

diff --git a/src/main/java/ru/ulstu/paper/service/PaperService.java b/src/main/java/ru/ulstu/paper/service/PaperService.java
index 3db7c84..aa009e7 100644
--- a/src/main/java/ru/ulstu/paper/service/PaperService.java
+++ b/src/main/java/ru/ulstu/paper/service/PaperService.java
@@ -40,7 +40,7 @@ import static ru.ulstu.paper.model.ReferenceDto.ReferenceType.BOOK;
 
 @Service
 public class PaperService {
-    private final static int MAX_DISPLAY_SIZE = 40;
+    private final static int MAX_DISPLAY_SIZE = 50;
     private final static String PAPER_FORMATTED_TEMPLATE = "%s %s";
 
     private final PaperNotificationService paperNotificationService;
diff --git a/src/main/resources/static/papers/paper-item.vue b/src/main/resources/static/papers/paper-item.vue
index e244599..b261ad5 100644
--- a/src/main/resources/static/papers/paper-item.vue
+++ b/src/main/resources/static/papers/paper-item.vue
@@ -1,22 +1,34 @@
 <template>
     <div class="row text-left paper-row" style="background-color: white;">
-        <div class="col">
-            <span class="fa-stack fa-1x">
-                <div>
-                    <i class="fa fa-circle fa-stack-2x text-warning"></i>
-                </div>
-                <i class="fa fa-file-text-o fa-stack-1x fa-inverse"></i>
-            </span>
+        <div class="col-sm-12">
+            <paper-status :status="paper.status"
+                          :key="paper.id">
+            </paper-status>
             <router-link :to="{ path: 'papers/paper', query: { id: paper.id }}" class="portfolio-link">
                 <span class="h6">{{ paper.title }}</span>
-<!--                <span class="text-muted">{{ paper.authors }}</span>-->
             </router-link>
         </div>
+        <div class="col-sm-11 col">
+                    <span class="text-muted" v-for="author in getAuthors"
+                          :key="author.id">{{ author }}</span>
+        </div>
     </div>
 </template>
 
 <script>
     module.exports = {
-        props: ['paper']
+        props: ['paper'],
+        components: {
+            "paper-status": httpVueLoaderEx("/papers/paper-status.vue")
+        },
+        computed: {
+            getAuthors: function () {
+                var authorsResult = [];
+                this.paper.authors.forEach(function (author) {
+                    authorsResult.push(author.lastName + " " + author.firstName);
+                });
+                return authorsResult.join(', ')
+            }
+        }
     }
 </script>
\ No newline at end of file
diff --git a/src/main/resources/static/papers/paper-status.vue b/src/main/resources/static/papers/paper-status.vue
new file mode 100644
index 0000000..0386e05
--- /dev/null
+++ b/src/main/resources/static/papers/paper-status.vue
@@ -0,0 +1,35 @@
+<template>
+    <span class="fa-stack fa-1x">
+        <div v-if="status === 'ATTENTION'">
+            <i class="fa fa-circle fa-stack-2x text-warning"></i>
+        </div>
+        <div v-if="status === 'DRAFT'">
+            <i class="fa fa-circle fa-stack-2x text-draft"></i>
+        </div>
+        <div v-if="status === 'ON_PREPARATION'">
+            <i class="fa fa-circle fa-stack-2x text-primary"></i>
+        </div>
+        <div v-if="status === 'ON_REVIEW'">
+            <i class="fa fa-circle fa-stack-2x text-review"></i>
+        </div>
+        <div v-if="status === 'COMPLETED'">
+            <i class="fa fa-circle fa-stack-2x text-success"></i>
+        </div>
+        <div v-if="status === 'FAILED'">
+            <i class="fa fa-circle fa-stack-2x text-failed"></i>
+        </div>
+        <div v-if="status === 'ACCEPTED'">
+            <i class="fa fa-circle fa-stack-2x text-accepted"></i>
+        </div>
+        <div v-if="status === 'NOT_ACCEPTED'">
+            <i class="fa fa-circle fa-stack-2x text-not-accepted"></i>
+        </div>
+        <i class="fa fa-file-text-o fa-stack-1x fa-inverse"></i>
+    </span>
+</template>
+
+<script>
+    module.exports = {
+        props: ['status'],
+    }
+</script>
\ No newline at end of file