diff --git a/src/taskflower/auth/permission/lookups.py b/src/taskflower/auth/permission/lookups.py index b663ebe..1540b90 100644 --- a/src/taskflower/auth/permission/lookups.py +++ b/src/taskflower/auth/permission/lookups.py @@ -35,6 +35,10 @@ def get_tasks_for_user(user: User) -> list[Task]: NamespaceRole.id == UserToNamespaceRole.role ).filter( UserToNamespaceRole.user == user.id + ).order_by( + Task.complete.asc() + ).order_by( + Task.due.asc() ).all() def namespaces_where_user_can( diff --git a/src/taskflower/web/namespace/__init__.py b/src/taskflower/web/namespace/__init__.py index 7d454ef..63f310b 100644 --- a/src/taskflower/web/namespace/__init__.py +++ b/src/taskflower/web/namespace/__init__.py @@ -74,6 +74,10 @@ def get(id: int): Task ).filter( Task.namespace == ns.id + ).order_by( + Task.complete.asc() + ).order_by( + Task.due.asc() ).all() return gather_successes(