project dashboard edited

This commit is contained in:
Васин Антон 2019-04-23 13:40:11 +03:00
parent 5e86952cb6
commit 41bd00d645
2 changed files with 12 additions and 1 deletions

View File

@ -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;
}

View File

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