Add "now" option for due date filter

pull/1545/head
Trevor Terris 3 years ago
parent 6d8d808080
commit bfacf1ca52

@ -61,7 +61,7 @@ class NewFilterDialog : DialogFragment() {
val list = ArrayList<CriterionInstance>()
when (title) {
R.string.filter_overdue ->
list.add(newMultiSelect(provider.dueDateFilter, 1, TYPE_INTERSECT))
list.add(newMultiSelect(provider.dueDateFilter, 7, TYPE_INTERSECT))
R.string.filter_today_only -> {
list.add(newMultiSelect(provider.dueDateFilter, 1, TYPE_SUBTRACT))
list.add(newMultiSelect(provider.dueDateFilter, 2, TYPE_INTERSECT))

@ -179,7 +179,8 @@ class FilterCriteriaProvider @Inject constructor(
PermaSql.VALUE_EOD_TOMORROW,
PermaSql.VALUE_EOD_DAY_AFTER,
PermaSql.VALUE_EOD_NEXT_WEEK,
PermaSql.VALUE_EOD_NEXT_MONTH)
PermaSql.VALUE_EOD_NEXT_MONTH,
PermaSql.VALUE_NOW)
val values: MutableMap<String?, Any> = HashMap()
values[Task.DUE_DATE.name] = "?"
return MultipleSelectCriterion(
@ -208,7 +209,8 @@ class FilterCriteriaProvider @Inject constructor(
PermaSql.VALUE_EOD_TOMORROW,
PermaSql.VALUE_EOD_DAY_AFTER,
PermaSql.VALUE_EOD_NEXT_WEEK,
PermaSql.VALUE_EOD_NEXT_MONTH)
PermaSql.VALUE_EOD_NEXT_MONTH,
PermaSql.VALUE_NOW)
val values: MutableMap<String?, Any> = HashMap()
values[Task.HIDE_UNTIL.name] = "?"
return MultipleSelectCriterion(

@ -106,6 +106,7 @@
<item>@string/day_after_tomorrow</item>
<item>@string/next_week</item>
<item>@string/next_month</item>
<item>@string/now</item>
</string-array>
<string-array name="CFC_startBefore_entries">
@ -116,6 +117,7 @@
<item>@string/day_after_tomorrow</item>
<item>@string/next_week</item>
<item>@string/next_month</item>
<item>@string/now</item>
</string-array>
<string-array name="TEA_reminder_random">

@ -287,6 +287,7 @@ File %1$s contained %2$s.\n\n
<item quantity="one">1 task</item>
<item quantity="other">%d tasks</item>
</plurals>
<string name="now">Now</string>
<string name="today">Today</string>
<string name="today_lowercase">today</string>
<string name="tomorrow">Tomorrow</string>

Loading…
Cancel
Save