Exclude past snooze times from Snooze Filter

This should exclude tasks that were completed before their snooze time
lapsed
renovate/retrofit
Alex Baker 2 months ago
parent 9a4fcbbd39
commit 26ab3d5866

@ -119,6 +119,7 @@ class Alarm : Parcelable {
@JvmField val TABLE = Table(TABLE_NAME) @JvmField val TABLE = Table(TABLE_NAME)
@JvmField val TASK = TABLE.column("task") @JvmField val TASK = TABLE.column("task")
@JvmField val TYPE = TABLE.column("type") @JvmField val TYPE = TABLE.column("type")
@JvmField val TIME = TABLE.column("time")
const val TYPE_DATE_TIME = 0 const val TYPE_DATE_TIME = 0
const val TYPE_REL_START = 1 const val TYPE_REL_START = 1

@ -1,6 +1,7 @@
package org.tasks.filters package org.tasks.filters
import com.todoroo.andlib.sql.Criterion.Companion.and import com.todoroo.andlib.sql.Criterion.Companion.and
import com.todoroo.andlib.sql.Functions.now
import com.todoroo.andlib.sql.Join.Companion.inner import com.todoroo.andlib.sql.Join.Companion.inner
import com.todoroo.andlib.sql.QueryTemplate import com.todoroo.andlib.sql.QueryTemplate
import com.todoroo.astrid.api.Filter import com.todoroo.astrid.api.Filter
@ -24,7 +25,8 @@ data class SnoozedFilter(
.where( .where(
and( and(
activeAndVisible(), activeAndVisible(),
Alarm.TYPE.eq(Alarm.TYPE_SNOOZE) Alarm.TYPE.eq(Alarm.TYPE_SNOOZE),
Alarm.TIME.gt(now()),
) )
) )
.toString() .toString()

Loading…
Cancel
Save