From 63cdc3c6571e3e7ec345153290f8ed58f5f9cb1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Majdand=C5=BEi=C4=87?=
 <david.majdandzic@hotmail.com>
Date: Wed, 12 Jun 2024 10:14:58 +0200
Subject: [PATCH] Add weekly monthly and yearly periods

---
 .../AggregatedFood/AggregatedFoodComp.svelte  |  2 +-
 src/lib/components/Header.svelte              | 12 ++++++++++++
 src/lib/database/food.ts                      |  4 ++--
 src/lib/router/Router.svelte                  |  8 +++++++-
 src/lib/router/routes/Monthly.svelte          | 19 +++++++++++++++++++
 src/lib/router/routes/Weekly.svelte           | 19 +++++++++++++++++++
 src/lib/router/routes/Yearly.svelte           | 19 +++++++++++++++++++
 7 files changed, 79 insertions(+), 4 deletions(-)
 create mode 100644 src/lib/router/routes/Monthly.svelte
 create mode 100644 src/lib/router/routes/Weekly.svelte
 create mode 100644 src/lib/router/routes/Yearly.svelte

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 @@
 	<tr class="border-b border-gray-200 dark:border-gray-700">
 		<th class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap bg-gray-50 dark:text-white dark:bg-gray-800"
 		    scope="row">
-			{item.date}
+			{item.period}
 		</th>
 		<td class="px-6 py-4">
 			{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'
 		}
 	]
 </script>
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
 	}
 </script>
 
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 @@
+<script lang="ts">
+	import { type AggregatedFood, FoodService } from '$lib/database/food'
+	import { onMount } from 'svelte'
+	import AggregatedFoodTable from '$components/AggregatedFood/AggregatedFoodTable.svelte'
+
+	let foods: AggregatedFood[] = []
+	onMount(async () => {
+		const [dbfoods, err] = await FoodService.GetMonthly()
+		if (err) {
+			console.error(err)
+			return
+		}
+		foods = dbfoods
+	})
+</script>
+
+<template>
+	<AggregatedFoodTable items="{foods}" />
+</template>
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 @@
+<script lang="ts">
+	import { type AggregatedFood, FoodService } from '$lib/database/food'
+	import { onMount } from 'svelte'
+	import AggregatedFoodTable from '$components/AggregatedFood/AggregatedFoodTable.svelte'
+
+	let foods: AggregatedFood[] = []
+	onMount(async () => {
+		const [dbfoods, err] = await FoodService.GetWeekly()
+		if (err) {
+			console.error(err)
+			return
+		}
+		foods = dbfoods
+	})
+</script>
+
+<template>
+	<AggregatedFoodTable items="{foods}" />
+</template>
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 @@
+<script lang="ts">
+	import { type AggregatedFood, FoodService } from '$lib/database/food'
+	import { onMount } from 'svelte'
+	import AggregatedFoodTable from '$components/AggregatedFood/AggregatedFoodTable.svelte'
+
+	let foods: AggregatedFood[] = []
+	onMount(async () => {
+		const [dbfoods, err] = await FoodService.GetYearly()
+		if (err) {
+			console.error(err)
+			return
+		}
+		foods = dbfoods
+	})
+</script>
+
+<template>
+	<AggregatedFoodTable items="{foods}" />
+</template>