olinpin/WordAX
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Quick fix (last version wasn't stable)

Browse Source
This commit is contained in:
oliverhnat
2024-02-25 17:41:53 +01:00
parent 0ffb96cf9c
commit bfe46bb6ba
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
WordAX/WordAXModelView.swift
View File

@@ -27,12 +27,12 @@ class WordAXModelView: ObservableObject {
return nil return nil
} }
// if today is the date they're supposed to be shown // if today is the date they're supposed to be shown
let displayToday = words.filter({ $0.lastSeenOn != nil && $0.lastSeenOn!.addSpacedRepetitionMilestone(milestone: $0.nextSpacedRepetitionMilestone!).isBeforeTodayOrToday()})
let displayToday = words.filter({ $0.lastSeenOn != nil && $0.lastSeenOn!.addSpacedRepetitionMilestone(milestone: $0.nextSpacedRepetitionMilestone).isBeforeTodayOrToday()})
if displayToday.count > 0 { if displayToday.count > 0 {
return displayToday.first! return displayToday.first!
} }
// first word ever shown
// let shownWords = words.filter({ $0.shown }) // let shownWords = words.filter({ $0.shown })
// if shownWords.count == 0 { // if shownWords.count == 0 {
return notShownWords.sorted(by: {$0.id < $1.id}).first return notShownWords.sorted(by: {$0.id < $1.id}).first
@@ -86,8 +86,11 @@ extension Date {
self.addingTimeInterval(TimeInterval(frequency.rawValue * 24 * 60 * 60)) self.addingTimeInterval(TimeInterval(frequency.rawValue * 24 * 60 * 60))
} }
func addSpacedRepetitionMilestone(milestone: WordAX.SpacedRepetitionMilestoneEnum) -> Date { func addSpacedRepetitionMilestone(milestone: WordAX.SpacedRepetitionMilestoneEnum?) -> Date {
self.addingTimeInterval(TimeInterval(milestone.rawValue * 24 * 60 * 60)) if milestone == nil {
return self
}
return self.addingTimeInterval(TimeInterval(milestone!.rawValue * 24 * 60 * 60))
} }
func isAfterToday() -> Bool { func isAfterToday() -> Bool {