From 25ce5d9aac90b19fd8408308d11a87d9bcd6b5c3 Mon Sep 17 00:00:00 2001 From: Brandon Presley Date: Sat, 9 Jul 2022 15:37:22 +1200 Subject: [PATCH] Prevent setting timer on update --- EditSet.tsx | 53 +++++++++++++++++++++++++++++----------------------- HomePage.tsx | 6 +----- 2 files changed, 31 insertions(+), 28 deletions(-) diff --git a/EditSet.tsx b/EditSet.tsx index 8b3744b..f736211 100644 --- a/EditSet.tsx +++ b/EditSet.tsx @@ -6,37 +6,48 @@ import {DatabaseContext} from './App'; import Set from './set'; export default function EditSet({ - onSave, + onUpdate, + onCreate, set, setSet, }: { - onSave: () => void; + onUpdate: () => void; + onCreate: () => void; set?: Set; setSet: (set?: Set) => void; }) { const db = useContext(DatabaseContext); + const update = async () => { + console.log(`${EditSet.name}.${update.name}`, {set}); + await db.executeSql( + `INSERT INTO sets(name, reps, weight, created, unit) VALUES (?,?,?,?,?)`, + [ + set?.name, + set?.reps, + set?.weight, + new Date().toISOString(), + set?.unit || 'kg', + ], + ); + onUpdate(); + }; + + const create = async () => { + console.log(`${EditSet.name}.${create.name}`, {set}); + await db.executeSql( + `UPDATE sets SET name = ?, reps = ?, weight = ?, unit = ? WHERE id = ?`, + [set?.name, set?.reps, set?.weight, set?.unit, set?.id], + ); + onCreate(); + }; + const save = async () => { if (!set?.name || set?.reps === undefined || set?.weight === undefined) return; - if (!set?.id) - await db.executeSql( - `INSERT INTO sets(name, reps, weight, created, unit) VALUES (?,?,?,?,?)`, - [ - set?.name, - set?.reps, - set?.weight, - new Date().toISOString(), - set?.unit || 'kg', - ], - ); - else - await db.executeSql( - `UPDATE sets SET name = ?, reps = ?, weight = ?, unit = ? WHERE id = ?`, - [set.name, set.reps, set.weight, set.unit, set.id], - ); + if (set?.id) await update(); + else await create(); setSet(undefined); - onSave(); }; return ( @@ -100,8 +111,4 @@ const styles = StyleSheet.create({ text: { marginBottom: 10, }, - title: { - fontSize: 20, - marginBottom: 10, - }, }); diff --git a/HomePage.tsx b/HomePage.tsx index be511eb..98e611c 100644 --- a/HomePage.tsx +++ b/HomePage.tsx @@ -96,17 +96,13 @@ export default function HomePage() { refreshing={refreshing} onRefresh={refreshLoader} /> - - + setEdit({} as Set)} /> ); } const styles = StyleSheet.create({ - name: { - fontSize: 18, - }, container: { flexGrow: 1, padding: 10,