Skip to content

Health section #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vem882 merged 8 commits into from
Feb 1, 2026
Merged

Health section #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8f9d2d6
added buttons to edit & delete visits, medications, vaccinations and …
SamppaLHT Jan 29, 2026
1f2750f
moved styles to screenStyles file to be uniform with rest of the arch…
SamppaLHT Jan 29, 2026
8589522
Pets nappi home screenissä vie Pets sivulle
SamppaLHT Jan 29, 2026
2030183
Service files created for all visits, medications, weights, vaccinati…
SamppaLHT Jan 29, 2026
a8d79d7
deletion and edit functionalities implemented to visit, medication, v…
SamppaLHT Jan 29, 2026
51fb3b8
fix to automatically select the visit tyoe during edit
SamppaLHT Jan 29, 2026
0905480
deletion & edit functions tested and fixed for all visits, medication…
SamppaLHT Jan 29, 2026
d6ea425
poiston varmistamisen dialogin yleisnäkö yhtäläiseksi kaikissa neljäs…
SamppaLHT Jan 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions mobile/src/navigation/Navigation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,22 @@ export default function Navigation() {
headerBackTitle: 'Takaisin',
}}
/>
<Stack.Screen
name="Settings"
component={SettingsScreen}
options={{
title: 'Asetukset',
headerBackTitle: 'Takaisin',
}}
/>
<Stack.Screen
name="Pets"
component={PetsScreen}
options={{
title: 'Lemmikit',
headerBackTitle: 'Takaisin',
}}
/>
</>
) : (
<>
Expand Down
28 changes: 8 additions & 20 deletions mobile/src/screens/HealthScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,41 +37,29 @@ export default function HealthScreen() {
<View style={styles.content}>
<Card style={styles.card} onPress={() => navigation.navigate('Visits' as never)}>
<Card.Content style={{ alignItems: 'center' }}>
<MaterialCommunityIcons name="hospital-building" size={64} color={COLORS.primary} />
<Text variant="titleLarge" style={{ marginTop: SPACING.md }}>Käynnit</Text>
<Text variant="bodyMedium" style={[styles.cardText, { textAlign: 'center' }]}>
Eläinlääkäri- ja klinikkakäynnit
</Text>
<MaterialCommunityIcons name="hospital-building" size={86} color={COLORS.primary} />
<Text variant="titleMedium" style={{ marginTop: SPACING.md }}>Käynnit</Text>
</Card.Content>
</Card>

<Card style={styles.card} onPress={() => navigation.navigate('Medications' as never)}>
<Card.Content style={{ alignItems: 'center' }}>
<MaterialCommunityIcons name="pill" size={64} color={COLORS.primary} />
<Text variant="titleLarge" style={{ marginTop: SPACING.md }}>Lääkitykset</Text>
<Text variant="bodyMedium" style={[styles.cardText, { textAlign: 'center' }]}>
Lääkkeet ja hoito-ohjelmat
</Text>
<MaterialCommunityIcons name="pill" size={86} color={COLORS.primary} />
<Text variant="titleMedium" style={{ marginTop: SPACING.md }}>Lääkitykset</Text>
</Card.Content>
</Card>

<Card style={styles.card} onPress={() => navigation.navigate('Vaccinations' as never)}>
<Card.Content style={{ alignItems: 'center' }}>
<MaterialCommunityIcons name="needle" size={64} color={COLORS.primary} />
<Text variant="titleLarge" style={{ marginTop: SPACING.md }}>Rokotukset</Text>
<Text variant="bodyMedium" style={[styles.cardText, { textAlign: 'center' }]}>
Rokotushistoria ja muistutukset
</Text>
<MaterialCommunityIcons name="needle" size={86} color={COLORS.primary} />
<Text variant="titleMedium" style={{ marginTop: SPACING.md }}>Rokotukset</Text>
</Card.Content>
</Card>

<Card style={styles.card} onPress={() => navigation.navigate('WeightManagement' as never)}>
<Card.Content style={{ alignItems: 'center' }}>
<MaterialCommunityIcons name="scale-bathroom" size={64} color={COLORS.primary} />
<Text variant="titleLarge" style={{ marginTop: SPACING.md }}>Painonhallinta</Text>
<Text variant="bodyMedium" style={[styles.cardText, { textAlign: 'center' }]}>
Seuraa painoa ja kasvua
</Text>
<MaterialCommunityIcons name="scale-bathroom" size={86} color={COLORS.primary} />
<Text variant="titleMedium" style={{ marginTop: SPACING.md }}>Paino</Text>
</Card.Content>
</Card>
</View>
Expand Down
4 changes: 2 additions & 2 deletions mobile/src/screens/HomeScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export default function HomeScreen() {
</View>

<View style={styles.content}>
<Card style={styles.card} onPress={() => console.log('Lemmikki')}>
<Card style={styles.card} onPress={() => navigation.navigate('Pets' as never)}>
<Card.Content style={{ alignItems: 'center' }}>
<MaterialCommunityIcons name="paw" size={64} color={COLORS.primary} />
<Text variant="titleLarge" style={{ marginTop: SPACING.md }}>Lemmikki</Text>
Expand Down Expand Up @@ -112,7 +112,7 @@ export default function HomeScreen() {
</Card.Content>
</Card>

<Card style={styles.card} onPress={() => console.log('Asetukset')}>
<Card style={styles.card} onPress={() => navigation.navigate('Settings' as never)}>
<Card.Content style={{ alignItems: 'center' }}>
<MaterialCommunityIcons name="cog" size={64} color={COLORS.primary} />
<Text variant="titleLarge" style={{ marginTop: SPACING.md }}>Asetukset</Text>
Expand Down
4 changes: 2 additions & 2 deletions mobile/src/screens/MapScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ export default function MapScreen() {
// TODO: Hae lemmikit backendistä
// Väliaikaisesti kovakoodatut lemmikit
setPets([
{ id: '1', name: 'Macho', breed: 'Akita', age: 12, weight: 44, dateOfBirth: '2013-10-01' },
{ id: '2', name: 'Mirri', breed: 'Sekarotuinen', age: 2, weight: 15, dateOfBirth: '2022-06-15' },
{ id: 1, name: 'Macho', breed: 'Akita', age: 12, weight: 44, dateOfBirth: '2013-10-01' },
{ id: 2, name: 'Mirri', breed: 'Sekarotuinen', age: 2, weight: 15, dateOfBirth: '2022-06-15' },
]);

// Hae käyttäjän sijainti heti
Expand Down
Loading
Loading