From 02d643727ec2225b72853b293c090274a7209c94 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 23:32:40 +0300
Subject: [PATCH] #113 projects/projects edited

---
 src/main/java/ru/ulstu/project/model/ProjectDto.java | 11 -----------
 src/main/resources/templates/projects/projects.html  |  2 ++
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/main/java/ru/ulstu/project/model/ProjectDto.java b/src/main/java/ru/ulstu/project/model/ProjectDto.java
index a2827ad..4e03365 100644
--- a/src/main/java/ru/ulstu/project/model/ProjectDto.java
+++ b/src/main/java/ru/ulstu/project/model/ProjectDto.java
@@ -15,7 +15,6 @@ 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;
@@ -40,7 +39,6 @@ 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;
@@ -53,7 +51,6 @@ 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());
@@ -85,14 +82,6 @@ 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/projects.html b/src/main/resources/templates/projects/projects.html
index fd19383..e70b910 100644
--- a/src/main/resources/templates/projects/projects.html
+++ b/src/main/resources/templates/projects/projects.html
@@ -27,7 +27,9 @@
                 </div>
             </div>
         </section>
+        <div id="modalDelete"/>
     </form>
+    <script src="/js/projects.js"></script>
 </div>
 </body>
 </html>