From c32a9520c5fcbbb6aeca8d95258fb39892c36fb5 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Sun, 16 Jan 2022 16:24:54 -0600 Subject: [PATCH] Fix completed group for non-recursive queries --- .../java/org/tasks/data/TaskListQueryNonRecursive.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/tasks/data/TaskListQueryNonRecursive.kt b/app/src/main/java/org/tasks/data/TaskListQueryNonRecursive.kt index 27d02376d..4a3fd48a3 100644 --- a/app/src/main/java/org/tasks/data/TaskListQueryNonRecursive.kt +++ b/app/src/main/java/org/tasks/data/TaskListQueryNonRecursive.kt @@ -20,9 +20,12 @@ internal object TaskListQueryNonRecursive { private val TAGS = field("group_concat(distinct(${TaskListFragment.TAGS_METADATA_JOIN}.tag_uid))") .`as`("tags") - private val IS_COMPLETE = field("tasks.completed > 0").`as`("is_complete") - private const val ORDER_BY = "ORDER BY is_complete ASC, tasks.completed DESC" - private val FIELDS = TaskListQuery.FIELDS.plus(TAGS).plus(IS_COMPLETE).toTypedArray() + private const val ORDER_BY = "ORDER BY parentComplete ASC, tasks.completed DESC" + private val FIELDS = + TaskListQuery.FIELDS.plus(listOf( + TAGS, + field("tasks.completed > 0").`as`("parentComplete") + )).toTypedArray() fun getNonRecursiveQuery(filter: Filter, preferences: QueryPreferences): MutableList { val joinedQuery = JOINS + filter.getSqlQuery()