Exclude hidden and completed from snoozed filter

pull/2584/head
Alex Baker 2 years ago
parent 2545832d67
commit 7fd5647cb8

@ -42,7 +42,7 @@ abstract class TaskDao(private val database: Database) {
@Query("SELECT COUNT(1) FROM tasks WHERE timerStart > 0 AND deleted = 0") @Query("SELECT COUNT(1) FROM tasks WHERE timerStart > 0 AND deleted = 0")
abstract suspend fun activeTimers(): Int abstract suspend fun activeTimers(): Int
@Query("SELECT COUNT(1) FROM tasks INNER JOIN alarms ON tasks._id = alarms.task WHERE type = $TYPE_SNOOZE") @Query("SELECT COUNT(1) FROM tasks INNER JOIN alarms ON tasks._id = alarms.task WHERE deleted = 0 AND completed = 0 AND type = $TYPE_SNOOZE")
abstract suspend fun snoozedReminders(): Int abstract suspend fun snoozedReminders(): Int
@Query("SELECT COUNT(1) FROM tasks INNER JOIN notification ON tasks._id = notification.task") @Query("SELECT COUNT(1) FROM tasks INNER JOIN notification ON tasks._id = notification.task")

@ -10,6 +10,7 @@ import com.todoroo.astrid.data.Task
import kotlinx.parcelize.Parcelize import kotlinx.parcelize.Parcelize
import org.tasks.R import org.tasks.R
import org.tasks.data.Alarm import org.tasks.data.Alarm
import org.tasks.data.TaskDao.TaskCriteria.activeAndVisible
@Parcelize @Parcelize
data class SnoozedFilter( data class SnoozedFilter(
@ -24,7 +25,7 @@ data class SnoozedFilter(
.join(inner(Alarm.TABLE, Task.ID.eq(Alarm.TASK))) .join(inner(Alarm.TABLE, Task.ID.eq(Alarm.TASK)))
.where( .where(
and( and(
Task.DELETION_DATE.lte(0), activeAndVisible(),
Alarm.TYPE.eq(Alarm.TYPE_SNOOZE) Alarm.TYPE.eq(Alarm.TYPE_SNOOZE)
) )
) )

Loading…
Cancel
Save