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

#98 deadline model edited

Browse Source
This commit is contained in:
Васин Антон 2019-05-17 11:30:26 +03:00
parent 097f7827b0
commit f960d4de1b
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/ru/ulstu/deadline/model/Deadline.java
View File

@ -26,6 +26,11 @@ public class Deadline extends BaseEntity {
public Deadline() { public Deadline() {
} }
public Deadline(Date deadlineDate, String description) {
this.date = deadlineDate;
this.description = description;
}
public Deadline(Date deadlineDate, String description, String executor, Boolean done) { public Deadline(Date deadlineDate, String description, String executor, Boolean done) {
this.date = deadlineDate; this.date = deadlineDate;
this.description = description; this.description = description;

2
src/main/java/ru/ulstu/grant/service/GrantService.java
View File

@ -164,7 +164,7 @@ public class GrantService {
grant.setComment("Комментарий к гранту 1"); grant.setComment("Комментарий к гранту 1");
grant.setProject(projectId); grant.setProject(projectId);
grant.setStatus(APPLICATION); grant.setStatus(APPLICATION);
grant.getDeadlines().add(new Deadline(deadlineDate, "первый дедлайн", "", false)); grant.getDeadlines().add(new Deadline(deadlineDate, "первый дедлайн"));
grant.getAuthors().add(user); grant.getAuthors().add(user);
grant.setLeader(user); grant.setLeader(user);
grant.getPapers().add(paper); grant.getPapers().add(paper);

2
src/main/java/ru/ulstu/paper/service/PaperService.java
View File

@ -173,7 +173,7 @@ public class PaperService {
Paper paper = new Paper(); Paper paper = new Paper();
paper.setTitle(title); paper.setTitle(title);
paper.getAuthors().add(user); paper.getAuthors().add(user);
paper.getDeadlines().add(new Deadline(deadlineDate, "первый дедлайн", "", false)); paper.getDeadlines().add(new Deadline(deadlineDate, "первый дедлайн"));
paper.setCreateDate(new Date()); paper.setCreateDate(new Date());
paper.setUpdateDate(new Date()); paper.setUpdateDate(new Date());
paper.setStatus(DRAFT); paper.setStatus(DRAFT);