parent
3be82e0b36
commit
97827c68b2
|
@ -11,7 +11,7 @@ import MassiveInput from './MassiveInput';
|
|||
import {useSnackbar} from './MassiveSnack';
|
||||
import {PlanPageParams} from './plan-page-params';
|
||||
import Set from './set';
|
||||
import {addSet, countManyToday, getDistinctSets} from './set.service';
|
||||
import {addSet, countMany} from './set.service';
|
||||
import SetForm from './SetForm';
|
||||
import StackHeader from './StackHeader';
|
||||
import {useSettings} from './use-settings';
|
||||
|
@ -30,7 +30,6 @@ export default function StartPlan() {
|
|||
const [selected, setSelected] = useState(0);
|
||||
const {settings} = useSettings();
|
||||
const [counts, setCounts] = useState<CountMany[]>();
|
||||
const [distinctSets, setDistinctSets] = useState<Set[]>();
|
||||
const weightRef = useRef<TextInput>(null);
|
||||
const repsRef = useRef<TextInput>(null);
|
||||
const unitRef = useRef<TextInput>(null);
|
||||
|
@ -44,16 +43,10 @@ export default function StartPlan() {
|
|||
|
||||
useFocusEffect(
|
||||
useCallback(() => {
|
||||
countManyToday().then(newCounts => {
|
||||
countMany(workouts).then(newCounts => {
|
||||
setCounts(newCounts);
|
||||
console.log(`${StartPlan.name}.focus:`, {newCounts});
|
||||
});
|
||||
getDistinctSets({limit: 100, offset: 0, search: '%'}).then(
|
||||
newDistinct => {
|
||||
setDistinctSets(newDistinct);
|
||||
console.log(`${StartPlan.name}.focus:`, {newDistinct});
|
||||
},
|
||||
);
|
||||
}, [params]),
|
||||
);
|
||||
|
||||
|
@ -69,7 +62,7 @@ export default function StartPlan() {
|
|||
image: set.image,
|
||||
unit,
|
||||
});
|
||||
countManyToday().then(setCounts);
|
||||
countMany(workouts).then(setCounts);
|
||||
if (
|
||||
settings.notify &&
|
||||
(+weight > best.weight || (+reps > best.reps && +weight === best.weight))
|
||||
|
@ -110,20 +103,6 @@ export default function StartPlan() {
|
|||
[name, workouts],
|
||||
);
|
||||
|
||||
const getDescription = useCallback(
|
||||
(countName: string) => {
|
||||
const count = counts?.find(c => c.name === countName);
|
||||
console.log(`${StartPlan.name}:`, {count, countName});
|
||||
if (!distinctSets) return;
|
||||
const distinct = distinctSets.find(d => d.name === countName);
|
||||
console.log(`${StartPlan.name}:`, {distinct});
|
||||
if (settings.showSets)
|
||||
return `${count?.total || 0} / ${distinct?.sets || 3}`;
|
||||
return count?.total || '0';
|
||||
},
|
||||
[counts, distinctSets, settings.showSets],
|
||||
);
|
||||
|
||||
return (
|
||||
<>
|
||||
<StackHeader title={params.plan.days.replace(/,/g, ', ')} />
|
||||
|
@ -157,13 +136,17 @@ export default function StartPlan() {
|
|||
innerRef={unitRef}
|
||||
/>
|
||||
)}
|
||||
{counts && distinctSets && (
|
||||
{counts && (
|
||||
<FlatList
|
||||
data={workouts}
|
||||
data={counts}
|
||||
renderItem={({item, index}) => (
|
||||
<List.Item
|
||||
title={item}
|
||||
description={getDescription(item)}
|
||||
title={item.name}
|
||||
description={
|
||||
settings.showSets
|
||||
? `${item.total} / ${item.sets ?? 3}`
|
||||
: item.total
|
||||
}
|
||||
onPress={() => select(index)}
|
||||
left={() => (
|
||||
<View
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
export default interface CountMany {
|
||||
name: string;
|
||||
total: number;
|
||||
sets?: number;
|
||||
}
|
||||
|
|
|
@ -166,14 +166,18 @@ export const countToday = async (name: string): Promise<number> => {
|
|||
return Number(result.rows.item(0)?.total);
|
||||
};
|
||||
|
||||
export const countManyToday = async (): Promise<CountMany[]> => {
|
||||
export const countMany = async (names: string[]): Promise<CountMany[]> => {
|
||||
const questions = names.map(_ => '?').join(',');
|
||||
const select = `
|
||||
SELECT COUNT(*) as total, name FROM sets
|
||||
WHERE created LIKE strftime('%Y-%m-%d%%', 'now', 'localtime')
|
||||
SELECT workouts.name, COUNT(sets.id) as total, sets.sets
|
||||
FROM (SELECT distinct name FROM sets) workouts
|
||||
LEFT JOIN sets ON sets.name = workouts.name
|
||||
AND sets.created LIKE STRFTIME('%Y-%m-%d%%', 'now', 'localtime')
|
||||
AND NOT hidden
|
||||
GROUP BY name
|
||||
WHERE sets.name IN (${questions})
|
||||
GROUP BY workouts.name;
|
||||
`;
|
||||
const [result] = await db.executeSql(select);
|
||||
const [result] = await db.executeSql(select, names);
|
||||
return result.rows.raw();
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user