stud203990/Treker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hide failed habits along with completed ones

Browse Source
This commit is contained in:
Quentin Hibon 2021-08-04 17:41:14 +02:00 committed by Alinson S. Xavier
parent b9eb244b0b
commit 7fe3ce970c
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Habit.kt
View File

@ -68,6 +68,19 @@ data class Habit(
} }
} }
fun isFailedToday(): Boolean {
val today = DateUtils.getTodayWithOffset()
val value = computedEntries.get(today).value
return if (isNumerical) {
when (targetType) {
NumericalHabitType.AT_LEAST -> value / 1000.0 < targetValue
NumericalHabitType.AT_MOST -> value / 1000.0 > targetValue
}
} else {
value == Entry.NO
}
}
fun recompute() { fun recompute() {
computedEntries.recomputeFrom( computedEntries.recomputeFrom(
originalEntries = originalEntries, originalEntries = originalEntries,

2
uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/HabitMatcher.kt
View File

@ -26,7 +26,7 @@ data class HabitMatcher(
fun matches(habit: Habit): Boolean { fun matches(habit: Habit): Boolean {
if (!isArchivedAllowed && habit.isArchived) return false if (!isArchivedAllowed && habit.isArchived) return false
if (isReminderRequired && !habit.hasReminder()) return false if (isReminderRequired && !habit.hasReminder()) return false
if (!isCompletedAllowed && habit.isCompletedToday()) return false if (!isCompletedAllowed && (habit.isCompletedToday() || habit.isFailedToday())) return false
return true return true
} }