diff --git a/src/lib/components/AggregatedFood/AggregatedFoodComp.svelte b/src/lib/components/AggregatedFood/AggregatedFoodComp.svelte
index 6fcbd72..24ca740 100644
--- a/src/lib/components/AggregatedFood/AggregatedFoodComp.svelte
+++ b/src/lib/components/AggregatedFood/AggregatedFoodComp.svelte
@@ -8,7 +8,7 @@
- {item.date}
+ {item.period}
|
{item.amount}
diff --git a/src/lib/components/Header.svelte b/src/lib/components/Header.svelte
index df3a3f7..e2931b1 100644
--- a/src/lib/components/Header.svelte
+++ b/src/lib/components/Header.svelte
@@ -26,6 +26,18 @@
{
label: 'Daily',
href: '/daily'
+ },
+ {
+ label: 'Weekly',
+ href: '/weekly'
+ },
+ {
+ label: 'Monthly',
+ href: '/monthly'
+ },
+ {
+ label: 'Yearly',
+ href: '/yearly'
}
]
diff --git a/src/lib/database/food.ts b/src/lib/database/food.ts
index 3e6c896..a20b10e 100644
--- a/src/lib/database/food.ts
+++ b/src/lib/database/food.ts
@@ -12,14 +12,14 @@ export type Food = {
}
export type AggregatedFood = {
- date: Date,
+ period: string,
amount: number,
avgPer100: number,
energy: number,
}
const columns = ['rowid', 'date', 'food', 'description', 'amount', 'per100', 'energy']
-const aggColumns = ['date', 'amount', 'avgPer100', 'energy']
+const aggColumns = ['period', 'amount', 'avgPer100', 'energy']
const FoodService = {
async GetAll() {
diff --git a/src/lib/router/Router.svelte b/src/lib/router/Router.svelte
index 6609799..33e20b4 100644
--- a/src/lib/router/Router.svelte
+++ b/src/lib/router/Router.svelte
@@ -3,10 +3,16 @@
import Home from '$lib/router/routes/Home.svelte'
import Daily from '$router/routes/Daily.svelte'
+ import Weekly from '$router/routes/Weekly.svelte'
+ import Monthly from '$router/routes/Monthly.svelte'
+ import Yearly from '$router/routes/Yearly.svelte'
const routes = {
'/': Home,
- '/daily': Daily
+ '/daily': Daily,
+ '/weekly': Weekly,
+ '/monthly': Monthly,
+ '/yearly': Yearly
}
diff --git a/src/lib/router/routes/Monthly.svelte b/src/lib/router/routes/Monthly.svelte
new file mode 100644
index 0000000..bb65830
--- /dev/null
+++ b/src/lib/router/routes/Monthly.svelte
@@ -0,0 +1,19 @@
+
+
+
+
+
diff --git a/src/lib/router/routes/Weekly.svelte b/src/lib/router/routes/Weekly.svelte
new file mode 100644
index 0000000..8ce322a
--- /dev/null
+++ b/src/lib/router/routes/Weekly.svelte
@@ -0,0 +1,19 @@
+
+
+
+
+
diff --git a/src/lib/router/routes/Yearly.svelte b/src/lib/router/routes/Yearly.svelte
new file mode 100644
index 0000000..1c7e4ac
--- /dev/null
+++ b/src/lib/router/routes/Yearly.svelte
@@ -0,0 +1,19 @@
+
+
+
+
+
|