archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move query constants

Browse Source
pull/2546/head
Alex Baker 1 year ago
parent 68c21c4b1f
commit e70f5f3b24
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File

6
app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt
Unescape Escape View File

@ -621,7 +621,7 @@ class TaskListFragment : Fragment(), OnRefreshListener, Toolbar.OnMenuItemClickL
} }
} }
} }
REQUEST_LIST_SETTINGS -> if (resultCode == Activity.RESULT_OK) { REQUEST_LIST_SETTINGS -> if (resultCode == RESULT_OK) {
val action = data!!.action val action = data!!.action
if (ACTION_DELETED == action) { if (ACTION_DELETED == action) {
openFilter(BuiltInFilterExposer.getMyTasksFilter(resources)) openFilter(BuiltInFilterExposer.getMyTasksFilter(resources))
@ -629,7 +629,7 @@ class TaskListFragment : Fragment(), OnRefreshListener, Toolbar.OnMenuItemClickL
openFilter(data.getParcelableExtra(MainActivity.OPEN_FILTER)) openFilter(data.getParcelableExtra(MainActivity.OPEN_FILTER))
} }
} }
REQUEST_TAG_TASKS -> if (resultCode == Activity.RESULT_OK) { REQUEST_TAG_TASKS -> if (resultCode == RESULT_OK) {
lifecycleScope.launch { lifecycleScope.launch {
val modified = tagDataDao.applyTags( val modified = tagDataDao.applyTags(
taskDao taskDao
@ -985,8 +985,6 @@ class TaskListFragment : Fragment(), OnRefreshListener, Toolbar.OnMenuItemClickL
} }
companion object { companion object {
const val TAGS_METADATA_JOIN = "for_tags" // $NON-NLS-1$
const val CALDAV_METADATA_JOIN = "for_caldav" // $NON-NLS-1$
const val ACTION_RELOAD = "action_reload" const val ACTION_RELOAD = "action_reload"
const val ACTION_DELETED = "action_deleted" const val ACTION_DELETED = "action_deleted"
private const val EXTRA_SELECTED_TASK_IDS = "extra_selected_task_ids" private const val EXTRA_SELECTED_TASK_IDS = "extra_selected_task_ids"

12
app/src/main/java/org/tasks/data/TaskListQuery.kt
Unescape Escape View File

@ -3,7 +3,6 @@ package org.tasks.data
import com.todoroo.andlib.sql.Criterion import com.todoroo.andlib.sql.Criterion
import com.todoroo.andlib.sql.Field.Companion.field import com.todoroo.andlib.sql.Field.Companion.field
import com.todoroo.andlib.sql.Join import com.todoroo.andlib.sql.Join
import com.todoroo.astrid.activity.TaskListFragment
import com.todoroo.astrid.api.Filter import com.todoroo.astrid.api.Filter
import com.todoroo.astrid.data.Task import com.todoroo.astrid.data.Task
import org.tasks.data.TaskListQueryNonRecursive.getNonRecursiveQuery import org.tasks.data.TaskListQueryNonRecursive.getNonRecursiveQuery
@ -11,19 +10,20 @@ import org.tasks.data.TaskListQueryRecursive.getRecursiveQuery
import org.tasks.preferences.QueryPreferences import org.tasks.preferences.QueryPreferences
object TaskListQuery { object TaskListQuery {
private const val CALDAV_METADATA_JOIN = "for_caldav"
private val JOIN_CALDAV = Criterion.and( private val JOIN_CALDAV = Criterion.and(
Task.ID.eq(field("${TaskListFragment.CALDAV_METADATA_JOIN}.cd_task")), Task.ID.eq(field("$CALDAV_METADATA_JOIN.cd_task")),
field("${TaskListFragment.CALDAV_METADATA_JOIN}.cd_deleted").eq(0)) field("$CALDAV_METADATA_JOIN.cd_deleted").eq(0))
val JOINS = """ val JOINS = """
${Join.left(CaldavTask.TABLE.`as`(TaskListFragment.CALDAV_METADATA_JOIN), JOIN_CALDAV)} ${Join.left(CaldavTask.TABLE.`as`(CALDAV_METADATA_JOIN), JOIN_CALDAV)}
${Join.left(CaldavCalendar.TABLE, field("${TaskListFragment.CALDAV_METADATA_JOIN}.cd_calendar").eq(CaldavCalendar.UUID))} ${Join.left(CaldavCalendar.TABLE, field("$CALDAV_METADATA_JOIN.cd_calendar").eq(CaldavCalendar.UUID))}
${Join.left(CaldavAccount.TABLE, CaldavCalendar.ACCOUNT.eq(CaldavAccount.UUID))} ${Join.left(CaldavAccount.TABLE, CaldavCalendar.ACCOUNT.eq(CaldavAccount.UUID))}
${Join.left(Geofence.TABLE, Geofence.TASK.eq(Task.ID))} ${Join.left(Geofence.TABLE, Geofence.TASK.eq(Task.ID))}
${Join.left(Place.TABLE, Place.UID.eq(Geofence.PLACE))} ${Join.left(Place.TABLE, Place.UID.eq(Geofence.PLACE))}
""".trimIndent() """.trimIndent()
val FIELDS = listOf( val FIELDS = listOf(
field("tasks.*"), field("tasks.*"),
field("${TaskListFragment.CALDAV_METADATA_JOIN}.*"), field("$CALDAV_METADATA_JOIN.*"),
field("${CaldavAccount.ACCOUNT_TYPE}").`as`("accountType"), field("${CaldavAccount.ACCOUNT_TYPE}").`as`("accountType"),
field("geofences.*"), field("geofences.*"),
field("places.*")) field("places.*"))

9
app/src/main/java/org/tasks/data/TaskListQueryNonRecursive.kt
Unescape Escape View File

@ -3,7 +3,6 @@ package org.tasks.data
import com.todoroo.andlib.sql.Field.Companion.field import com.todoroo.andlib.sql.Field.Companion.field
import com.todoroo.andlib.sql.Join import com.todoroo.andlib.sql.Join
import com.todoroo.andlib.sql.Query import com.todoroo.andlib.sql.Query
import com.todoroo.astrid.activity.TaskListFragment
import com.todoroo.astrid.api.Filter import com.todoroo.astrid.api.Filter
import com.todoroo.astrid.api.PermaSql import com.todoroo.astrid.api.PermaSql
import com.todoroo.astrid.core.SortHelper import com.todoroo.astrid.core.SortHelper
@ -12,13 +11,15 @@ import org.tasks.filters.RecentlyModifiedFilter
import org.tasks.preferences.QueryPreferences import org.tasks.preferences.QueryPreferences
internal object TaskListQueryNonRecursive { internal object TaskListQueryNonRecursive {
private val JOIN_TAGS = Task.ID.eq(field("${TaskListFragment.TAGS_METADATA_JOIN}.task")) private const val TAGS_METADATA_JOIN = "for_tags"
private val JOIN_TAGS = Task.ID.eq(field("$TAGS_METADATA_JOIN.task"))
private val JOINS = """ private val JOINS = """
${Join.left(Tag.TABLE.`as`(TaskListFragment.TAGS_METADATA_JOIN), JOIN_TAGS)} ${Join.left(Tag.TABLE.`as`(TAGS_METADATA_JOIN), JOIN_TAGS)}
${TaskListQuery.JOINS} ${TaskListQuery.JOINS}
""".trimIndent() """.trimIndent()
private val TAGS = private val TAGS =
field("group_concat(distinct(${TaskListFragment.TAGS_METADATA_JOIN}.tag_uid))") field("group_concat(distinct($TAGS_METADATA_JOIN.tag_uid))")
.`as`("tags") .`as`("tags")
private val FIELDS = private val FIELDS =
TaskListQuery.FIELDS.plus(listOf( TaskListQuery.FIELDS.plus(listOf(

Write Preview
Loading…
Cancel
Save