diff --git a/src/main/java/ru/ulstu/project/model/ProjectDto.java b/src/main/java/ru/ulstu/project/model/ProjectDto.java index f6ee831..affee4e 100644 --- a/src/main/java/ru/ulstu/project/model/ProjectDto.java +++ b/src/main/java/ru/ulstu/project/model/ProjectDto.java @@ -31,8 +31,6 @@ public class ProjectDto { private List removedDeadlineIds = new ArrayList<>(); private Set executorIds; private List executors; - private boolean hasAge; - private boolean hasDegree; private final static int MAX_EXECUTORS_LENGTH = 40; @@ -52,9 +50,7 @@ public class ProjectDto { @JsonProperty("repository") String repository, @JsonProperty("deadlines") List deadlines, @JsonProperty("executorIds") Set executorIds, - @JsonProperty("executors") List executors, - @JsonProperty("hasAge") boolean hasAge, - @JsonProperty("hasDegree") boolean hasDegree) { + @JsonProperty("executors") List executors) { this.id = id; this.title = title; this.status = status; @@ -65,8 +61,6 @@ public class ProjectDto { this.applicationFileName = null; this.executorIds = executorIds; this.executors = executors; - this.hasAge = hasAge; - this.hasDegree = hasDegree; } @@ -172,22 +166,6 @@ public class ProjectDto { this.executors = executors; } - public boolean isHasAge() { - return hasAge; - } - - public void setHasAge(boolean hasAge) { - this.hasAge = hasAge; - } - - public boolean isHasDegree() { - return hasDegree; - } - - public void setHasDegree(boolean hasDegree) { - this.hasDegree = hasDegree; - } - public String getExecutorsString() { return StringUtils.abbreviate(executors .stream() diff --git a/src/main/java/ru/ulstu/project/service/ProjectService.java b/src/main/java/ru/ulstu/project/service/ProjectService.java index ab2fa91..fe8813c 100644 --- a/src/main/java/ru/ulstu/project/service/ProjectService.java +++ b/src/main/java/ru/ulstu/project/service/ProjectService.java @@ -110,8 +110,8 @@ public class ProjectService { } public void removeDeadline(ProjectDto projectDto, Integer deadlineId) { - if (projectDto.getDeadlines().get(deadlineId).getId() != null) { - projectDto.getRemovedDeadlineIds().add(projectDto.getDeadlines().get(deadlineId).getId()); + if (deadlineId != null) { + projectDto.getRemovedDeadlineIds().add(deadlineId); } projectDto.getDeadlines().remove((int) deadlineId); } @@ -121,8 +121,8 @@ public class ProjectService { } public List getProjectExecutors(ProjectDto projectDto) { - List filteredUsers = userService.filterByAgeAndDegree(projectDto.isHasAge(), projectDto.isHasDegree()); - return filteredUsers; + List users = userService.findAll(); + return users; } } diff --git a/src/main/resources/db/changelog-20190528_000001-schema.xml b/src/main/resources/db/changelog-20190528_000002-schema.xml similarity index 87% rename from src/main/resources/db/changelog-20190528_000001-schema.xml rename to src/main/resources/db/changelog-20190528_000002-schema.xml index 0605b48..7df707c 100644 --- a/src/main/resources/db/changelog-20190528_000001-schema.xml +++ b/src/main/resources/db/changelog-20190528_000002-schema.xml @@ -2,15 +2,15 @@ - + - + - diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml index fbc1ec3..c8a6e63 100644 --- a/src/main/resources/db/changelog-master.xml +++ b/src/main/resources/db/changelog-master.xml @@ -48,5 +48,5 @@ - + \ No newline at end of file diff --git a/src/main/resources/templates/projects/project.html b/src/main/resources/templates/projects/project.html index 304fed0..2c4a67b 100644 --- a/src/main/resources/templates/projects/project.html +++ b/src/main/resources/templates/projects/project.html @@ -92,11 +92,11 @@
-