Fix unit sometimes exporting as the string 'null'

This commit is contained in:
Brandon Presley 2022-10-30 15:14:57 +13:00
parent 2ae9d2a4c1
commit 992b3d0ba6
2 changed files with 14 additions and 5 deletions

View File

@ -8,6 +8,7 @@ import {DrawerParamList} from './drawer-param-list';
import {useSnackbar} from './MassiveSnack'; import {useSnackbar} from './MassiveSnack';
import {Plan} from './plan'; import {Plan} from './plan';
import {addPlans, deletePlans, getAllPlans} from './plan.service'; import {addPlans, deletePlans, getAllPlans} from './plan.service';
import Set from './set';
import {addSets, deleteSets, getAllSets} from './set.service'; import {addSets, deleteSets, getAllSets} from './set.service';
import {write} from './write'; import {write} from './write';
@ -25,9 +26,15 @@ export default function DrawerMenu({name}: {name: keyof DrawerParamList}) {
const sets = await getAllSets(); const sets = await getAllSets();
const data = [setFields] const data = [setFields]
.concat( .concat(
sets.map( sets.map(set =>
set => setFields
`${set.id},${set.name},${set.reps},${set.weight},${set.created},${set.unit},${set.hidden},${set.sets},${set.minutes},${set.seconds}`, .split(',')
.map(fieldString => {
const field = fieldString as keyof Set;
if (field === 'unit') return set[field] || 'kg';
return set[field];
})
.join(','),
), ),
) )
.join('\n'); .join('\n');
@ -61,7 +68,7 @@ export default function DrawerMenu({name}: {name: keyof DrawerParamList}) {
.slice(1) .slice(1)
.filter(line => line) .filter(line => line)
.map(set => { .map(set => {
const [ let [
, ,
setName, setName,
reps, reps,
@ -73,6 +80,8 @@ export default function DrawerMenu({name}: {name: keyof DrawerParamList}) {
minutes, minutes,
seconds, seconds,
] = set.split(','); ] = set.split(',');
unit = unit || 'kg';
hidden = hidden || '0';
return `('${setName}',${reps},${weight},'${created}','${unit}',${hidden},${ return `('${setName}',${reps},${weight},'${created}','${unit}',${hidden},${
sets ?? 3 sets ?? 3
},${minutes ?? 3},${seconds ?? 30})`; },${minutes ?? 3},${seconds ?? 30})`;

View File

@ -31,7 +31,7 @@ export default function SetList() {
limit, limit,
offset: 0, offset: 0,
}); });
console.log(`${SetList.name}.refresh:`, {first: newSets[0]}); console.log(`${SetList.name}.refresh:`, {newSets});
if (newSets.length === 0) return setSets([]); if (newSets.length === 0) return setSets([]);
setSets(newSets); setSets(newSets);
setOffset(0); setOffset(0);