Fix counting current progress in a workout
This commit is contained in:
parent
8c2f162ab4
commit
235b806eeb
|
@ -26,7 +26,8 @@ export default function EditSet() {
|
||||||
console.log(`${EditSet.name}.focus:`, set);
|
console.log(`${EditSet.name}.focus:`, set);
|
||||||
let title = 'Create set';
|
let title = 'Create set';
|
||||||
if (typeof set.id === 'number') title = 'Edit 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({
|
navigation.getParent()?.setOptions({
|
||||||
headerLeft: () => (
|
headerLeft: () => (
|
||||||
<IconButton icon="arrow-back" onPress={() => navigation.goBack()} />
|
<IconButton icon="arrow-back" onPress={() => navigation.goBack()} />
|
||||||
|
|
10
SetList.tsx
10
SetList.tsx
|
@ -38,20 +38,24 @@ export default function SetList() {
|
||||||
if (todaysPlan.length === 0) return;
|
if (todaysPlan.length === 0) return;
|
||||||
const todaysSet = await getToday();
|
const todaysSet = await getToday();
|
||||||
const todaysWorkouts = todaysPlan[0].workouts.split(',');
|
const todaysWorkouts = todaysPlan[0].workouts.split(',');
|
||||||
|
setWorkouts(todaysWorkouts);
|
||||||
let workout = todaysWorkouts[0];
|
let workout = todaysWorkouts[0];
|
||||||
let best = await getBestSet(workout);
|
let best = await getBestSet(workout);
|
||||||
|
console.log({todaysSet, todaysWorkouts, todaysPlan});
|
||||||
if (todaysSet && todaysWorkouts.includes(todaysSet.name)) {
|
if (todaysSet && todaysWorkouts.includes(todaysSet.name)) {
|
||||||
const _count = await countToday(todaysSet.name);
|
let _count = await countToday(todaysSet.name);
|
||||||
workout = todaysSet.name;
|
workout = todaysSet.name;
|
||||||
best = await getBestSet(workout);
|
best = await getBestSet(workout);
|
||||||
const index = todaysWorkouts.indexOf(todaysSet.name) + 1;
|
const index = todaysWorkouts.indexOf(todaysSet.name) + 1;
|
||||||
if (_count >= Number(best.sets))
|
if (_count >= Number(best.sets)) {
|
||||||
best = await getBestSet(todaysWorkouts[index]);
|
best = await getBestSet(todaysWorkouts[index]);
|
||||||
|
_count = 0;
|
||||||
|
}
|
||||||
if (best.name === '') setCount(0);
|
if (best.name === '') setCount(0);
|
||||||
else setCount(_count);
|
else setCount(_count);
|
||||||
}
|
}
|
||||||
|
console.log({best});
|
||||||
setSet({...best});
|
setSet({...best});
|
||||||
setWorkouts(todaysWorkouts);
|
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const refresh = useCallback(async () => {
|
const refresh = useCallback(async () => {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user