Skip to content

Open-source gym & body-weight tracker, now in the App Store (iPhone + Apple Watch) and as an Android APK. Plan routines, log workouts, see which muscles are trained, import from Strong/Hevy/FitNotes. Self-host it or use it on the phone alone.

Merge PR #322: Per side on timed holds, rebased on v1.3.9 with the progression fix (@horusglez)

Duarte Santosff61010e59ee
diff --cc frontend/src/views/Workout.jsx
index 57ded4ba8,1685edf99..c30eb7edd
--- a/frontend/src/views/Workout.jsx
+++ b/frontend/src/views/Workout.jsx
@@@ -792,10 -793,16 +804,17 @@@ function ActiveWorkout()
const l = e.sets[e.sets.length - 1]
const m = modeOf({ ...(e.target || {}), id: e.id })
if (m === 'cardio') e.sets.push({ min: l ? l.min : (e.target.min || 20), speed: l ? l.speed : (e.target.speed || 8), done: false })
- else if (m === 'time') e.sets.push({ sec: l ? l.sec : (e.target.sec || 45), w: l ? (l.w || 0) : (e.target.weight || 0), done: false })
+ else if (m === 'time') {
+ const sec = l ? l.sec : (e.target.sec || 45)
+ const w = l ? (l.w || 0) : (e.target.weight || 0)
+ // A timed per-side exercise is planned in pairs (buildWorkSets), so one more "set" is one
+ // more hold on each side, not a lone row an L/R count would fall out of sync with.
+ if (isPerSide({ ...(e.target || {}), id: e.id })) e.sets.push({ sec, w, done: false, side: 'L' }, { sec, w, done: false, side: 'R' })
+ else e.sets.push({ sec, w, done: false })
+ }
else {
- const row = { w: l ? l.w : 0, r: l ? l.r : e.target.reps, done: false }
+ // An extra set past a pyramid copies the last one's target, Max included.
+ const row = { w: l ? l.w : 0, r: l ? l.r : e.target.reps, done: false, ...(l && l.max ? { max: true } : {}) }
// A unilateral exercise keeps adding per-side rows (issue #60): seed each side from the
// previous set's own side when it had one, else split the row's total evenly.
e.sets.push(isPerSide({ ...(e.target || {}), id: e.id })