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

status

+

status