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.
JavaScript apple-watchbodyweightdockerfitnessfitness-trackergymhealthiosmcpnodejspasskeysprogressive-web-applicationspwareactself-hostedself-hostingvitewebauthnweightliftingworkout-tracker
fix(session-start): "Your last session" carries the weight too with progression off (#217, #519)
iggaM235f68eab3d4ef
diff --git a/frontend/src/lib/session-start.js b/frontend/src/lib/session-start.jsindex 027b1c6b6..007207ff7 100644--- a/frontend/src/lib/session-start.js+++ b/frontend/src/lib/session-start.js@@ -18,6 +18,11 @@ import { sessionHistory } from './backfill.js'* and a policy that moves reps (double progression, bodyweight, a timed hold) still moving them* from there. 'last': the reps you logged last time, the way every planned session opened before* this setting existed. A profile saved before it, or one that never chose, reads as 'plan'.+ *+ * An exercise whose progression is off has no prescription, so its rows open at the routine's own+ * weight and reps. 'last' sends those to last time's weight and reps too (the weight as well as+ * the reps, since no policy is there to decide it). A deload or rehab routine (`noProg`) keeps the+ * routine's numbers.*/export const startsFromLast = st => st?.startFrom === 'last'@@ -42,12 +47,13 @@ export function buildPlannedEntry(stored, cfg, routine, { noProg = false } = {})// default for its optional load.const step = modeOf(cfg) === 'reps' ? weightIncrement(cfg, st.unit) : defaultIncrement(cfg.id, st.unit)const planReps = !startsFromLast(st)+ const fromLast = !noProg && plan.kind === 'off' && startsFromLast(st)// Warm-ups ramp over the dumbbells you own when the profile lists them (issue #376): a rung// lands on the heaviest bell under it, never on a weight in between that no rack holds.const ramp = (modeOf(cfg) === 'reps' && ownedWeightsFor(st, cfg)) || step// Back-off sets step down from the top set by the exercise's own step (lib/backoff.js).const backoffStep = modeOf(cfg) === 'reps' && backoffStepOf(cfg, st.unit) ? step : 0- const built = applyPrescription(buildSets(st, cfg, { step: ramp, rid: routine?.id, useTarget: plan.kind === 'off', planReps }), plan, ramp, barFloor(st, cfg.id), isAssisted(cfg))+ const built = applyPrescription(buildSets(st, cfg, { step: ramp, rid: routine?.id, useTarget: plan.kind === 'off' && !fromLast, planReps }), plan, ramp, barFloor(st, cfg.id), isAssisted(cfg))const rows = backoffStep ? applyBackoff(built, backoffStep) : builtconst sets = applyIntensifierPlan(rows, cfg, dropGrid(st, cfg))const target = { ...cfg }diff --git a/frontend/src/lib/session-start.plan.test.js b/frontend/src/lib/session-start.plan.test.jsindex 233d04b7f..f727f1edd 100644--- a/frontend/src/lib/session-start.plan.test.js+++ b/frontend/src/lib/session-start.plan.test.js@@ -280,3 +280,52 @@ describe('"Your last session" keeps the old carry-over', () => {expect(reps(e)).toEqual([10, 10])})})++describe('"Your last session" for an exercise with progression off', () => {+ const routine = extra => [{ id: 'A', name: 'A', ex: [{ id: BENCH, sets: 2, reps: 10, weight: 50, prog: 'off', ...extra }] }]+ const last = { w: 60, r: 7 }++ it('opens the rows at the weight and reps logged last time', () => {+ const st = state(routine(), { startFrom: 'last' })+ train(st, ['A'], last)+ const [e] = start(st, ['A'])+ expect(e.plan.kind).toBe('off')+ expect(work(e).map(s => [s.w, s.r])).toEqual([[60, 7], [60, 7]])+ })++ it('does the same for a routine that never set a weight', () => {+ const st = state(routine({ weight: 0 }), { startFrom: 'last' })+ train(st, ['A'], last)+ const [e] = start(st, ['A'])+ expect(work(e).map(s => [s.w, s.r])).toEqual([[60, 7], [60, 7]])+ })++ it('"Your plan" opens at the routine\'s weight and reps', () => {+ const st = state(routine())+ train(st, ['A'], last)+ const [e] = start(st, ['A'])+ expect(work(e).map(s => [s.w, s.r])).toEqual([[50, 10], [50, 10]])+ })++ it('leaves an exercise that has a progression policy to that policy', () => {+ const st = state(routine({ prog: 'linear' }), { startFrom: 'last' })+ train(st, ['A'], { w: 50, r: 10 })+ const [e] = start(st, ['A'])+ expect(e.plan.kind).toBe('up')+ expect(work(e).map(s => s.w)).toEqual([52.5, 52.5])+ })++ it('still opens a routine kept out of progression at its own numbers', () => {+ const st = state(routine(), { startFrom: 'last' })+ train(st, ['A'], last)+ st.routines[0].excludeFromProgression = true+ const [e] = start(st, ['A'])+ expect(work(e).map(s => [s.w, s.r])).toEqual([[50, 10], [50, 10]])+ })++ it('opens at the routine\'s numbers the first time, with nothing to copy', () => {+ const st = state(routine(), { startFrom: 'last' })+ const [e] = start(st, ['A'])+ expect(work(e).map(s => [s.w, s.r])).toEqual([[50, 10], [50, 10]])+ })+})diff --git a/frontend/src/locales/ar.js b/frontend/src/locales/ar.jsindex f32927946..90718ab6d 100644--- a/frontend/src/locales/ar.js+++ b/frontend/src/locales/ar.js@@ -1336,7 +1336,7 @@ export default {'Planned sessions start from': 'نقطة بدء الجلسات المخطط لها','The routine’s sets and reps. Your history decides the weight.': 'مجموعات الروتين وتكراراته. سجلّك يحدد الوزن.','Your last session': 'جلستك الأخيرة',- 'The reps you logged last time in that routine, carried over.': 'تُنقل التكرارات التي سجّلتها آخر مرة في ذلك الروتين.',+ 'The reps you logged last time in that routine, carried over. With progression off, the weight too.': 'تُنقل التكرارات المسجّلة في آخر مرة في هذا الروتين. وعند إيقاف التدرّج، الوزن أيضًا.','Plan changed, so starting from your new target.': 'تغيّرت الخطة، لذا نبدأ من هدفك الجديد.','First time in this routine, so starting from its own target.': 'أول مرة في هذا الروتين، لذا نبدأ من هدفه الخاص.','No weight logged last time. Enter what you lift and progression takes it from there.': 'لم يُسجَّل وزن في المرة الماضية. أدخل الوزن الذي ترفعه وسيتابع التدرّج من هناك.',diff --git a/frontend/src/locales/bn.js b/frontend/src/locales/bn.jsindex 327c86d10..54703815c 100644--- a/frontend/src/locales/bn.js+++ b/frontend/src/locales/bn.js@@ -1470,7 +1470,7 @@ export default {'Planned sessions start from': 'পরিকল্পিত সেশন শুরু হয়','The routine’s sets and reps. Your history decides the weight.': 'রুটিনের সেট ও রেপ। ওজন ঠিক করে আপনার ইতিহাস।','Your last session': 'আপনার শেষ সেশন',- 'The reps you logged last time in that routine, carried over.': 'ওই রুটিনে গতবার যে রেপ লগ করেছিলেন, সেগুলোই নেওয়া হয়।',+ 'The reps you logged last time in that routine, carried over. With progression off, the weight too.': 'ওই রুটিনে গতবার লগ করা রেপ আনা হয়। অগ্রগতি বন্ধ থাকলে ওজনও।','Plan changed, so starting from your new target.': 'প্ল্যান বদলেছে, তাই আপনার নতুন লক্ষ্য থেকে শুরু।','First time in this routine, so starting from its own target.': 'এই রুটিনে প্রথমবার, তাই এর নিজস্ব লক্ষ্য থেকে শুরু।','No weight logged last time. Enter what you lift and progression takes it from there.': 'গতবার কোনো ওজন লগ হয়নি। আপনি যা তোলেন তা লিখুন, এরপর প্রগ্রেশন সেখান থেকে এগোবে।',diff --git a/frontend/src/locales/de.js b/frontend/src/locales/de.jsindex 665dd7004..a1793853a 100644--- a/frontend/src/locales/de.js+++ b/frontend/src/locales/de.js@@ -1431,7 +1431,7 @@ export default {'Planned sessions start from': 'Ausgangspunkt geplanter Einheiten','The routine’s sets and reps. Your history decides the weight.': 'Die Sätze und Wiederholungen der Routine. Das Gewicht ergibt sich aus deinem Verlauf.','Your last session': 'Deine letzte Einheit',- 'The reps you logged last time in that routine, carried over.': 'Die Wiederholungen, die du zuletzt in dieser Routine eingetragen hast, werden übernommen.',+ 'The reps you logged last time in that routine, carried over. With progression off, the weight too.': 'Die Wiederholungen der letzten Einheit dieser Routine werden übernommen. Bei ausgeschalteter Progression auch das Gewicht.','Plan changed, so starting from your new target.': 'Plan geändert, also geht es mit deiner neuen Vorgabe los.','First time in this routine, so starting from its own target.': 'Zum ersten Mal in dieser Routine, also geht es mit ihrer eigenen Vorgabe los.','No weight logged last time. Enter what you lift and progression takes it from there.': 'Letztes Mal kein Gewicht eingetragen. Trag ein, was du bewegst, dann übernimmt die Progression.',diff --git a/frontend/src/locales/es.js b/frontend/src/locales/es.jsindex 978e357a3..2da59a5bd 100644--- a/frontend/src/locales/es.js+++ b/frontend/src/locales/es.js@@ -1411,7 +1411,7 @@ export default {'Planned sessions start from': 'Punto de partida de las sesiones planificadas','The routine’s sets and reps. Your history decides the weight.': 'Las series y repeticiones de la rutina. Tu historial decide el peso.','Your last session': 'Tu última sesión',- 'The reps you logged last time in that routine, carried over.': 'Se mantienen las repeticiones que registraste la última vez en esa rutina.',+ 'The reps you logged last time in that routine, carried over. With progression off, the weight too.': 'Se mantienen las repeticiones de la última vez en esa rutina. Con la progresión desactivada, también el peso.','Plan changed, so starting from your new target.': 'El plan cambió, así que empiezas desde tu nuevo objetivo.','First time in this routine, so starting from its own target.': 'Primera vez en esta rutina, así que empiezas desde su propio objetivo.','No weight logged last time. Enter what you lift and progression takes it from there.': 'La última vez no se registró peso. Introduce lo que levantas y la progresión sigue desde ahí.',diff --git a/frontend/src/locales/fr.js b/frontend/src/locales/fr.jsindex 40c5f7be4..2ef4c7aea 100644--- a/frontend/src/locales/fr.js+++ b/frontend/src/locales/fr.js@@ -1411,7 +1411,7 @@ export default {'Planned sessions start from': 'Point de départ des séances planifiées','The routine’s sets and reps. Your history decides the weight.': 'Les séries et répétitions de la routine. Ton historique décide du poids.','Your last session': 'Ta dernière séance',- 'The reps you logged last time in that routine, carried over.': 'Les répétitions notées la dernière fois dans cette routine sont reprises.',+ 'The reps you logged last time in that routine, carried over. With progression off, the weight too.': 'Les répétitions de la dernière fois dans cette routine sont reprises. Avec la progression désactivée, le poids aussi.','Plan changed, so starting from your new target.': 'Plan modifié, donc on repart de ton nouvel objectif.','First time in this routine, so starting from its own target.': 'Première fois dans cette routine, donc on part de son propre objectif.','No weight logged last time. Enter what you lift and progression takes it from there.': 'Aucun poids noté la dernière fois. Entre ce que tu soulèves et la progression prend le relais.',diff --git a/frontend/src/locales/hi.js b/frontend/src/locales/hi.jsindex 7749a8aa3..e1c40e8fc 100644--- a/frontend/src/locales/hi.js+++ b/frontend/src/locales/hi.js@@ -1411,7 +1411,7 @@ export default {'Planned sessions start from': 'प्लान किए गए सेशन की शुरुआत','The routine’s sets and reps. Your history decides the weight.': 'रूटीन के सेट और रेप्स। वज़न आपका इतिहास तय करता है।','Your last session': 'आपका पिछला सेशन',- 'The reps you logged last time in that routine, carried over.': 'उस रूटीन में पिछली बार दर्ज किए गए रेप्स आगे ले जाए जाते हैं।',+ 'The reps you logged last time in that routine, carried over. With progression off, the weight too.': 'उस रूटीन में पिछली बार दर्ज किए गए रेप्स आगे लाए जाते हैं। प्रगति बंद हो तो वज़न भी।','Plan changed, so starting from your new target.': 'प्लान बदला, इसलिए आपके नए लक्ष्य से शुरुआत।','First time in this routine, so starting from its own target.': 'इस रूटीन में पहली बार, इसलिए इसके अपने लक्ष्य से शुरुआत।','No weight logged last time. Enter what you lift and progression takes it from there.': 'पिछली बार कोई वज़न दर्ज नहीं हुआ। जितना उठाते हैं उतना दर्ज करें, प्रगति वहीं से आगे बढ़ेगी।',diff --git a/frontend/src/locales/hu.js b/frontend/src/locales/hu.jsindex e9c2b4567..7cdc9e37b 100644--- a/frontend/src/locales/hu.js+++ b/frontend/src/locales/hu.js@@ -1414,7 +1414,7 @@ export default {'Planned sessions start from': 'A tervezett edzések kiindulópontja','The routine’s sets and reps. Your history decides the weight.': 'A rutin sorozatai és ismétlései. A súlyt az előzményeid döntik el.','Your last session': 'Az utolsó edzésed',- 'The reps you logged last time in that routine, carried over.': 'Az abban a rutinban legutóbb rögzített ismétlések kerülnek át.',+ 'The reps you logged last time in that routine, carried over. With progression off, the weight too.': 'A rutin legutóbbi ismétlései átkerülnek. Kikapcsolt haladásnál a súly is.','Plan changed, so starting from your new target.': 'A terv megváltozott, így az új célodtól indulsz.','First time in this routine, so starting from its own target.': 'Először ebben a rutinban, így a saját céljától indulsz.','No weight logged last time. Enter what you lift and progression takes it from there.': 'Legutóbb nem volt súly rögzítve. Add meg, mennyit emelsz, és onnan a progresszió viszi tovább.',diff --git a/frontend/src/locales/it.js b/frontend/src/locales/it.jsindex afd10c9c4..ad369b7ea 100644--- a/frontend/src/locales/it.js+++ b/frontend/src/locales/it.js@@ -1411,7 +1411,7 @@ export default {'Planned sessions start from': 'Punto di partenza delle sessioni pianificate','The routine’s sets and reps. Your history decides the weight.': 'Serie e ripetizioni della routine. Il peso lo decide il tuo storico.','Your last session': 'La tua ultima sessione',- 'The reps you logged last time in that routine, carried over.': 'Vengono riprese le ripetizioni registrate l’ultima volta in quella routine.',+ 'The reps you logged last time in that routine, carried over. With progression off, the weight too.': 'Vengono riprese le ripetizioni registrate l’ultima volta in quella routine. Con la progressione disattivata, anche il peso.','Plan changed, so starting from your new target.': 'Piano cambiato, quindi si riparte dal tuo nuovo obiettivo.','First time in this routine, so starting from its own target.': 'Prima volta in questa routine, quindi si parte dal suo obiettivo.','No weight logged last time. Enter what you lift and progression takes it from there.': 'Nessun peso registrato l’ultima volta. Inserisci quanto sollevi e la progressione riparte da lì.',diff --git a/frontend/src/locales/ko.js b/frontend/src/locales/ko.jsindex 073b5bdf6..b3d2812b0 100644--- a/frontend/src/locales/ko.js+++ b/frontend/src/locales/ko.js@@ -1411,7 +1411,7 @@ export default {'Planned sessions start from': '계획된 세션의 시작 기준','The routine’s sets and reps. Your history decides the weight.': '루틴의 세트와 횟수. 무게는 기록에 따라 정해집니다.','Your last session': '지난 세션',- 'The reps you logged last time in that routine, carried over.': '그 루틴에서 지난번에 기록한 횟수를 그대로 가져옵니다.',+ 'The reps you logged last time in that routine, carried over. With progression off, the weight too.': '그 루틴에서 지난번에 기록한 횟수를 그대로 가져옵니다. 진행이 꺼져 있으면 무게도 가져옵니다.','Plan changed, so starting from your new target.': '계획이 바뀌어서 새 목표부터 시작해요.','First time in this routine, so starting from its own target.': '이 루틴은 처음이라 루틴의 목표부터 시작해요.','No weight logged last time. Enter what you lift and progression takes it from there.': '지난번에 기록된 무게가 없어요. 드는 무게를 입력하면 거기서부터 진행해요.',diff --git a/frontend/src/locales/pl.js b/frontend/src/locales/pl.jsindex fa53b66c2..552b408e3 100644--- a/frontend/src/locales/pl.js+++ b/frontend/src/locales/pl.js@@ -1411,7 +1411,7 @@ export default {'Planned sessions start from': 'Punkt wyjścia zaplanowanych treningów','The routine’s sets and reps. Your history decides the weight.': 'Serie i powtórzenia z planu treningowego. Ciężar wynika z twojej historii.','Your last session': 'Twoja ostatnia sesja',- 'The reps you logged last time in that routine, carried over.': 'Przenoszone są powtórzenia zapisane ostatnio w tym planie treningowym.',+ 'The reps you logged last time in that routine, carried over. With progression off, the weight too.': 'Powtórzenia z ostatniego razu w tej rutynie są przenoszone. Przy wyłączonej progresji także ciężar.','Plan changed, so starting from your new target.': 'Plan się zmienił, więc zaczynasz od nowego celu.','First time in this routine, so starting from its own target.': 'Pierwszy raz w tym planie treningowym, więc zaczynasz od jego własnego celu.','No weight logged last time. Enter what you lift and progression takes it from there.': 'Ostatnio nie zapisano ciężaru. Wpisz, ile podnosisz, a progresja ruszy od tego miejsca.',diff --git a/frontend/src/locales/pt-BR.js b/frontend/src/locales/pt-BR.jsindex c0c62ffb0..22d057331 100644--- a/frontend/src/locales/pt-BR.js+++ b/frontend/src/locales/pt-BR.js@@ -833,7 +833,7 @@ export const PT_BR_OVERRIDES = {'Planned sessions start from': 'Ponto de partida das sessões planejadas','The routine’s sets and reps. Your history decides the weight.': 'As séries e repetições da rotina. Seu histórico decide o peso.','Your last session': 'Sua última sessão',- 'The reps you logged last time in that routine, carried over.': 'São mantidas as repetições que você registrou da última vez nessa rotina.',+ 'The reps you logged last time in that routine, carried over. With progression off, the weight too.': 'São mantidas as repetições que você registrou da última vez nessa rotina. Com a progressão desativada, o peso também.','Plan changed, so starting from your new target.': 'O plano mudou, então você começa pela sua nova meta.','First time in this routine, so starting from its own target.': 'Primeira vez nesta rotina, então você começa pela meta dela.','No weight logged last time. Enter what you lift and progression takes it from there.': 'Nenhum peso registrado da última vez. Informe quanto você levanta e a progressão segue daí.',diff --git a/frontend/src/locales/pt.js b/frontend/src/locales/pt.jsindex 267cd4118..3b1a8b053 100644--- a/frontend/src/locales/pt.js+++ b/frontend/src/locales/pt.js@@ -1411,7 +1411,7 @@ export default {'Planned sessions start from': 'Ponto de partida das sessões planeadas','The routine’s sets and reps. Your history decides the weight.': 'As séries e repetições da rotina. O teu histórico decide o peso.','Your last session': 'A tua última sessão',- 'The reps you logged last time in that routine, carried over.': 'Mantêm-se as repetições que registaste da última vez nessa rotina.',+ 'The reps you logged last time in that routine, carried over. With progression off, the weight too.': 'Mantêm-se as repetições que registaste da última vez nessa rotina. Com a progressão desativada, também o peso.','Plan changed, so starting from your new target.': 'O plano mudou, por isso começas a partir do teu novo objetivo.','First time in this routine, so starting from its own target.': 'Primeira vez nesta rotina, por isso começas a partir do objetivo dela.','No weight logged last time. Enter what you lift and progression takes it from there.': 'Nenhum peso registado da última vez. Introduz o que levantas e a progressão segue a partir daí.',diff --git a/frontend/src/locales/ru.js b/frontend/src/locales/ru.jsindex decf561b6..7a08407af 100644--- a/frontend/src/locales/ru.js+++ b/frontend/src/locales/ru.js@@ -1380,7 +1380,7 @@ export default {'Planned sessions start from': 'Основа запланированных тренировок','The routine’s sets and reps. Your history decides the weight.': 'Подходы и повторения из программы. Вес определяет ваша история.','Your last session': 'Ваша последняя тренировка',- 'The reps you logged last time in that routine, carried over.': 'Повторения, записанные в прошлый раз в этой программе, переносятся.',+ 'The reps you logged last time in that routine, carried over. With progression off, the weight too.': 'Повторения с прошлого раза в этой программе переносятся. При выключенной прогрессии — и вес.','Plan changed, so starting from your new target.': 'План изменён, поэтому начинаем с новой цели.','First time in this routine, so starting from its own target.': 'Впервые в этой программе, поэтому начинаем с её собственной цели.','No weight logged last time. Enter what you lift and progression takes it from there.': 'В прошлый раз вес не был записан. Укажите, с каким весом работаете, и дальше прогрессия подхватит.',diff --git a/frontend/src/locales/th.js b/frontend/src/locales/th.jsindex c7c6838d8..385803865 100644--- a/frontend/src/locales/th.js+++ b/frontend/src/locales/th.js@@ -1422,7 +1422,7 @@ export default {'Planned sessions start from': 'จุดเริ่มต้นของเซสชันตามแผน','The routine’s sets and reps. Your history decides the weight.': 'จำนวนเซ็ตและครั้งตามรูทีน ส่วนน้ำหนักขึ้นอยู่กับประวัติของคุณ','Your last session': 'เซสชันล่าสุดของคุณ',- 'The reps you logged last time in that routine, carried over.': 'ใช้จำนวนครั้งที่บันทึกไว้ครั้งก่อนในรูทีนนั้นต่อ',+ 'The reps you logged last time in that routine, carried over. With progression off, the weight too.': 'นำจำนวนครั้งที่บันทึกไว้ครั้งก่อนในรูทีนนั้นมาใช้ และถ้าปิดความก้าวหน้าก็รวมน้ำหนักด้วย','Plan changed, so starting from your new target.': 'แผนเปลี่ยนแล้ว จึงเริ่มจากเป้าหมายใหม่ของคุณ','First time in this routine, so starting from its own target.': 'ครั้งแรกในรูทีนนี้ จึงเริ่มจากเป้าหมายของรูทีนเอง','No weight logged last time. Enter what you lift and progression takes it from there.': 'ครั้งก่อนไม่ได้บันทึกน้ำหนัก กรอกน้ำหนักที่คุณยก แล้วการเพิ่มน้ำหนักจะรับช่วงต่อจากตรงนั้น',diff --git a/frontend/src/locales/tr.js b/frontend/src/locales/tr.jsindex 1e2009e0d..06e25e952 100644--- a/frontend/src/locales/tr.js+++ b/frontend/src/locales/tr.js@@ -1411,7 +1411,7 @@ export default {'Planned sessions start from': 'Planlı seansların çıkış noktası','The routine’s sets and reps. Your history decides the weight.': 'Rutinin setleri ve tekrarları. Ağırlığı geçmişin belirler.','Your last session': 'Son seansın',- 'The reps you logged last time in that routine, carried over.': 'O rutinde geçen sefer kaydettiğin tekrarlar aynen aktarılır.',+ 'The reps you logged last time in that routine, carried over. With progression off, the weight too.': 'O rutinde geçen sefer kaydettiğin tekrarlar aktarılır. İlerleme kapalıysa ağırlık da.','Plan changed, so starting from your new target.': 'Plan değişti, bu yüzden yeni hedefinden başlıyorsun.','First time in this routine, so starting from its own target.': 'Bu rutinde ilk kez, bu yüzden rutinin kendi hedefinden başlıyorsun.','No weight logged last time. Enter what you lift and progression takes it from there.': 'Geçen sefer ağırlık kaydedilmedi. Kaldırdığın ağırlığı gir, ilerleme oradan devralsın.',diff --git a/frontend/src/locales/uk.js b/frontend/src/locales/uk.jsindex 10194aed6..102c6472d 100644--- a/frontend/src/locales/uk.js+++ b/frontend/src/locales/uk.js@@ -1278,7 +1278,7 @@ export default {'Planned sessions start from': 'Основа запланованих тренувань','The routine’s sets and reps. Your history decides the weight.': 'Підходи й повторення з програми. Вагу визначає твоя історія.','Your last session': 'Твоє останнє тренування',- 'The reps you logged last time in that routine, carried over.': 'Повторення, записані минулого разу в цій програмі, переносяться.',+ 'The reps you logged last time in that routine, carried over. With progression off, the weight too.': 'Повторення з минулого разу в цій програмі переносяться. Якщо прогресію вимкнено — і вага.','Plan changed, so starting from your new target.': 'План змінено, тож починаємо з нової цілі.','First time in this routine, so starting from its own target.': 'Уперше в цій програмі, тож починаємо з її власної цілі.','No weight logged last time. Enter what you lift and progression takes it from there.': 'Минулого разу вагу не записано. Вкажи, з якою вагою працюєш, і прогресія продовжить звідти.',diff --git a/frontend/src/locales/zh-TW.js b/frontend/src/locales/zh-TW.jsindex 0f99da689..5f41ee3d0 100644--- a/frontend/src/locales/zh-TW.js+++ b/frontend/src/locales/zh-TW.js@@ -1395,7 +1395,7 @@ export default {'Planned sessions start from': '預排訓練的起始數值依據','The routine’s sets and reps. Your history decides the weight.': '組數與次數依據課表設定;重量則由歷史紀錄決定。','Your last session': '你上次的訓練表現',- 'The reps you logged last time in that routine, carried over.': '直接沿用上次在此課表中記錄的實際次數。',+ 'The reps you logged last time in that routine, carried over. With progression off, the weight too.': '沿用你上次在該訓練日記錄的次數。關閉進階時,重量也一併沿用。','Plan changed, so starting from your new target.': '課表已變更,所以從你的新目標開始。','First time in this routine, so starting from its own target.': '第一次練這份課表,所以從它自己的目標開始。','No weight logged last time. Enter what you lift and progression takes it from there.': '上次沒有記錄重量。填上你實際舉的重量,漸進就會從那裡接手。',diff --git a/frontend/src/locales/zh.js b/frontend/src/locales/zh.jsindex 0ba8d3a2b..7fef9bd18 100644--- a/frontend/src/locales/zh.js+++ b/frontend/src/locales/zh.js@@ -1411,7 +1411,7 @@ export default {'Planned sessions start from': '计划训练的起点','The routine’s sets and reps. Your history decides the weight.': '按训练日的组数和次数,重量由你的历史记录决定。','Your last session': '你的上次训练',- 'The reps you logged last time in that routine, carried over.': '沿用你上次在该训练日记录的次数。',+ 'The reps you logged last time in that routine, carried over. With progression off, the weight too.': '沿用你上次在该训练日记录的次数。关闭进阶时,重量也一并沿用。','Plan changed, so starting from your new target.': '计划已更改,所以从你的新目标开始。','First time in this routine, so starting from its own target.': '第一次练这个训练日,所以从它自己的目标开始。','No weight logged last time. Enter what you lift and progression takes it from there.': '上次没有记录重量。填上你实际举的重量,进阶就从那里接手。',diff --git a/frontend/src/store/useStore.js b/frontend/src/store/useStore.jsindex ba54aa58a..ef0b40b74 100644--- a/frontend/src/store/useStore.js+++ b/frontend/src/store/useStore.js@@ -223,7 +223,8 @@ export const DEF = {connLocal: true,// Where a planned session's reps come from (Settings → During a workout, lib/session-start.js):// 'plan' opens at the routine's own sets × reps and lets history and progression decide the- // weight; 'last' carries the reps over from the last session, the way it always worked before.+ // weight; 'last' carries the reps over from the last session, the way it always worked before,+ // and the weight too for an exercise with progression off (nothing else decides it).// Absent reads as 'plan' too, which is what the MCP bridge sees on a raw state file.startFrom: 'plan',// Per-language choice for translated exercise names: whether the original English name isdiff --git a/frontend/src/views/Settings.jsx b/frontend/src/views/Settings.jsxindex 45ba7147a..d8b0a1d77 100644--- a/frontend/src/views/Settings.jsx+++ b/frontend/src/views/Settings.jsx@@ -589,13 +589,14 @@ export default function Settings({ page = null, find = null, via = null, entryKe<Section title={t('Sessions and timed sets')}>{/* Whose reps a planned session opens with (lib/session-start.js). The plan's by default:the routine is what you said you would do, and history and progression decide the- weight. The other choice is the old behaviour, reps carried over from last time.- Absent (an older profile) reads as the plan. */}+ weight. The other choice is the old behaviour, reps carried over from last time, and+ the weight too for an exercise with progression off. Absent (an older profile) reads+ as the plan. */}<SelectRow icon="clipboard" iconTint="var(--green)" title={t('Planned sessions start from')}value={S.startFrom === 'last' ? 'last' : 'plan'} onChange={v => update(s => { s.startFrom = v })}options={[{ value: 'plan', label: t('Your plan'), subtitle: t('The routine’s sets and reps. Your history decides the weight.') },- { value: 'last', label: t('Your last session'), subtitle: t('The reps you logged last time in that routine, carried over.') },+ { value: 'last', label: t('Your last session'), subtitle: t('The reps you logged last time in that routine, carried over. With progression off, the weight too.') },]} /><Row icon="stopwatch" iconTint="var(--orange)" title={t('Keep timing after target')}subtitle={t('Timed sets continue up to 15 extra minutes. Tap Done to log the actual duration.')}>