From 41bd00d6450ad61cd0c6928dc7cb320c66fee607 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BD=20=D0=90=D0=BD=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BD?= <a.vasin@mediasoft.team>
Date: Tue, 23 Apr 2019 13:40:11 +0300
Subject: [PATCH] project dashboard edited

---
 src/main/java/ru/ulstu/project/model/ProjectDto.java  | 11 +++++++++++
 .../projects/fragments/projectDashboardFragment.html  |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ru/ulstu/project/model/ProjectDto.java b/src/main/java/ru/ulstu/project/model/ProjectDto.java
index 4e03365..a2827ad 100644
--- a/src/main/java/ru/ulstu/project/model/ProjectDto.java
+++ b/src/main/java/ru/ulstu/project/model/ProjectDto.java
@@ -15,6 +15,7 @@ public class ProjectDto {
     @NotEmpty
     private String title;
     private Project.ProjectStatus status;
+    private String statusName;
     private String description;
     private List<Deadline> deadlines = new ArrayList<>();
     private GrantDto grant;
@@ -39,6 +40,7 @@ public class ProjectDto {
         this.id = id;
         this.title = title;
         this.status = status;
+        this.statusName = status.getStatusName();
         this.description = description;
         this.grant = grant;
         this.repository = repository;
@@ -51,6 +53,7 @@ public class ProjectDto {
         this.id = project.getId();
         this.title = project.getTitle();
         this.status = project.getStatus();
+        this.statusName = project.getStatus().getStatusName();
         this.description = project.getDescription();
         this.applicationFileName = project.getApplication() == null ? null : project.getApplication().getName();
         this.grant = project.getGrant() == null ? null : new GrantDto(project.getGrant());
@@ -82,6 +85,14 @@ public class ProjectDto {
         this.status = status;
     }
 
+    public String getStatusName() {
+        return statusName;
+    }
+
+    public void setStatusName(String statusName) {
+        this.statusName = statusName;
+    }
+
     public String getDescription() {
         return description;
     }
diff --git a/src/main/resources/templates/projects/fragments/projectDashboardFragment.html b/src/main/resources/templates/projects/fragments/projectDashboardFragment.html
index 1f66c4f..4e6f1e6 100644
--- a/src/main/resources/templates/projects/fragments/projectDashboardFragment.html
+++ b/src/main/resources/templates/projects/fragments/projectDashboardFragment.html
@@ -11,7 +11,7 @@
         </div>
         <div class="col col-10 text-right">
             <h7 class="service-heading" th:text="${project.title}"> title</h7>
-            <p class="text-muted" th:text="${project.status.statusName}"> status</p>
+            <p class="text-muted" th:text="${project.statusName}"> status</p>
         </div>
     </div>
 </div>