brandon.presley/Massive
brandon.presley
/
Massive
4
8
Fork 3
Code Issues 14 Pull Requests 1 Activity

Fix counting current progress in a workout

This commit is contained in:
Brandon Presley 2022-09-25 19:06:16 +13:00
parent 8c2f162ab4
commit 235b806eeb
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
EditSet.tsx
View File

@ -26,7 +26,8 @@ export default function EditSet() {
console.log(`${EditSet.name}.focus:`, set);
let title = 'Create set';
if (typeof set.id === 'number') title = 'Edit set';
else if (count > 0) title = `${set.name} (${count + 1} / ${set.sets})`;
else if (Number(set.sets) > 0)
title = `${set.name} (${count + 1} / ${set.sets})`;
navigation.getParent()?.setOptions({
headerLeft: () => (
<IconButton icon="arrow-back" onPress={() => navigation.goBack()} />

10
SetList.tsx
View File

@ -38,20 +38,24 @@ export default function SetList() {
if (todaysPlan.length === 0) return;
const todaysSet = await getToday();
const todaysWorkouts = todaysPlan[0].workouts.split(',');
setWorkouts(todaysWorkouts);
let workout = todaysWorkouts[0];
let best = await getBestSet(workout);
console.log({todaysSet, todaysWorkouts, todaysPlan});
if (todaysSet && todaysWorkouts.includes(todaysSet.name)) {
const _count = await countToday(todaysSet.name);
let _count = await countToday(todaysSet.name);
workout = todaysSet.name;
best = await getBestSet(workout);
const index = todaysWorkouts.indexOf(todaysSet.name) + 1;
if (_count >= Number(best.sets))
if (_count >= Number(best.sets)) {
best = await getBestSet(todaysWorkouts[index]);
_count = 0;
}
if (best.name === '') setCount(0);
else setCount(_count);
}
console.log({best});
setSet({...best});
setWorkouts(todaysWorkouts);
}, []);
const refresh = useCallback(async () => {