fix: plaats voorlaatste meting boven laatste, fix MeasurementRow onPress in History
This commit is contained in:
parent
73d327f914
commit
86d6cde478
2 changed files with 17 additions and 16 deletions
|
|
@ -30,6 +30,19 @@ export default function LatestMeasurementCard({ measurements }: Props) {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View style={styles.card}>
|
<View style={styles.card}>
|
||||||
|
{previous && (
|
||||||
|
<View style={styles.previous}>
|
||||||
|
<Text style={styles.previousTitle}>Voorlaatste meting</Text>
|
||||||
|
<Text style={styles.previousDate}>
|
||||||
|
{new Date(previous.measuredAt).toLocaleDateString('nl-NL')} — {previous.weight.toFixed(1)} kg
|
||||||
|
</Text>
|
||||||
|
<Text style={styles.diffLabel}>
|
||||||
|
Verschil {diff !== null && (diff > 0 ? '+' : '')}{diff?.toFixed(1)} kg
|
||||||
|
</Text>
|
||||||
|
<View style={styles.divider} />
|
||||||
|
</View>
|
||||||
|
)}
|
||||||
|
|
||||||
<Text style={styles.title}>Laatste meting</Text>
|
<Text style={styles.title}>Laatste meting</Text>
|
||||||
<Text style={styles.date}>{new Date(latest.measuredAt).toLocaleDateString('nl-NL')}</Text>
|
<Text style={styles.date}>{new Date(latest.measuredAt).toLocaleDateString('nl-NL')}</Text>
|
||||||
{rows.map(r => (
|
{rows.map(r => (
|
||||||
|
|
@ -43,19 +56,6 @@ export default function LatestMeasurementCard({ measurements }: Props) {
|
||||||
</Text>
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
))}
|
))}
|
||||||
|
|
||||||
{previous && (
|
|
||||||
<View style={styles.previous}>
|
|
||||||
<View style={styles.divider} />
|
|
||||||
<Text style={styles.previousTitle}>Voorlaatste meting</Text>
|
|
||||||
<Text style={styles.previousDate}>
|
|
||||||
{new Date(previous.measuredAt).toLocaleDateString('nl-NL')} — {previous.weight.toFixed(1)} kg
|
|
||||||
</Text>
|
|
||||||
<Text style={styles.diffLabel}>
|
|
||||||
Verschil {diff !== null && (diff > 0 ? '+' : '')}{diff?.toFixed(1)} kg
|
|
||||||
</Text>
|
|
||||||
</View>
|
|
||||||
)}
|
|
||||||
</View>
|
</View>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -85,9 +85,10 @@ export default function HistoryScreen({ navigation }: Props) {
|
||||||
data={measurements}
|
data={measurements}
|
||||||
keyExtractor={item => item.id}
|
keyExtractor={item => item.id}
|
||||||
renderItem={({ item }) => (
|
renderItem={({ item }) => (
|
||||||
<TouchableOpacity onPress={() => navigation.navigate('MeasurementDetail', { measurementId: item.id })}>
|
<MeasurementRow
|
||||||
<MeasurementRow measurement={item} />
|
measurement={item}
|
||||||
</TouchableOpacity>
|
onPress={() => navigation.navigate('MeasurementDetail', { measurementId: item.id })}
|
||||||
|
/>
|
||||||
)}
|
)}
|
||||||
contentContainerStyle={measurements.length === 0 ? styles.empty : undefined}
|
contentContainerStyle={measurements.length === 0 ? styles.empty : undefined}
|
||||||
ListEmptyComponent={<Text style={styles.emptyText}>Nog geen metingen</Text>}
|
ListEmptyComponent={<Text style={styles.emptyText}>Nog geen metingen</Text>}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue