yetangitu/timelimit-android
1
0
Fork 0
mirror of https://codeberg.org/timelimit/timelimit-android.git synced 2025-10-03 09:49:25 +02:00
Code Issues Projects Releases Wiki Activity

Ignore blocked rules in the category list

Browse source
This commit is contained in:
Jonas Lochmann 2020-11-23 01:00:00 +01:00
parent f298390e6d
commit 4ddd79bc94
No known key found for this signature in database
GPG key ID: 8B8C9AEE10FA5B36
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/io/timelimit/android/ui/manage/child/category/ManageChildCategoriesModel.kt
View file

@ -93,7 +93,7 @@ class ManageChildCategoriesModel(application: Application): AndroidViewModel(app
remainingTimeToday = RemainingTime.getRemainingTime( remainingTimeToday = RemainingTime.getRemainingTime(
dayOfWeek = childDate.dayOfWeek, dayOfWeek = childDate.dayOfWeek,
usedTimes = usedTimeItemsForCategory, usedTimes = usedTimeItemsForCategory,
rules = rules, rules = rules.filter { it.maximumTimeInMillis > 0 } /* ignore "blocked" rules for this calculation */,
extraTime = category.category.getExtraTime(dayOfEpoch = childDate.dayOfEpoch), extraTime = category.category.getExtraTime(dayOfEpoch = childDate.dayOfEpoch),
minuteOfDay = childMinuteOfWeek % MinuteOfDay.LENGTH, minuteOfDay = childMinuteOfWeek % MinuteOfDay.LENGTH,
firstDayOfWeekAsEpochDay = firstDayOfWeek firstDayOfWeekAsEpochDay = firstDayOfWeek