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 !133: per-side data preserved across progression and session flows (ErrorUsernameAlreadyTaken)

Duarte Santos86f28acb17c8
diff --cc frontend/src/lib/history.js
index 3e910d55d,8889e20ee..ce3e19b89
--- a/frontend/src/lib/history.js
+++ b/frontend/src/lib/history.js
@@@ -486,13 -497,8 +500,11 @@@ export function workoutVolume(w)
// does it; this line was the one that did not, which only stopped being harmless when a
// routine started planning warm-ups by default. The number is written into the saved
// workout, so an inflated one would stay wrong forever.
+ // A per-side row's mirror is `w = max(L, R), r = L + R` (workout-model syncSideAggregate) —
+ // right for a headline, wrong for a product: 14×10 left and 12.5×6 right is 215, not 14×16.
+ // Each side is its own weight × reps, with its own drops and bursts.
w.entries.forEach(e => e.sets.forEach(s => {
- if (!s.done || isWarmupRow(s)) return
- if (isSideSet(s)) { for (const side of [s.sides.L, s.sides.R]) v += (side.w || 0) * (side.r || 0) + extraVolumeOf(side); return }
- v += (s.w || 0) * (s.r || 0) + extraVolumeOf(s)
+ if (!isWarmupRow(s)) v += completedVolumeOf(s)
}))
return v
}
diff --cc frontend/src/sheets.jsx
index b1a4b83d8,60f426fca..4c04e4720
--- a/frontend/src/sheets.jsx
+++ b/frontend/src/sheets.jsx
@@@ -27,9 -27,9 +27,9 @@@ import { estimate1RM, best1RM, is1RMRec
import { exerciseHistory } from './lib/exercise-history.js'
import { nextPrescription, applyPrescription, policyFor, defaultIncrement, POLICIES_FOR, POLICY_NAME, POLICY_DESC, MAX_BW_SETS, weightIncrement } from './lib/progression.js'
import { normalizeRepRange } from './lib/rep-range.js'
-import { MOBILE, shareExport } from './lib/mobile.js'
+import { MOBILE, shareExport, printHtml } from './lib/mobile.js'
import { buildCompletedWorkout } from './lib/finish-workout.js'
- import { isWarmupRow } from './lib/workout-model.js'
+ import { isWarmupRow, hasCompletedWork } from './lib/workout-model.js'
import { nextUnfinishedUnit } from './lib/supersetFlow.js'
import { swapActiveExercise } from './lib/active-exercise-swap.js'
import { useSheetKeyboard, useRevealActiveChip, tappable } from './lib/use-sheet-keyboard.js'