accessories output achieved

needs cleanup, but committing because it works

1 files changed, 29 insertions, 7 deletions

diff --git a/repgoal.hs b/repgoal.hs
index 2f76432..28f4096 100755
--- a/repgoal.hs
+++ b/repgoal.hs
@@ -173,11 +173,33 @@ annotatePosition (x:xs) = (FirstInList, x) : map (NotFirstInList,) xs
 lookup' :: Int -> NESeq a -> a
 lookup' i seq = fromJust $ NESeq.lookup (i `mod` NESeq.length seq) seq
 
-wendlerLiftRows :: WeekSelection -> (Lift, Maybe LiftRecord) -> [[Widget n]]
-wendlerLiftRows week lift = filter (not . null) $ (flip map) (annotatePosition $ liftScheme Fresher week) $ wendlerLiftRow lift
-wendlerLiftRow :: (Lift, Maybe LiftRecord) -> (ListPosition, SetScheme) -> [Widget n]
-wendlerLiftRow (_, Nothing) _ = []
-wendlerLiftRow (_, Just LiftRecord{..}) (position, (SetScheme targetRatio targetReps amrap)) =
+liftRows :: WeekSelection -> (Lift, Maybe LiftRecord) -> [[Widget n]]
+-- liftRows week lift = filter (not . null) $ (flip map) (annotatePosition $ liftScheme Fresher week) $ liftRow lift
+liftRows week (Lift _name Wendler, Just liftRecord) = (flip map) (annotatePosition $ liftScheme Fresher week) $ wendlerLiftRow liftRecord
+liftRows _ (Lift name (Accessory sets reps), _) = (flip map) (annotatePosition $ take sets $ repeat reps) $ accessoryLiftRow name reps
+liftRows _ (Lift name Unspecified, _) = [unspecifiedLiftRow name]
+
+-- liftRow :: (Lift, Maybe LiftRecord) -> (ListPosition, SetScheme) -> [Widget n]
+-- liftRow (_, Nothing) _ = []
+-- liftRow (Lift _name Wendler, Just x) y = wendlerLiftRow x y
+accessoryLiftRow name targetReps (position, _) = map (padLeftRight 2) [
+    txt $ case position of FirstInList -> name; NotFirstInList -> " ",
+    str $ printf "%2d @ %5s" targetReps (" " :: String),
+    txt " ",
+    txt " ",
+    txt " ",
+    txt " "
+  ]
+unspecifiedLiftRow name = map (padLeftRight 2) [
+    txt name,
+    txt " ",
+    txt " ",
+    txt " ",
+    txt " ",
+    txt " "
+  ]
+
+wendlerLiftRow LiftRecord{..} (position, (SetScheme targetRatio targetReps amrap)) =
   let best              = bestPerformance stats
       computedTarget    = targetRatio * (90 % 100) * computeOneRepMax best
       targetWeight      = ceilingN 5 computedTarget
@@ -209,7 +231,7 @@ drawUI st = [vCenter $ vBox [hCenter $ hBox [header, oneRepMaxTable], withVScrol
     liftNames = session & sessionLifts & fmap liftName & toList
     liftRecords :: [LiftRecord]
     liftRecords = filter ((`elem` liftNames) . liftRecordName) (view lifts st)
-    lastSetTable = renderTable $ table $ map (padLeftRight 1 . txt) ["Lift", "Set", "Plates", "Goal", "Done", "Rest"] : concatMap (wendlerLiftRows (view week st)) lifts'
+    lastSetTable = renderTable $ table $ map (padLeftRight 1 . txt) ["Lift", "Set", "Plates", "Goal", "Done", "Rest"] : concatMap (liftRows (view week st)) lifts'
     header = renderTable $ table $ map (padLeftRight 1 . txt)
       ["Date", "Time", "Bodyweight", "Week", "Session"]
       : [ map (padLeftRight 2 . txt) ["        ", "     ", "     ", weekNumber, sessionName session] ]
@@ -297,7 +319,7 @@ program =
   Session "Deadlift" (Lift "Deadlift" Wendler :<|| Seq.fromList [
                          Lift "Press" Wendler,
                          Lift "Row" $ Accessory 5 10,
-                         Lift "Dip" $ Accessory 5 2,
+                         Lift "Dip" $ Unspecified,
                          Lift "Good Morning" $ Accessory 3 10])
   :<||
   Seq.fromList [