romanov73/ng-tracker
1
0
Fork 0
Code Issues 18 Pull Requests 4 Projects Releases Wiki Activity

Resolve "Ping конференции в списке конференций" #196

Merged
VladimirZarayskiy merged 44 commits from 68-ping-conf into dev 2019-04-25 14:00:36 +04:00
Conversation 13 Commits 44 Files Changed 54 +2 -11
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 02d643727e - Show all commits

11
src/main/java/ru/ulstu/project/model/ProjectDto.java
View File

@ -15,7 +15,6 @@ public class ProjectDto {
@NotEmpty @NotEmpty
private String title; private String title;
private Project.ProjectStatus status; private Project.ProjectStatus status;
private String statusName;
private String description; private String description;
private List<Deadline> deadlines = new ArrayList<>(); private List<Deadline> deadlines = new ArrayList<>();
private GrantDto grant; private GrantDto grant;
@ -40,7 +39,6 @@ public class ProjectDto {
this.id = id; this.id = id;
this.title = title; this.title = title;
this.status = status; this.status = status;
this.statusName = status.getStatusName();
this.description = description; this.description = description;
this.grant = grant; this.grant = grant;
this.repository = repository; this.repository = repository;
@ -53,7 +51,6 @@ public class ProjectDto {
this.id = project.getId(); this.id = project.getId();
this.title = project.getTitle(); this.title = project.getTitle();
this.status = project.getStatus(); this.status = project.getStatus();
this.statusName = project.getStatus().getStatusName();
this.description = project.getDescription(); this.description = project.getDescription();
this.applicationFileName = project.getApplication() == null ? null : project.getApplication().getName(); this.applicationFileName = project.getApplication() == null ? null : project.getApplication().getName();
this.grant = project.getGrant() == null ? null : new GrantDto(project.getGrant()); this.grant = project.getGrant() == null ? null : new GrantDto(project.getGrant());
@ -85,14 +82,6 @@ public class ProjectDto {
this.status = status; this.status = status;
} }
public String getStatusName() {
return statusName;
}
public void setStatusName(String statusName) {
this.statusName = statusName;
}
public String getDescription() { public String getDescription() {
return description; return description;
} }

2
src/main/resources/templates/projects/projects.html
View File

@ -27,7 +27,9 @@
</div> </div>
</div> </div>
</section> </section>
<div id="modalDelete"/>
</form> </form>
<script src="/js/projects.js"></script>
</div> </div>
</body> </body>
</html> </html>