diff options
8 files changed, 330 insertions, 56 deletions
diff --git a/.gitignore b/.gitignore index 34a8a8ee1..a6debc2ba 100644 --- a/.gitignore +++ b/.gitignore @@ -35,7 +35,7 @@ captures/ # IntelliJ *.iml .idea/workspace.xml -.idea/tasks.xml +.idea/stacks.xml .idea/gradle.xml .idea/assetWizardSettings.xml .idea/dictionaries diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/DBStatus.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/DBStatus.java index 60798d754..d242cfbb7 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/DBStatus.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/DBStatus.java @@ -40,7 +40,7 @@ public enum DBStatus { * @param id The String containing the DBStatus identifier. Must not null. * @return The DBStatus fitting to the String. */ - public static DBStatus parse(int id) { + public static DBStatus findById(int id) { for (DBStatus s : DBStatus.values()){ if (s.getId() == id) { return s; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/RemoteEntity.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/RemoteEntity.java new file mode 100644 index 000000000..7855e9077 --- /dev/null +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/RemoteEntity.java @@ -0,0 +1,50 @@ +package it.niedermann.nextcloud.deck.model; + +import java.io.Serializable; + +public class RemoteEntity implements Serializable { + protected long remoteId = 0; + protected long id = 0; + private DBStatus status = DBStatus.UP_TO_DATE; + + public RemoteEntity() { + } + + public RemoteEntity(long remoteId) { + super(); + this.remoteId = remoteId; + } + + public RemoteEntity(long id, long remoteId) { + this(remoteId); + this.id = id; + } + + public long getRemoteId() { + return remoteId; + } + + public void setRemoteId(long remoteId) { + this.remoteId = remoteId; + } + + public DBStatus getStatus() { + return status; + } + + public void setStatus(DBStatus status) { + this.status = status; + } + + public void setStatus(int statusId) { + this.status = DBStatus.findById(statusId); + } + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } +} diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Board.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Board.java index 3393e9c5f..0436b1e18 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Board.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Board.java @@ -1,39 +1,27 @@ package it.niedermann.nextcloud.deck.model.board; -import java.util.ArrayList; - import it.niedermann.nextcloud.deck.model.DBStatus; +import it.niedermann.nextcloud.deck.model.RemoteEntity; -public class Board { - private long id; - private long remoteId; +public class Board extends RemoteEntity { private long accountId; private String title; private DBStatus status = DBStatus.UP_TO_DATE; - private ArrayList<Task> tasks; public Board(long accountId, long remoteId, String title) { + super(remoteId); this.accountId = accountId; - this.remoteId = remoteId; this.title = title; } public Board(long accountId, long id, String title, DBStatus status) { + super(); this.accountId = accountId; this.id = id; this.title = title; this.status = status; } - - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - public long getRemoteId() { return remoteId; } @@ -65,12 +53,4 @@ public class Board { public void setStatus(DBStatus status) { this.status = status; } - - public ArrayList<Task> getTasks() { - return tasks; - } - - public void setTasks(ArrayList<Task> tasks) { - this.tasks = tasks; - } } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Card.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Card.java new file mode 100644 index 000000000..e01643fc3 --- /dev/null +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Card.java @@ -0,0 +1,169 @@ +package it.niedermann.nextcloud.deck.model.board; + +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; + +import it.niedermann.nextcloud.deck.model.DBStatus; +import it.niedermann.nextcloud.deck.model.RemoteEntity; + +public class Card extends RemoteEntity { + + private String title; + private String description; + private long stackId; + private String type; + private LocalDate lastModified; + private LocalDate createdAt; + private LocalDate deletedAt; + private List<Label> labels = new ArrayList<>(); + private String assignedUsers; + private String attachments; + private int attachmentCount; + private String owner; + private String order; + private boolean archived; + private String dueDate; + private int overdue; + private int commentsUnread; + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public long getStackId() { + return stackId; + } + + public void setStackId(long stackId) { + this.stackId = stackId; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public LocalDate getLastModified() { + return lastModified; + } + + public void setLastModified(LocalDate lastModified) { + this.lastModified = lastModified; + } + + public LocalDate getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(LocalDate createdAt) { + this.createdAt = createdAt; + } + + public LocalDate getDeletedAt() { + return deletedAt; + } + + public void setDeletedAt(LocalDate deletedAt) { + this.deletedAt = deletedAt; + } + + public List<Label> getLabels() { + return labels; + } + + public void setLabels(List<Label> labels) { + this.labels = labels; + } + + public void addLabel(Label label){ + this.labels.add(label); + } + + public String getAssignedUsers() { + return assignedUsers; + } + + public void setAssignedUsers(String assignedUsers) { + this.assignedUsers = assignedUsers; + } + + public String getAttachments() { + return attachments; + } + + public void setAttachments(String attachments) { + this.attachments = attachments; + } + + public int getAttachmentCount() { + return attachmentCount; + } + + public void setAttachmentCount(int attachmentCount) { + this.attachmentCount = attachmentCount; + } + + public String getOwner() { + return owner; + } + + public void setOwner(String owner) { + this.owner = owner; + } + + public String getOrder() { + return order; + } + + public void setOrder(String order) { + this.order = order; + } + + public boolean isArchived() { + return archived; + } + + public void setArchived(boolean archived) { + this.archived = archived; + } + + public String getDueDate() { + return dueDate; + } + + public void setDueDate(String dueDate) { + this.dueDate = dueDate; + } + + public int getOverdue() { + return overdue; + } + + public void setOverdue(int overdue) { + this.overdue = overdue; + } + + public int getCommentsUnread() { + return commentsUnread; + } + + public void setCommentsUnread(int commentsUnread) { + this.commentsUnread = commentsUnread; + } +} diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Label.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Label.java new file mode 100644 index 000000000..4fee803f3 --- /dev/null +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Label.java @@ -0,0 +1,46 @@ +package it.niedermann.nextcloud.deck.model.board; + +import it.niedermann.nextcloud.deck.model.RemoteEntity; + +public class Label extends RemoteEntity { + private String title; + private String color; + private long boardId; + private long cardId; + + public Label() { + super(); + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getColor() { + return color; + } + + public void setColor(String color) { + this.color = color; + } + + public long getBoardId() { + return boardId; + } + + public void setBoardId(long boardId) { + this.boardId = boardId; + } + + public long getCardId() { + return cardId; + } + + public void setCardId(long cardId) { + this.cardId = cardId; + } +} diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Stack.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Stack.java new file mode 100644 index 000000000..40b934098 --- /dev/null +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Stack.java @@ -0,0 +1,59 @@ +package it.niedermann.nextcloud.deck.model.board; + +import java.io.Serializable; +import java.time.LocalDate; + +import it.niedermann.nextcloud.deck.model.DBStatus; +import it.niedermann.nextcloud.deck.model.RemoteEntity; + +public class Stack extends RemoteEntity { + private String title; + private long boardId; + private LocalDate deletedAt; + private int order; + private DBStatus status = DBStatus.UP_TO_DATE; + + public Stack() { + super(); + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public long getBoardId() { + return boardId; + } + + public void setBoardId(long boardId) { + this.boardId = boardId; + } + + public LocalDate getDeletedAt() { + return deletedAt; + } + + public void setDeletedAt(LocalDate deletedAt) { + this.deletedAt = deletedAt; + } + + public int getOrder() { + return order; + } + + public void setOrder(int order) { + this.order = order; + } + + public DBStatus getStatus() { + return status; + } + + public void setStatus(DBStatus status) { + this.status = status; + } +} diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Task.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Task.java deleted file mode 100644 index 0587a85ae..000000000 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Task.java +++ /dev/null @@ -1,30 +0,0 @@ -package it.niedermann.nextcloud.deck.model.board; - -import java.io.Serializable; -import java.time.LocalDate; - -public class Task implements Serializable { - - private String title; - private String description; - private int stackId; - private String type; - private LocalDate lastModified; - private LocalDate createdAt; - private String labels; - private String assignedUsers; - private String attachments; - private int attachmentCount; - private String owner; - private String primaryKey; - private String uid; - private String displayName; - private String order; - private boolean archived; - private String dueDate; - private long id; - private String overdue; - - - -} |