week selection; show one week at a time

1 files changed, 28 insertions, 20 deletions

diff --git a/repgoal.hs b/repgoal.hs
index 9265c05..dfd7f6e 100755
--- a/repgoal.hs
+++ b/repgoal.hs
@@ -115,11 +115,25 @@ showRational n = printf format $ (realToFrac :: Rational -> Float) $ n
   where
     format = if floor (n * 10) `mod` 10 == (0 :: Integer) then "%.0f" else "%.2f"
 
+data WeekSelection = Week1 | Week2 | Week3 deriving (Enum, Bounded, Show, Eq)
+
+-- TODO: State contains chosen repmax formula
+-- TODO: State contains performances
+data St = St {
+  _lifts :: [LiftRecord],
+  _week :: WeekSelection
+}
+makeLenses ''St
+
+-- TODO: Event for inotify on edited text file (as input interface)
+data CustomEvent = CustomEvent
+
 drawUI :: St -> [Widget ()]
-drawUI (St lifts _) = [vCenter $ vBox [hCenter oneRepMaxTable, withVScrollBarHandles $ withVScrollBars OnRight $ viewport () Vertical $ hCenter lastSetTable]]
+drawUI st = [vCenter $ vBox [hCenter oneRepMaxTable, withVScrollBarHandles $ withVScrollBars OnRight $ viewport () Vertical $ hCenter lastSetTable]]
   where
-    lastSetTable = renderTable $ table $ map (padLeftRight 1 . str) ["Lift", "Week", "Last Set", "Goal", "Goal+1"] : concatMap toWeekRows lifts
-    oneRepMaxTable = renderTable $ table $ map (padLeftRight 1 . str) ["Lift", "Achieved Best", "Computed 1RM"] : map toRow lifts
+    -- lastSetTable = renderTable $ table $ map (padLeftRight 1 . str) ["Lift", "Week", "Last Set", "Goal", "Goal+1"] : concatMap toWeekRows (view lifts st)
+    lastSetTable = renderTable $ table $ map (padLeftRight 1 . str) ["Lift", "Week", "Last Set", "Goal", "Goal+1"] : map (toWeekRow (view week st)) (view lifts st)
+    oneRepMaxTable = renderTable $ table $ map (padLeftRight 1 . str) ["Lift", "Achieved Best", "Computed 1RM"] : map toRow (view lifts st)
     toRow LiftRecord{..} =
       let best@Achieved{..} = bestPerformance stats
       in
@@ -129,12 +143,12 @@ drawUI (St lifts _) = [vCenter $ vBox [hCenter oneRepMaxTable, withVScrollBarHan
         str $ printf "%d @ %d" achievedReps achievedWeight,
         str $ showRational $ computeOneRepMax best
       ]
-    toWeekRows lift = (flip map) [1,2,3::Int] $ \week -> toWeekRow week lift
-    toWeekRow :: Int -> LiftRecord -> [Widget n]
+    -- toWeekRows lift = (flip map) [1,2,3::Int] $ \week -> toWeekRow week lift
+    toWeekRow :: WeekSelection -> LiftRecord -> [Widget n]
     toWeekRow week LiftRecord{..} =
       let best              = bestPerformance stats
-          targetReps        = case week of 1 -> 5; 2 -> 3; 3 -> 1; _ -> undefined :: Int
-          targetPercentage  = case week of 1 -> 85; 2 -> 90; 3 -> 95; _ -> undefined
+          targetReps        = case week of Week1 -> 5; Week2 -> 3; Week3 -> 1 :: Int
+          targetPercentage  = case week of Week1 -> 85; Week2 -> 90; Week3 -> 95
           computedTarget    = (* (targetPercentage % 100)) $ (* (90 % 100)) $ computeOneRepMax best
           targetWeight      = ceilingN 5 computedTarget
           repGoal           = computeRepGoal targetWeight stats
@@ -143,8 +157,9 @@ drawUI (St lifts _) = [vCenter $ vBox [hCenter oneRepMaxTable, withVScrollBarHan
       in
       map (padLeftRight 2)
       [
-        txt $ (if week == 1 then liftName else " "),
-        str $ show week,
+        -- txt $ (if week == 1 then liftName else " "),
+        txt $ liftName,
+        txt $ case week of Week1 -> "1"; Week2 -> "2"; Week3 -> "3",
         str $ printf "%2d+ @ %d" targetReps targetWeight,
         str $ showGoal repGoal,
         str $ showGoal (repGoal + 1)
@@ -153,23 +168,16 @@ drawUI (St lifts _) = [vCenter $ vBox [hCenter oneRepMaxTable, withVScrollBarHan
 ceilingN :: Integer -> Rational -> Integer
 ceilingN n x = ceiling (x / toRational n) * n
 
--- TODO: State contains chosen repmax formula
--- TODO: State contains performances
-data St = St {
-  lifts :: [LiftRecord],
-  week :: WeekSelection
-}
-
-data WeekSelection = Week1 | Week2 | Week3 deriving Enum
-
--- TODO: Event for inotify on edited text file (as input interface)
-data CustomEvent = CustomEvent
+succ' :: (Enum a, Bounded a, Eq a) => a -> a
+succ' x | x == maxBound = minBound
+succ' x = succ x
 
 handleEvent :: St -> BrickEvent () CustomEvent -> EventM () (Next St)
 handleEvent st e = case e of
   VtyEvent (V.EvKey V.KEsc [])         -> halt st
   VtyEvent (V.EvKey V.KDown _)         -> M.vScrollBy (M.viewportScroll ()) 5    >> continue st
   VtyEvent (V.EvKey V.KUp _)           -> M.vScrollBy (M.viewportScroll ()) (-5) >> continue st
+  VtyEvent (V.EvKey (V.KChar 'w') _)   -> continue $ st & week %~ succ'
   VtyEvent _                           -> continue st
   AppEvent _                           -> continue st
   _ -> continue st