Skip to content

Hiding measurable habit if it's completed for the frequency period #2107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Hiding measurable habit if it's completed for the frequency period #2107

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3abfbc9
Hiding measurabele habit if it's completed for the frequency period
kalina559 Feb 11, 2025
f0ab876
Corrected formatting
kalina559 Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Habit.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,25 @@ data class Habit(

fun isCompletedToday(): 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_LEAST -> today.getScoreForPeriod() / 1000.0 >= targetValue
NumericalHabitType.AT_MOST -> false
}
} else {
val value = computedEntries.get(today).value
value != Entry.NO && value != Entry.UNKNOWN
}
}

private fun Timestamp.getScoreForPeriod(): Int {
val periodFirstDay = this.minus(frequency.denominator - 1)

return computedEntries.getByInterval(periodFirstDay, this)
.filter { entry -> entry.value != Entry.UNKNOWN }
.sumOf { entry -> entry.value }
}

fun isEnteredToday(): Boolean {
val today = DateUtils.getTodayWithOffset()
val value = computedEntries.get(today).value
Expand Down