diff --git a/03 - Sport/HF 6 days minimalist workout.md b/03 - Sport/HF 6 days minimalist workout.md index 5a7b4a6..e24746d 100644 --- a/03 - Sport/HF 6 days minimalist workout.md +++ b/03 - Sport/HF 6 days minimalist 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", - "T-Bar row", - "Barbell squat", - "Lateral dumbbell raise" -] +let workout = { + "Bench press": 2, + "T-Bar row": 2, + "Barbell squat": 3, + "Lateral dumbbell 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", @@ -44,11 +44,10 @@ let muscleGroups = [ "Calves" ] - let totals = muscleGroups.reduce((ac,a) => ({...ac,[a]:0}),{}); -console.log(dv.pages(pagesAsStr) - .map(ex => Array.from(muscleGroups, - group => totals[group] += ex[group]))) +dv.pages(pagesAsStr) + .map(ex => Array.from(muscleGroups, + group => totals[group] += ex[group] > 0 ? ex[group]*workout[ex.name] : ex[group])) totals.Name = "Totals" dv.table(muscleGroups, [Object.values(totals)]) @@ -57,14 +56,14 @@ dv.table(muscleGroups, [Object.values(totals)]) ## Tuesday ```dataviewjs -let workout = [ - "Triceps overhead extension", - "Biceps dumbbell curl", - "Leg abduction machine", - "Leg adduction machine", -] +let workout = { + "Triceps overhead extension": 3, + "Biceps dumbbell curl": 3, + "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", @@ -93,9 +92,9 @@ let muscleGroups = [ let totals = muscleGroups.reduce((ac,a) => ({...ac,[a]:0}),{}); -console.log(dv.pages(pagesAsStr) - .map(ex => Array.from(muscleGroups, - group => totals[group] += ex[group]))) +dv.pages(pagesAsStr) + .map(ex => Array.from(muscleGroups, + group => totals[group] += ex[group] > 0 ? ex[group]*workout[ex.name] : ex[group])) totals.Name = "Totals" dv.table(muscleGroups, [Object.values(totals)]) @@ -103,14 +102,14 @@ dv.table(muscleGroups, [Object.values(totals)]) ## Wednesday ```dataviewjs -let workout = [ - "Pullup", - "Pushup", - "Deadlift", - "Face pull", -] +let workout = { + "Pullup": 3, + "Pushup": 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", @@ -139,9 +138,9 @@ let muscleGroups = [ let totals = muscleGroups.reduce((ac,a) => ({...ac,[a]:0}),{}); -console.log(dv.pages(pagesAsStr) - .map(ex => Array.from(muscleGroups, - group => totals[group] += ex[group]))) +dv.pages(pagesAsStr) + .map(ex => Array.from(muscleGroups, + group => totals[group] += ex[group] > 0 ? ex[group]*workout[ex.name] : ex[group])) totals.Name = "Totals" dv.table(muscleGroups, [Object.values(totals)]) @@ -149,14 +148,14 @@ dv.table(muscleGroups, [Object.values(totals)]) ## Thursday ```dataviewjs -let workout = [ - "Ab crunch machine", - "Egyptian raise", - "Leg extension machine", - "Leg curl machine" -] +let workout = { + "Ab crunch machine": 2, + "Egyptian raise": 2, + "Leg extension machine": 3, + "Leg curl machine": 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", @@ -183,11 +182,10 @@ let muscleGroups = [ "Calves" ] - let totals = muscleGroups.reduce((ac,a) => ({...ac,[a]:0}),{}); -console.log(dv.pages(pagesAsStr) - .map(ex => Array.from(muscleGroups, - group => totals[group] += ex[group]))) +dv.pages(pagesAsStr) + .map(ex => Array.from(muscleGroups, + group => totals[group] += ex[group] > 0 ? ex[group]*workout[ex.name] : ex[group])) totals.Name = "Totals" dv.table(muscleGroups, [Object.values(totals)]) @@ -195,14 +193,14 @@ dv.table(muscleGroups, [Object.values(totals)]) ## Friday ```dataviewjs -let workout = [ - "Pec dec", - "Reverse pec dec", - "Rope lat pushdown", - "Side ab machine", -] +let workout = { + "Pec dec": 3, + "Reverse pec dec": 3, + "Rope lat pushdown": 3, + "Side ab machine": 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", @@ -231,9 +229,9 @@ let muscleGroups = [ let totals = muscleGroups.reduce((ac,a) => ({...ac,[a]:0}),{}); -console.log(dv.pages(pagesAsStr) - .map(ex => Array.from(muscleGroups, - group => totals[group] += ex[group]))) +dv.pages(pagesAsStr) + .map(ex => Array.from(Object.keys(workout), + group => totals[group] += ex[group] > 0 ? ex[group]*workout[ex.name] : ex[group])) totals.Name = "Totals" dv.table(muscleGroups, [Object.values(totals)]) @@ -241,15 +239,15 @@ dv.table(muscleGroups, [Object.values(totals)]) ## Saturday ```dataviewjs -let workout = [ - "Barbell military press", - "Leg press - narrow stance", - "Hip thrust", - "Cable curl", - "Calf machine raise" -] +let workout = { + "Leg press - narrow stance": 2, + "Hip thrust": 2, + "Barbell military press": 2, + "Cable curl": 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", @@ -278,9 +276,9 @@ let muscleGroups = [ let totals = muscleGroups.reduce((ac,a) => ({...ac,[a]:0}),{}); -console.log(dv.pages(pagesAsStr) - .map(ex => Array.from(muscleGroups, - group => totals[group] += ex[group]))) +dv.pages(pagesAsStr) + .map(ex => Array.from(muscleGroups, + group => totals[group] += ex[group] > 0 ? ex[group]*workout[ex.name] : ex[group])) totals.Name = "Totals" dv.table(muscleGroups, [Object.values(totals)]) @@ -345,9 +343,9 @@ let muscleGroups = [ ] let totals = muscleGroups.reduce((ac,a) => ({...ac,[a]:0}),{}); -console.log(dv.pages(pagesAsStr) - .map(ex => Array.from(muscleGroups, - group => totals[group] += ex[group]))) +dv.pages(pagesAsStr) + .map(ex => Array.from(muscleGroups, + group => totals[group] += ex[group] > 0 ? ex[group]*workout[ex.name] : ex[group])) totals.Name = "Totals" dv.table(muscleGroups, [Object.values(totals)])