Add intervalEntries to habit game UI

This commit is contained in:
2022-02-28 15:03:15 -07:00
parent e58118c8c0
commit e9c6b4d34a
3 changed files with 7 additions and 2 deletions

View File

@@ -92,7 +92,7 @@
(otherwise (break)))))) (otherwise (break))))))
(method :Int totalPoints [] (method :Int totalPoints []
(apply + (for l (flatten (for e (the Array<Entry> (concat dailyEntries bonusEntries todoEntries)) e.labels)) l.points))) (apply + (for l (flatten (for e (the Array<Entry> (concat dailyEntries intervalEntries bonusEntries todoEntries)) e.labels)) l.points)))
(function :String stringify [:Entry e] (function :String stringify [:Entry e]
"$(ifLet [(Daily days lastDayDone) e.type] "$(ifLet [(Daily days lastDayDone) e.type]

View File

@@ -15,6 +15,7 @@ import kiss.List;
import kiss_tools.FlxKeyShortcutHandler; import kiss_tools.FlxKeyShortcutHandler;
import HabitModel; import HabitModel;
import hx.strings.Strings; import hx.strings.Strings;
import datetime.DateTime;
@:build(kiss.Kiss.build()) @:build(kiss.Kiss.build())
class HabitState extends FlxState {} class HabitState extends FlxState {}

View File

@@ -69,13 +69,15 @@
(set textY 0) (set textY 0)
(set color FlxColor.ORANGE) (set color FlxColor.ORANGE)
(map (m.activeDailyEntries) makeText) (map (m.activeDailyEntries) makeText)
(set color FlxColor.BLUE)
(map (m.activeIntervalEntries) makeText)
(set color FlxColor.WHITE) (set color FlxColor.WHITE)
(map (m.activeBonusEntries) makeText) (map (m.activeBonusEntries) makeText)
(set color FlxColor.YELLOW) (set color FlxColor.YELLOW)
(map (m.activeTodoEntries) makeText) (map (m.activeTodoEntries) makeText)
(add entryTexts) (add entryTexts)
(doFor e (the Array<Entry> (concat m.dailyEntries m.bonusEntries m.todoEntries)) (doFor e (the Array<Entry> (concat m.dailyEntries m.intervalEntries m.bonusEntries m.todoEntries))
(when (HabitModel.isActive e) (when (HabitModel.isActive e)
(let [label (HabitModel.activeLabel e)] (let [label (HabitModel.activeLabel e)]
(shortcutHandler.registerItem label.label e)))) (shortcutHandler.registerItem label.label e))))
@@ -86,6 +88,8 @@
(+= label.points 1) (+= label.points 1)
(whenLet [(Daily days lastDayDone) e.type] (whenLet [(Daily days lastDayDone) e.type]
(set e.type (Daily days (HabitModel.todayString)))) (set e.type (Daily days (HabitModel.todayString))))
(whenLet [(Interval days lastDayDone) e.type]
(set e.type (Interval days (.toString (DateTime.now)))))
(m.save) (m.save)
(setModel m) (setModel m)
(shortcutHandler.start))) (shortcutHandler.start)))