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 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 @@ +
+