diff --git a/src/db/repository/tasks.ts b/src/db/repository/tasks.ts index 0d5d376..a05382b 100644 --- a/src/db/repository/tasks.ts +++ b/src/db/repository/tasks.ts @@ -105,7 +105,7 @@ export async function getSubtasks(parentId: string) { .select() .from(tasks) .where(eq(tasks.parentId, parentId)) - .orderBy(asc(tasks.position)); + .orderBy(asc(tasks.completed), asc(tasks.position)); } export async function getTaskById(id: string) { diff --git a/src/services/widgetSync.ts b/src/services/widgetSync.ts index c78805a..0ca2e01 100644 --- a/src/services/widgetSync.ts +++ b/src/services/widgetSync.ts @@ -117,7 +117,7 @@ export async function syncWidgetData(): Promise { .select({ id: tasks.id, title: tasks.title, completed: tasks.completed }) .from(tasks) .where(eq(tasks.parentId, task.id)) - .orderBy(asc(tasks.position)); + .orderBy(asc(tasks.completed), asc(tasks.position)); task.subtasks = subs; } }