diff options
author | Niedermann IT-Dienstleistungen <stefan-niedermann@users.noreply.github.com> | 2024-01-20 00:01:24 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-20 00:01:24 +0300 |
commit | 00eeee817ca231d22c7787e67b6ddd7ae04fdf28 (patch) | |
tree | e434ca03b3f1fac903624172638dc7484883fae1 /app/src/main/java/it/niedermann/nextcloud/deck/model/internal/FilterInformation.java | |
parent | b8ee8530fe796f3d13db41429f6a140c55dc22b8 (diff) | |
parent | 3ae26363d56157a0869dd6717ce6e069a4a8cc44 (diff) |
Merge pull request #1565 from stefan-niedermann/master
Merge master
Diffstat (limited to 'app/src/main/java/it/niedermann/nextcloud/deck/model/internal/FilterInformation.java')
-rw-r--r-- | app/src/main/java/it/niedermann/nextcloud/deck/model/internal/FilterInformation.java | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/internal/FilterInformation.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/internal/FilterInformation.java index da0501779..8c7da2b24 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/internal/FilterInformation.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/internal/FilterInformation.java @@ -9,6 +9,7 @@ import java.util.List; import it.niedermann.nextcloud.deck.model.Label; import it.niedermann.nextcloud.deck.model.User; +import it.niedermann.nextcloud.deck.model.enums.EDoneType; import it.niedermann.nextcloud.deck.model.enums.EDueType; import it.niedermann.nextcloud.deck.model.ocs.projects.OcsProject; @@ -20,6 +21,8 @@ public class FilterInformation implements Serializable { @NonNull private EDueType dueType = EDueType.NO_FILTER; + @NonNull + private EDoneType doneType = EDoneType.NO_FILTER; private boolean noAssignedLabel = false; private boolean noAssignedUser = false; private boolean noAssignedProject = false; @@ -41,6 +44,7 @@ public class FilterInformation implements Serializable { public FilterInformation(@Nullable FilterInformation filterInformation) { if (filterInformation != null) { this.dueType = filterInformation.getDueType(); + this.doneType = filterInformation.getDoneType(); this.archiveStatus = filterInformation.getArchiveStatus(); this.users.addAll(filterInformation.getUsers()); this.labels.addAll(filterInformation.getLabels()); @@ -72,6 +76,15 @@ public class FilterInformation implements Serializable { } @NonNull + public EDoneType getDoneType() { + return doneType; + } + + public void setDoneType(@NonNull EDoneType doneType) { + this.doneType = doneType; + } + + @NonNull public List<User> getUsers() { return users; } @@ -152,6 +165,7 @@ public class FilterInformation implements Serializable { public String toString() { return "FilterInformation{" + "dueType=" + dueType + + ", doneType=" + doneType + ", noAssignedLabel=" + noAssignedLabel + ", noAssignedUser=" + noAssignedUser + ", users=" + users + @@ -169,6 +183,7 @@ public class FilterInformation implements Serializable { return false; } return !(filterInformation.getDueType() == EDueType.NO_FILTER + && filterInformation.getDoneType() == EDoneType.NO_FILTER && filterInformation.getUsers().isEmpty() && filterInformation.getProjects().isEmpty() && filterInformation.getLabels().isEmpty() |