move %1RM to its own column

1 files changed, 5 insertions, 2 deletions

diff --git a/repgoal.hs b/repgoal.hs
index 9c2ccc9..1e1e5b3 100755
--- a/repgoal.hs
+++ b/repgoal.hs
@@ -192,6 +192,7 @@ accessoryLiftRow name targetReps (position, _) = map (padLeftRight 2) [
     txt " ",
     txt " ",
     txt " ",
+    txt " ",
     txt " "
   ]
 unspecifiedLiftRow :: Text -> [Widget n]
@@ -201,6 +202,7 @@ unspecifiedLiftRow name = map (padLeftRight 2) [
     txt " ",
     txt " ",
     txt " ",
+    txt " ",
     txt " "
   ]
 
@@ -218,8 +220,9 @@ wendlerLiftRow LiftRecord{..} (position, (SetScheme targetRatio targetReps amrap
   map (padLeftRight 2)
   [
     pad $ txt $ case position of FirstInList -> liftRecordName; NotFirstInList -> " ",
-    pad $ str $ printf "%2d%s @ %d (%s%%)" targetReps (if amrap then "+" else "" :: Text) targetWeight (showFloatConcise actualIntensity),
+    pad $ str $ printf "%2d%s @ %d" targetReps (if amrap then "+" else "" :: Text) targetWeight,
     pad $ str $ showPlates targetWeight,
+    pad $ str $ showFloatConcise actualIntensity ++ "%",
     str $ if amrap then showGoal repGoal ++ "\n" ++ showGoal (repGoal + 1) else " ",
     pad $ txt " ",
     pad $ txt " "
@@ -238,7 +241,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 (liftRows (view week st)) lifts'
+    lastSetTable = renderTable $ table $ map (padLeftRight 1 . txt) ["Lift", "Set", "Plates", "%1RM", "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] ]