diff --git a/src/screens/ChildFollowUp/index.tsx b/src/screens/ChildFollowUp/index.tsx index 3a6115e..496e991 100644 --- a/src/screens/ChildFollowUp/index.tsx +++ b/src/screens/ChildFollowUp/index.tsx @@ -1,13 +1,11 @@ import * as S from './styles'; -import React, { useContext, useEffect, useState } from 'react'; +import React from 'react'; import AmbientCard from '@components/AmbientCard'; import { View, TouchableOpacity } from 'react-native'; import Ionicons from '@expo/vector-icons/Ionicons'; -import Bebe from '@assets/icons/Bebe.png'; import Seringa from '@assets/icons/Seringa.png'; import Graph from '@assets/icons/Graph.png'; import Trophy from '@assets/icons/Trophy.png'; -import ReminderCard from '@components/ReminderCard'; import { useChildContext } from '@hooks/useChild'; import ChildrenHeader from '@components/ChildrenHeader'; import ChildCard from '@components/ChildCard'; diff --git a/src/screens/CurvaDeCrescimento/index.tsx b/src/screens/CurvaDeCrescimento/index.tsx index 95cb8a9..1362051 100644 --- a/src/screens/CurvaDeCrescimento/index.tsx +++ b/src/screens/CurvaDeCrescimento/index.tsx @@ -58,17 +58,16 @@ const ChildGrowthScreen = ({ navigation }) => { } const findClosestPercentile = () => { - const genderData = datasets[child.gender]?.[curveType]; + const genderData = datasets[child.gender][selectedCurveType]; if (!genderData) return "N/A"; const latestData = growthData[growthData.length - 1]; - console.log("data mais recente -> ", latestData); const measure = () => { switch (curveType) { - case 'Estatura (cm)': return Number(latestData.height); - case 'Peso (kg)': return Number(latestData.weight); - case 'IMC': return Number(latestData.imc); + case 'Estatura (cm)': return latestData.height; + case 'Peso (kg)': return latestData.weight; + case 'IMC': return latestData.imc; } } @@ -106,7 +105,6 @@ const ChildGrowthScreen = ({ navigation }) => { point[percentile] = Number.parseFloat(genderData[percentile][index][percentile.toLowerCase()].replace(',', '.')); }); dataPoints.push(point); - console.log(dataPoints); }); return dataPoints; @@ -203,8 +201,7 @@ const ChildGrowthScreen = ({ navigation }) => { } } fetchData(); - console.log(childData); -}, [child, selectedCurveType, curveType]); + }, [child, selectedCurveType, curveType]); const legendData = percentiles.map((percentile, index) => ({ label: percentile, diff --git a/src/screens/EditCurve/index.tsx b/src/screens/EditCurve/index.tsx index ff38775..7bac1af 100644 --- a/src/screens/EditCurve/index.tsx +++ b/src/screens/EditCurve/index.tsx @@ -60,7 +60,7 @@ const EditCurveScreen = ({ navigation }) => { setGrowthData(sortedData); } - function onInsertClose(data: RowData) { + async function onInsertClose(data: RowData) { (async () => { await GrowthDataService.create({ childrenId: activeChild.idchildren, @@ -68,9 +68,9 @@ const EditCurveScreen = ({ navigation }) => { height: Number(data.height), growthDate: data.growthDate }); + await fetchData(); + setInsertModal(false); })(); - fetchData(); - setInsertModal(false); } async function onDelete() { @@ -89,7 +89,7 @@ const EditCurveScreen = ({ navigation }) => { }, selectedRow.id ); - fetchData(); + await fetchData(); setEditModal(false); })(); }