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
Update routine: say which note goes into the routine
Duarte Santos4398b783aea4
diff --git a/frontend/src/locales/ar.js b/frontend/src/locales/ar.jsindex 09fb74d8a..ca083518a 100644--- a/frontend/src/locales/ar.js+++ b/frontend/src/locales/ar.js@@ -1788,7 +1788,7 @@ export default {// --- update a routine from a running workout ---'Update routine': 'تحديث الروتين','Update “{0}”?': 'تحديث «{0}»؟',- 'Copy this exercise’s warm-up sets, rest and note from this session into the routine. Your workout history is kept.': 'انسخ مجموعات الإحماء والراحة والملاحظة الخاصة بهذا التمرين من هذه الجلسة إلى الروتين. يبقى سجل تمارينك كما هو.',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'انسخ مجموعات الإحماء لهذا التمرين، والراحة والملاحظة من إعدادات التقدم الخاصة به، إلى الروتين. تبقى الملاحظة التي أضفتها لهذا اليوم مع هذا التمرين. يبقى سجل تمارينك كما هو.','Routine updated': 'تم تحديث الروتين','per side': 'لكل جانب','Left': 'يسار',diff --git a/frontend/src/locales/de.js b/frontend/src/locales/de.jsindex fd00651d6..f471d5507 100644--- a/frontend/src/locales/de.js+++ b/frontend/src/locales/de.js@@ -1755,7 +1755,7 @@ export default {// --- update a routine from a running workout ---'Update routine': 'Routine aktualisieren','Update “{0}”?': 'Routine „{0}“ aktualisieren?',- 'Copy this exercise’s warm-up sets, rest and note from this session into the routine. Your workout history is kept.': 'Übernimmt die Aufwärmsätze, die Pause und die Notiz dieser Übung aus dieser Einheit in die Routine. Dein Trainingsverlauf bleibt erhalten.',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Übernimmt die Aufwärmsätze dieser Übung sowie Pause und Notiz aus ihren Progressions-Einstellungen in die Routine. Eine Notiz für heute bleibt bei diesem Training. Dein Trainingsverlauf bleibt erhalten.','Routine updated': 'Routine aktualisiert','per side': 'pro Seite','Left': 'Links',diff --git a/frontend/src/locales/es.js b/frontend/src/locales/es.jsindex 248ec3e32..cd43af540 100644--- a/frontend/src/locales/es.js+++ b/frontend/src/locales/es.js@@ -1735,7 +1735,7 @@ export default {// --- update a routine from a running workout ---'Update routine': 'Actualizar rutina','Update “{0}”?': '¿Actualizar «{0}»?',- 'Copy this exercise’s warm-up sets, rest and note from this session into the routine. Your workout history is kept.': 'Copia a la rutina las series de calentamiento, el descanso y la nota de este ejercicio de esta sesión. Tu historial de entrenamientos se conserva.',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Copia a la rutina las series de calentamiento de este ejercicio, y el descanso y la nota de sus Ajustes de progresión. Una nota añadida para hoy se queda con este entrenamiento. Tu historial de entrenamientos se conserva.','Routine updated': 'Rutina actualizada','per side': 'por lado','Left': 'Izquierda',diff --git a/frontend/src/locales/fr.js b/frontend/src/locales/fr.jsindex f30309000..b974c50a1 100644--- a/frontend/src/locales/fr.js+++ b/frontend/src/locales/fr.js@@ -1735,7 +1735,7 @@ export default {// --- update a routine from a running workout ---'Update routine': 'Mettre à jour la routine','Update “{0}”?': 'Mettre à jour la routine « {0} » ?',- 'Copy this exercise’s warm-up sets, rest and note from this session into the routine. Your workout history is kept.': 'Copie dans la routine les séries d’échauffement, le repos et la note de cet exercice pour cette séance. Ton historique d’entraînement est conservé.',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Copie dans la routine les séries d’échauffement de cet exercice, ainsi que le repos et la note de ses Réglages de progression. Une note ajoutée pour aujourd’hui reste avec cette séance. Ton historique d’entraînement est conservé.','Routine updated': 'Routine mise à jour','per side': 'par côté','Left': 'Gauche',diff --git a/frontend/src/locales/hi.js b/frontend/src/locales/hi.jsindex d68c4d288..41732e130 100644--- a/frontend/src/locales/hi.js+++ b/frontend/src/locales/hi.js@@ -1735,7 +1735,7 @@ export default {// --- update a routine from a running workout ---'Update routine': 'रूटीन अपडेट करें','Update “{0}”?': 'रूटीन “{0}” अपडेट करें?',- 'Copy this exercise’s warm-up sets, rest and note from this session into the routine. Your workout history is kept.': 'इस सत्र से इस एक्सरसाइज़ के वार्म-अप सेट, आराम और नोट को रूटीन में कॉपी करें। आपका वर्कआउट इतिहास सुरक्षित रहता है।',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'इस एक्सरसाइज़ के वार्म-अप सेट, और इसकी प्रगति सेटिंग से आराम और नोट को रूटीन में कॉपी करें। आज के लिए जोड़ा गया नोट इसी वर्कआउट के साथ रहता है। आपका वर्कआउट इतिहास सुरक्षित रहता है।','Routine updated': 'रूटीन अपडेट हो गया','per side': 'प्रति तरफ़','Left': 'बायाँ',diff --git a/frontend/src/locales/hu.js b/frontend/src/locales/hu.jsindex 1ce597f5b..4c5deb4e3 100644--- a/frontend/src/locales/hu.js+++ b/frontend/src/locales/hu.js@@ -1738,7 +1738,7 @@ export default {// --- update a routine from a running workout ---'Update routine': 'Rutin frissítése','Update “{0}”?': 'Frissíted a(z) „{0}” rutint?',- 'Copy this exercise’s warm-up sets, rest and note from this session into the routine. Your workout history is kept.': 'A gyakorlat bemelegítő sorozatait, pihenőjét és jegyzetét átmásolja ebből az edzésből a rutinba. Az edzéselőzményeid megmaradnak.',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Átmásolja a rutinba a gyakorlat bemelegítő sorozatait, valamint a pihenőt és a jegyzetet a Progresszió beállításaiból. A mai napra írt jegyzet ennél az edzésnél marad. Az edzéselőzményeid megmaradnak.','Routine updated': 'Rutin frissítve','per side': 'oldalanként','Left': 'Bal',diff --git a/frontend/src/locales/it.js b/frontend/src/locales/it.jsindex 7ee339d4b..3375db8ed 100644--- a/frontend/src/locales/it.js+++ b/frontend/src/locales/it.js@@ -1735,7 +1735,7 @@ export default {// --- update a routine from a running workout ---'Update routine': 'Aggiorna la routine','Update “{0}”?': 'Aggiornare la routine «{0}»?',- 'Copy this exercise’s warm-up sets, rest and note from this session into the routine. Your workout history is kept.': 'Copia nella routine le serie di riscaldamento, il recupero e la nota di questo esercizio da questa sessione. Il tuo storico degli allenamenti resta intatto.',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Copia nella routine le serie di riscaldamento di questo esercizio, e il recupero e la nota delle sue Impostazioni di progressione. Una nota aggiunta per oggi resta con questo allenamento. Il tuo storico degli allenamenti resta intatto.','Routine updated': 'Routine aggiornata','per side': 'per lato','Left': 'Sinistra',diff --git a/frontend/src/locales/ko.js b/frontend/src/locales/ko.jsindex 9dd8c12fa..76732991d 100644--- a/frontend/src/locales/ko.js+++ b/frontend/src/locales/ko.js@@ -1735,7 +1735,7 @@ export default {// --- update a routine from a running workout ---'Update routine': '루틴 업데이트','Update “{0}”?': '“{0}” 루틴을 업데이트할까요?',- 'Copy this exercise’s warm-up sets, rest and note from this session into the routine. Your workout history is kept.': '이 세션의 워밍업 세트, 휴식, 메모를 이 운동의 루틴에 복사합니다. 운동 기록은 그대로 유지됩니다.',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': '이 운동의 워밍업 세트와 진행 설정의 휴식, 메모를 루틴에 복사합니다. 오늘을 위해 추가한 메모는 이 운동 기록에 남습니다. 운동 기록은 그대로 유지됩니다.','Routine updated': '루틴 업데이트됨','per side': '한쪽당','Left': '왼쪽',diff --git a/frontend/src/locales/pl.js b/frontend/src/locales/pl.jsindex 90e28e283..b10a5f2df 100644--- a/frontend/src/locales/pl.js+++ b/frontend/src/locales/pl.js@@ -1735,7 +1735,7 @@ export default {// --- update a routine from a running workout ---'Update routine': 'Zaktualizuj plan','Update “{0}”?': 'Zaktualizować plan „{0}”?',- 'Copy this exercise’s warm-up sets, rest and note from this session into the routine. Your workout history is kept.': 'Kopiuje serie rozgrzewkowe, przerwę i notatkę tego ćwiczenia z tej sesji do planu. Twoja historia treningów zostaje bez zmian.',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Kopiuje do planu serie rozgrzewkowe tego ćwiczenia oraz przerwę i notatkę z jego Ustawień progresji. Notatka dodana na dziś zostaje przy tym treningu. Twoja historia treningów zostaje bez zmian.','Routine updated': 'Plan zaktualizowany','per side': 'na stronę','Left': 'Lewa',diff --git a/frontend/src/locales/pt-BR.js b/frontend/src/locales/pt-BR.jsindex 122b00e74..d2eb06e0e 100644--- a/frontend/src/locales/pt-BR.js+++ b/frontend/src/locales/pt-BR.js@@ -1065,7 +1065,7 @@ export const PT_BR_OVERRIDES = {// --- update a routine from a running workout ---'Update routine': 'Atualizar rotina','Update “{0}”?': 'Atualizar “{0}”?',- 'Copy this exercise’s warm-up sets, rest and note from this session into the routine. Your workout history is kept.': 'Copia as séries de aquecimento, o descanso e a anotação deste exercício desta sessão para a rotina. Seu histórico de treinos é mantido.',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Copia para a rotina as séries de aquecimento deste exercício, e o descanso e a anotação das Configurações de progressão dele. Uma anotação adicionada para hoje fica com este treino. Seu histórico de treinos é mantido.','Routine updated': 'Rotina atualizada','{0} set becomes {1}: one on each side, {2}s held every time.': '{0} série vira {1}: uma de cada lado, {2} s de isometria cada vez.','{0} sets become {1}: one on each side, {2}s held every time.': '{0} séries viram {1}: uma de cada lado, {2} s de isometria cada vez.',diff --git a/frontend/src/locales/pt.js b/frontend/src/locales/pt.jsindex 6a96c53bb..e77ad4382 100644--- a/frontend/src/locales/pt.js+++ b/frontend/src/locales/pt.js@@ -1735,7 +1735,7 @@ export default {// --- update a routine from a running workout ---'Update routine': 'Atualizar rotina','Update “{0}”?': 'Atualizar «{0}»?',- 'Copy this exercise’s warm-up sets, rest and note from this session into the routine. Your workout history is kept.': 'Copia as séries de aquecimento, o descanso e a nota deste exercício desta sessão para a rotina. O teu histórico de treinos é mantido.',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Copia para a rotina as séries de aquecimento deste exercício, e o descanso e a nota das suas Definições de progressão. Uma nota adicionada para hoje fica com este treino. O teu histórico de treinos é mantido.','Routine updated': 'Rotina atualizada','per side': 'por lado','Left': 'Esquerda',diff --git a/frontend/src/locales/ru.js b/frontend/src/locales/ru.jsindex f24b96fc5..b5055364d 100644--- a/frontend/src/locales/ru.js+++ b/frontend/src/locales/ru.js@@ -1739,7 +1739,7 @@ export default {// --- update a routine from a running workout ---'Update routine': 'Обновить программу','Update “{0}”?': 'Обновить программу «{0}»?',- 'Copy this exercise’s warm-up sets, rest and note from this session into the routine. Your workout history is kept.': 'Копирует разминочные подходы, отдых и заметку этого упражнения из этой тренировки в программу. История тренировок сохраняется.',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Копирует в программу разминочные подходы этого упражнения, а также отдых и заметку из его настроек прогрессии. Заметка на сегодня остаётся с этой тренировкой. История тренировок сохраняется.','Routine updated': 'Программа обновлена','per side': 'на сторону','Left': 'Левая',diff --git a/frontend/src/locales/th.js b/frontend/src/locales/th.jsindex 9629c8d2b..28f182260 100644--- a/frontend/src/locales/th.js+++ b/frontend/src/locales/th.js@@ -1746,7 +1746,7 @@ export default {// --- update a routine from a running workout ---'Update routine': 'อัปเดตรูทีน','Update “{0}”?': 'อัปเดตรูทีน “{0}” ไหม?',- 'Copy this exercise’s warm-up sets, rest and note from this session into the routine. Your workout history is kept.': 'คัดลอกเซ็ตวอร์มอัพ เวลาพัก และโน้ตของท่านี้จากเซสชันนี้ไปยังรูทีน ประวัติการออกกำลังกายของคุณจะยังอยู่ครบ',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'คัดลอกเซ็ตวอร์มอัพของท่านี้ รวมถึงเวลาพักและโน้ตจากการตั้งค่าการเพิ่มน้ำหนัก ไปยังรูทีน โน้ตที่เพิ่มไว้สำหรับวันนี้จะอยู่กับการออกกำลังกายครั้งนี้ ประวัติการออกกำลังกายของคุณจะยังอยู่ครบ','Routine updated': 'อัปเดตรูทีนแล้ว','per side': 'ต่อข้าง','Left': 'ซ้าย',diff --git a/frontend/src/locales/tr.js b/frontend/src/locales/tr.jsindex c59d105bb..95466a001 100644--- a/frontend/src/locales/tr.js+++ b/frontend/src/locales/tr.js@@ -1735,7 +1735,7 @@ export default {// --- update a routine from a running workout ---'Update routine': 'Rutini güncelle','Update “{0}”?': '“{0}” rutini güncellensin mi?',- 'Copy this exercise’s warm-up sets, rest and note from this session into the routine. Your workout history is kept.': 'Bu egzersizin ısınma setlerini, dinlenme süresini ve notunu bu antrenmandan rutine kopyalar. Antrenman geçmişin korunur.',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Bu egzersizin ısınma setlerini ve İlerleme ayarlarındaki dinlenme süresi ile notu rutine kopyalar. Bugün için eklenen not bu antrenmanda kalır. Antrenman geçmişin korunur.','Routine updated': 'Rutin güncellendi','per side': 'taraf başına','Left': 'Sol',diff --git a/frontend/src/locales/uk.js b/frontend/src/locales/uk.jsindex 0be690674..c132b7f8a 100644--- a/frontend/src/locales/uk.js+++ b/frontend/src/locales/uk.js@@ -1732,7 +1732,7 @@ export default {// --- update a routine from a running workout ---'Update routine': 'Оновити програму','Update “{0}”?': 'Оновити програму «{0}»?',- 'Copy this exercise’s warm-up sets, rest and note from this session into the routine. Your workout history is kept.': 'Копіює розминкові підходи, відпочинок і нотатку цієї вправи з цього тренування до програми. Історія тренувань зберігається.',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Копіює до програми розминкові підходи цієї вправи, а також відпочинок і нотатку з її налаштувань прогресії. Нотатка на сьогодні залишається з цим тренуванням. Історія тренувань зберігається.','Routine updated': 'Програму оновлено','per side': 'на сторону','Left': 'Ліва',diff --git a/frontend/src/locales/zh-TW.js b/frontend/src/locales/zh-TW.jsindex d546341e9..1c8b2aa65 100644--- a/frontend/src/locales/zh-TW.js+++ b/frontend/src/locales/zh-TW.js@@ -1710,7 +1710,7 @@ export default {'No muscle volume planned.': '尚未排定肌肉訓練量。','Update routine': '更新課表','Update “{0}”?': '要更新課表「{0}」嗎?',- 'Copy this exercise’s warm-up sets, rest and note from this session into the routine. Your workout history is kept.': '將這次訓練中此動作的熱身組、休息時間與備忘錄複製到課表中。你的訓練紀錄會保留。',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': '將此動作的熱身組,以及其漸進超負荷設定中的休息時間與備忘錄,複製到課表中。為今天新增的備忘錄會留在這次訓練中。你的訓練紀錄會保留。','Routine updated': '課表已更新','per side': '每側','Left': '左側',diff --git a/frontend/src/locales/zh.js b/frontend/src/locales/zh.jsindex 31811652b..f0c57e3da 100644--- a/frontend/src/locales/zh.js+++ b/frontend/src/locales/zh.js@@ -1735,7 +1735,7 @@ export default {// --- update a routine from a running workout ---'Update routine': '更新训练日','Update “{0}”?': '更新训练日「{0}」?',- 'Copy this exercise’s warm-up sets, rest and note from this session into the routine. Your workout history is kept.': '将本次训练中该动作的热身组、休息时间和备注复制到训练日中。训练历史会保留。',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': '将该动作的热身组,以及其渐进设置中的休息时间和备注,复制到训练日中。为今天添加的备注会留在本次训练中。训练历史会保留。','Routine updated': '训练日已更新','per side': '每侧','Left': '左侧',diff --git a/frontend/src/views/Workout.jsx b/frontend/src/views/Workout.jsxindex 5b52ac26a..2f299bd89 100644--- a/frontend/src/views/Workout.jsx+++ b/frontend/src/views/Workout.jsx@@ -968,7 +968,7 @@ function ActiveWorkout() {: (c.key === 'warmupSets' ? t('Warm-up sets') : t('Rest (s)')) + ' ' + c.from + ' → ' + c.to).join(' · '),run: () => confirmSheet({title: t('Update “{0}”?', routine.name),- message: t('Copy this exercise’s warm-up sets, rest and note from this session into the routine. Your workout history is kept.'),+ message: t('Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.'),confirmText: t('Update routine'),onConfirm: () => {let applied = nulldiff --git a/frontend/src/views/Workout.test.jsx b/frontend/src/views/Workout.test.jsxindex 85a79ef5f..b61de452b 100644--- a/frontend/src/views/Workout.test.jsx+++ b/frontend/src/views/Workout.test.jsx@@ -2104,6 +2104,24 @@ describe('Update routine, from the More menu of an exercise', () => {expect(mocks.S.routines[0].ex[0]).toMatchObject({ restSec: 150, note: 'pause on the chest' })})+ it('leaves the note added for today with the workout, and says so before confirming', async () => {+ // "Add note" in the ⋯ menu is today's note (entry.note, kept with the finished workout and+ // optionally pinned for next time); the routine's own note is the one on Progression settings.+ await mount([ownEntry({ note: 'Elbows tucked' })], 0, { routines: [routine()] })+ await openMore()+ expect(item('Update routine')).toBeUndefined()+ await act(async () => { item('Add warm-up set').onClick() })+ await rerender()+ await openMore()+ expect(item('Update routine').sub).toBe('Warm-up sets 0 → 1')+ item('Update routine').onClick()+ const { message } = mocks.confirmSheet.mock.calls[0][0]+ expect(message).toMatch(/Progression settings/)+ expect(message).toMatch(/note added for today stays with this workout/)+ mocks.confirmSheet.mock.calls[0][0].onConfirm()+ expect(mocks.S.routines[0].ex[0].note).toBeUndefined()+ })+it('does not write into a workout that changed while the confirmation was open', async () => {await mount([ownEntry({ target: { mode: 'reps', reps: 5, weight: 60, restSec: 150 } })], 0, { routines: [routine()] })await openMore()