diff options
| author | desperateCoder <echotodevnull@gmail.com> | 2019-02-08 16:08:38 +0300 |
|---|---|---|
| committer | desperateCoder <echotodevnull@gmail.com> | 2019-02-08 16:08:38 +0300 |
| commit | 6a1c7a0a166dd10f7bceb46f1e14ba98291be7ae (patch) | |
| tree | e1973752632f4d8defe2d01023968d0576ead2f6 /app/src/main/java/it | |
| parent | 1301d62df62a7f100ab355f7991eecfe8559ee39 (diff) | |
stacks and cards order
Diffstat (limited to 'app/src/main/java/it')
3 files changed, 3 insertions, 14 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/Board.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Board.java index b426cf628..e8ff50f72 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/Board.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Board.java @@ -18,20 +18,9 @@ public class Board extends AbstractRemoteEntity { private String title; long ownerId; - // @ToOne(joinProperty = "ownerId") -// private User owner; private String color; private boolean archived; - // @ToMany -// @JoinEntity(entity = JoinBoardWithLabel.class, sourceProperty = "boardId", targetProperty = "labelId") -// private List<Label> labels = new ArrayList<>(); private String acl; - // @ToMany -// @JoinEntity(entity = JoinBoardWithPermission.class, sourceProperty = "boardId", targetProperty = "permissionId") -// private List<Permission> permissions = new ArrayList<>(); -// @ToMany -// @JoinEntity(entity = JoinBoardWithUser.class, sourceProperty = "boardId", targetProperty = "userId") -// private List<User> users = new ArrayList<>(); private int shared; private Date deletedAt; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/BoardDao.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/BoardDao.java index 8e2f519ef..f745cf84d 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/BoardDao.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/BoardDao.java @@ -13,7 +13,7 @@ import it.niedermann.nextcloud.deck.model.full.FullBoard; @Dao public interface BoardDao extends GenericDao<Board> { - @Query("SELECT * FROM board WHERE accountId = :accountId") + @Query("SELECT * FROM board WHERE accountId = :accountId order by title asc") LiveData<List<Board>> getBoardsForAccount(final long accountId); @Query("SELECT * FROM board WHERE accountId = :accountId and id = :remoteId") diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/CardDao.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/CardDao.java index 857810209..aa6d43190 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/CardDao.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/CardDao.java @@ -13,7 +13,7 @@ import it.niedermann.nextcloud.deck.model.full.FullCard; @Dao public interface CardDao extends GenericDao<Card> { - @Query("SELECT * FROM card WHERE stackId = :localStackId") + @Query("SELECT * FROM card WHERE stackId = :localStackId order by `order`, createdAt asc") LiveData<List<Card>> getCardsForStack(final long localStackId); @Query("SELECT * FROM card WHERE accountId = :accountId and id = :remoteId") @@ -25,7 +25,7 @@ public interface CardDao extends GenericDao<Card> { FullCard getFullCardByRemoteIdDirectly(final long accountId, final long remoteId); @Transaction - @Query("SELECT * FROM card WHERE accountId = :accountId AND stackId = :localStackId order by `order`, createdAt") + @Query("SELECT * FROM card WHERE accountId = :accountId AND stackId = :localStackId order by `order`, createdAt asc") LiveData<List<FullCard>> getFullCardsForStack(final long accountId, final long localStackId); @Transaction |