1 files changed, 24 insertions, 4 deletions

diff --git a/repgoal.hs b/repgoal.hs
index 0ceaf46..dc5227e 100755
--- a/repgoal.hs
+++ b/repgoal.hs
@@ -106,6 +106,11 @@ bestPerformance = head . sortBy (flip $ comparing computeOneRepMax)
 computeOneRepMax :: Performance -> Rational
 computeOneRepMax Achieved{..} = toRational achievedWeight * (realToFrac achievedReps * 0.0333 + 1)
 
+showRational' :: Rational -> String
+showRational' n = printf format $ (realToFrac :: Rational -> Float) $ n
+  where
+    format = if floor (n * 10) `mod` 10 == (0 :: Integer) then "%.0f" else "%.1f"
+
 showRational :: Rational -> String
 showRational n = printf format $ (realToFrac :: Rational -> Float) $ n
   where
@@ -157,12 +162,16 @@ lookup' :: Int -> NESeq a -> a
 lookup' i seq = fromJust $ NESeq.lookup (i `mod` NESeq.length seq) seq
 
 drawUI :: St -> [Widget ()]
-drawUI st = [vCenter $ vBox [hCenter oneRepMaxTable, header, withVScrollBarHandles $ withVScrollBars OnRight $ viewport () Vertical $ hCenter lastSetTable]]
+drawUI st = [vCenter $ vBox [hCenter $ hBox [header, oneRepMaxTable], withVScrollBarHandles $ withVScrollBars OnRight $ viewport () Vertical $ hCenter lastSetTable]]
   where
     lifts' = filter ((flip Set.member $ view sessions st & lookup' (view selectedSession st)) . liftName) (view lifts st)
-    lastSetTable = renderTable $ table $ map (padLeftRight 1 . str) ["Lift", "Set", "Goal", "Done", "Rest"] : concatMap (toLiftRows (view week st)) lifts'
-    header = str $ "Week " ++ case (view week st) of Week1 -> "1"; Week2 -> "2"; Week3 -> "3"
-    oneRepMaxTable = renderTable $ table $ map (padLeftRight 1 . str) ["Lift", "Achieved Best", "Computed 1RM"] : map toRow lifts'
+    lastSetTable = renderTable $ table $ map (padLeftRight 1 . txt) ["Lift", "Set", "Plates", "Goal", "Done", "Rest"] : concatMap (toLiftRows (view week st)) lifts'
+    header = renderTable $ table $ map (padLeftRight 1 . txt)
+      ["Date", "Time", "Bodyweight", "Week", "Session"]
+      : [ map (padLeftRight 2 . txt) ["        ", "     ", "     ", weekNumber, sessionName] ]
+    weekNumber = case (view week st) of Week1 -> "1"; Week2 -> "2"; Week3 -> "3"
+    sessionName = liftName $ head lifts'
+    oneRepMaxTable = renderTable $ table $ map (padLeftRight 1 . txt) ["Lift", "Achieved Best", "Computed 1RM"] : map toRow lifts'
     toRow LiftRecord{..} =
       let best@Achieved{..} = bestPerformance stats
       in
@@ -188,11 +197,22 @@ drawUI st = [vCenter $ vBox [hCenter oneRepMaxTable, header, withVScrollBarHandl
         -- txt $ if position == FirstInList then liftName else " ",
         txt $ case position of FirstInList -> liftName; NotFirstInList -> if amrap then " \n " else " ",
         str $ printf "%2d%s @ %d%s" targetReps (if amrap then "+" else "" :: Text) targetWeight (if amrap then "\n " else "" :: String),
+        str $ showPlates targetWeight ++ if amrap then "\n " else "",
         str $ if amrap then showGoal repGoal ++ "\n" ++ showGoal (repGoal + 1) else " ",
         txt $ if amrap then " \n " else " ",
         txt $ if amrap then " \n " else " "
       ]
 
+showPlates (fromIntegral -> wt) = fromMaybe "unavailable" $ fmap (ourShow . reverse) $ showPlates' (wt - 45) ourPlates []
+  where
+    ourPlates = [45,45,25,25,10,10,10,5,5,2.5]
+    ourShow :: [Rational] -> String
+    ourShow = concat . intersperse " " . map showRational'
+    showPlates' 0 _ used = Just used
+    showPlates' need (have:avail) used | have * 2 > need = showPlates' need avail used
+    showPlates' need (have:avail) used = showPlates' (need - have * 2) avail (have:used)
+    showPlates' _ _ _ = Nothing
+
 ceilingN :: Integer -> Rational -> Integer
 ceilingN n x = ceiling (x / toRational n) * n