From 602490a5c863c0856225e0e246a79eb173472593 Mon Sep 17 00:00:00 2001 From: Minimata Date: Thu, 28 Sep 2023 13:12:09 +0200 Subject: [PATCH] vault backup: 2023-09-28 13:12:09 --- 03 - Sport/Exercises/Barbell squat.md | 2 +- 03 - Sport/Exercises/Cable row.md | 2 +- .../Exercises/Lateral dumbbell raise.md | 2 +- .../HF 6 days compound-heavy workout.md | 170 +++++++++--------- 4 files changed, 90 insertions(+), 86 deletions(-) diff --git a/03 - Sport/Exercises/Barbell squat.md b/03 - Sport/Exercises/Barbell squat.md index 309a596..f69d99b 100644 --- a/03 - Sport/Exercises/Barbell squat.md +++ b/03 - Sport/Exercises/Barbell squat.md @@ -2,7 +2,7 @@ tags: - sport/exercise --- -Name:: Squat +Name:: Barbell squat Forearms:: 0 Biceps:: 0 Triceps:: 0 diff --git a/03 - Sport/Exercises/Cable row.md b/03 - Sport/Exercises/Cable row.md index 27c2294..547d8f6 100644 --- a/03 - Sport/Exercises/Cable row.md +++ b/03 - Sport/Exercises/Cable row.md @@ -2,7 +2,7 @@ tags: - sport/exercise --- -Name:: T-Bar row +Name:: Cable row Forearms:: 0 Biceps:: 0.5 Triceps:: 0 diff --git a/03 - Sport/Exercises/Lateral dumbbell raise.md b/03 - Sport/Exercises/Lateral dumbbell raise.md index d703eca..809d91b 100644 --- a/03 - Sport/Exercises/Lateral dumbbell raise.md +++ b/03 - Sport/Exercises/Lateral dumbbell raise.md @@ -2,7 +2,7 @@ tags: - sport/exercise --- -Name:: Lateral dumbell raise +Name:: Lateral dumbbell raise Forearms:: 0 Biceps:: 0 Triceps:: 0 diff --git a/03 - Sport/HF 6 days compound-heavy workout.md b/03 - Sport/HF 6 days compound-heavy workout.md index 0d7586a..543df5c 100644 --- a/03 - Sport/HF 6 days compound-heavy workout.md +++ b/03 - Sport/HF 6 days compound-heavy workout.md @@ -10,14 +10,14 @@ This workout is meant to be high frequency (i.e. once a day, 4-7 days a week). ## Monday ```dataviewjs -let workout = [ - ["Bench press", 3], - ["T-Bar row", 3], - ["Barbell squat", 3], - ["Lateral dumbbell raise", 3], -] +let workout = { + "Bench press": 2, + "T-Bar row": 2, + "Barbell squat": 3, + "Lateral dumbbell raise": 2, +} let folderName = "03 - Sport/Exercises" -let pages = Array.from(workout, ex => `"${folderName}/${ex[0]}.md"`) +let pages = Array.from(Object.keys(workout), ex => `"${folderName}/${ex}.md"`) let pagesAsStr = pages.join(" or ") let muscleGroups = [ "Name", @@ -47,13 +47,13 @@ let muscleGroups = [ dv.table(muscleGroups, dv.pages(pagesAsStr) - .map(ex => Array.from(muscleGroups, group => console.log(ex)))) + .map(ex => Array.from(muscleGroups, group => ex[group] > 0 ? ex[group]*workout[ex.name] : ex[group]))) let totals = muscleGroups.reduce((ac,a) => ({...ac,[a]:0}),{}); dv.pages(pagesAsStr) .map(ex => Array.from(muscleGroups, - group => totals[group] += ex[group])) + group => totals[group] += ex[group] > 0 ? ex[group]*workout[ex.name] : ex[group])) totals.Name = "Totals" dv.table(muscleGroups, [Object.values(totals)]) @@ -62,14 +62,14 @@ dv.table(muscleGroups, [Object.values(totals)]) ## Tuesday ```dataviewjs -let workout = [ - "Pullup", - "Dip", - "Barbell military press", - "Leg press - wide stance", -] +let workout = { + "Pullup": 2, + "Dip": 2, + "Barbell military press": 2, + "Leg press - wide stance": 2, +} let folderName = "03 - Sport/Exercises" -let pages = Array.from(workout, ex => `"${folderName}/${ex}.md"`) +let pages = Array.from(Object.keys(workout), ex => `"${folderName}/${ex}.md"`) let pagesAsStr = pages.join(" or ") let muscleGroups = [ "Name", @@ -98,7 +98,7 @@ let muscleGroups = [ dv.table(muscleGroups, dv.pages(pagesAsStr) - .map(ex => Array.from(muscleGroups, group => ex[group]))) + .map(ex => Array.from(muscleGroups, group => ex[group] > 0 ? ex[group]*workout[ex.name] : ex[group]))) let totals = muscleGroups.reduce((ac,a) => ({...ac,[a]:0}),{}); @@ -112,14 +112,14 @@ dv.table(muscleGroups, [Object.values(totals)]) ## Wednesday ```dataviewjs -let workout = [ - "Triceps overhead extension", - "Biceps dumbbell curl", - "Leg abduction machine", - "Leg adduction machine", -] +let workout = { + "Triceps overhead extension": 2, + "Biceps dumbbell curl": 2, + "Leg abduction machine": 2, + "Leg adduction machine": 2, +} let folderName = "03 - Sport/Exercises" -let pages = Array.from(workout, ex => `"${folderName}/${ex}.md"`) +let pages = Array.from(Object.keys(workout), ex => `"${folderName}/${ex}.md"`) let pagesAsStr = pages.join(" or ") let muscleGroups = [ "Name", @@ -148,13 +148,13 @@ let muscleGroups = [ dv.table(muscleGroups, dv.pages(pagesAsStr) - .map(ex => Array.from(muscleGroups, group => ex[group]))) + .map(ex => Array.from(muscleGroups, group => ex[group] > 0 ? ex[group]*workout[ex.name] : ex[group]))) let totals = muscleGroups.reduce((ac,a) => ({...ac,[a]:0}),{}); dv.pages(pagesAsStr) .map(ex => Array.from(muscleGroups, - group => totals[group] += ex[group])) + group => totals[group] += ex[group] > 0 ? ex[group]*workout[ex.name] : ex[group])) totals.Name = "Totals" dv.table(muscleGroups, [Object.values(totals)]) @@ -162,14 +162,14 @@ dv.table(muscleGroups, [Object.values(totals)]) ## Thursday ```dataviewjs -let workout = [ - "Pushup", - "Cable row", - "Deadlift", - "Face pull", -] +let workout = { + "Pushup": 3, + "Cable row": 3, + "Deadlift": 3, + "Face pull": 3, +} let folderName = "03 - Sport/Exercises" -let pages = Array.from(workout, ex => `"${folderName}/${ex}.md"`) +let pages = Array.from(Object.keys(workout), ex => `"${folderName}/${ex}.md"`) let pagesAsStr = pages.join(" or ") let muscleGroups = [ "Name", @@ -198,12 +198,12 @@ let muscleGroups = [ dv.table(muscleGroups, dv.pages(pagesAsStr) - .map(ex => Array.from(muscleGroups, group => ex[group]))) + .map(ex => Array.from(muscleGroups, group => ex[group] > 0 ? ex[group]*workout[ex.name] : ex[group]))) let totals = muscleGroups.reduce((ac,a) => ({...ac,[a]:0}),{}); dv.pages(pagesAsStr) .map(ex => Array.from(muscleGroups, - group => totals[group] += ex[group])) + group => totals[group] += ex[group] > 0 ? ex[group]*workout[ex.name] : ex[group])) totals.Name = "Totals" dv.table(muscleGroups, [Object.values(totals)]) @@ -211,14 +211,14 @@ dv.table(muscleGroups, [Object.values(totals)]) ## Friday ```dataviewjs -let workout = [ - "Incline bench press", - "Lat pulldown", - "Leg extension machine", - "Leg curl machine", -] +let workout = { + "Incline bench press": 2, + "Lat pulldown": 2, + "Leg extension machine": 2, + "Leg curl machine": 2, +} let folderName = "03 - Sport/Exercises" -let pages = Array.from(workout, ex => `"${folderName}/${ex}.md"`) +let pages = Array.from(Object.keys(workout), ex => `"${folderName}/${ex}.md"`) let pagesAsStr = pages.join(" or ") let muscleGroups = [ "Name", @@ -248,12 +248,12 @@ let muscleGroups = [ dv.table(muscleGroups, dv.pages(pagesAsStr) - .map(ex => Array.from(muscleGroups, group => ex[group]))) + .map(ex => Array.from(muscleGroups, group => ex[group] > 0 ? ex[group]*workout[ex.name] : ex[group]))) let totals = muscleGroups.reduce((ac,a) => ({...ac,[a]:0}),{}); dv.pages(pagesAsStr) .map(ex => Array.from(muscleGroups, - group => totals[group] += ex[group])) + group => totals[group] += ex[group] > 0 ? ex[group]*workout[ex.name] : ex[group])) totals.Name = "Totals" dv.table(muscleGroups, [Object.values(totals)]) @@ -261,16 +261,16 @@ dv.table(muscleGroups, [Object.values(totals)]) ## Saturday ```dataviewjs -let workout = [ - "Chest press machine", - "High rows machine", - "Side delts machine", - "Leg press - narrow stance", - "Hip thrust", - "Calf machine raise", -] +let workout = { + "Chest press machine": 3, + "High rows machine": 3, + "Side delts machine": 3, + "Leg press - narrow stance": 3, + "Hip thrust": 3, + "Calf machine raise": 3, +} let folderName = "03 - Sport/Exercises" -let pages = Array.from(workout, ex => `"${folderName}/${ex}.md"`) +let pages = Array.from(Object.keys(workout), ex => `"${folderName}/${ex}.md"`) let pagesAsStr = pages.join(" or ") let muscleGroups = [ "Name", @@ -299,13 +299,13 @@ let muscleGroups = [ dv.table(muscleGroups, dv.pages(pagesAsStr) - .map(ex => Array.from(muscleGroups, group => ex[group]))) + .map(ex => Array.from(muscleGroups, group => ex[group] > 0 ? ex[group]*workout[ex.name] : ex[group]))) let totals = muscleGroups.reduce((ac,a) => ({...ac,[a]:0}),{}); dv.pages(pagesAsStr) .map(ex => Array.from(muscleGroups, - group => totals[group] += ex[group])) + group => totals[group] += ex[group] > 0 ? ex[group]*workout[ex.name] : ex[group])) totals.Name = "Totals" dv.table(muscleGroups, [Object.values(totals)]) @@ -314,34 +314,38 @@ dv.table(muscleGroups, [Object.values(totals)]) # Total volume ```dataviewjs -let workout = [ - "Bench press", - "T-Bar row", - "Barbell squat", - "Lateral dumbbell raise", - "Pullup", - "Dip", - "Barbell military press", - "Leg press - wide stance", - "Triceps overhead extension", - "Biceps dumbbell curl", - "Leg abduction machine", - "Leg adduction machine", - "Pushup", - "Cable row", - "Deadlift", - "Face pull", - "Incline bench press", - "Lat pulldown", - "Leg extension machine", - "Leg curl machine", - "Chest press machine", - "High rows machine", - "Side delts machine", - "Leg press - narrow stance", - "Hip thrust", - "Calf machine raise", -] +let workout = { + "Bench press": 2, + "T-Bar row": 2, + "Barbell squat": 3, + "Lateral dumbbell raise": 2, + "Pullup": 2, + "Dip": 2, + "Barbell military press": 2, + "Leg press - wide stance": 2, + "Triceps overhead extension": 2, + "Biceps dumbbell curl": 2, + "Leg abduction machine": 2, + "Leg adduction machine": 2, + "Triceps overhead extension": 2, + "Biceps dumbbell curl": 2, + "Leg abduction machine": 2, + "Leg adduction machine": 2, + "Pushup": 3, + "Cable row": 3, + "Deadlift": 3, + "Face pull": 3, + "Incline bench press": 2, + "Lat pulldown": 2, + "Leg extension machine": 2, + "Leg curl machine": 2, + "Chest press machine": 3, + "High rows machine": 3, + "Side delts machine": 3, + "Leg press - narrow stance": 3, + "Hip thrust": 3, + "Calf machine raise": 3, +} let folderName = "03 - Sport/Exercises" let pages = Array.from(workout, ex => `"${folderName}/${ex}.md"`) let pagesAsStr = pages.join(" or ")