From e47b9810d286b0ea626a4f8b3c870989948d6054 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kha=C3=AFs=20COLIN?= Date: Sun, 19 Oct 2025 14:33:32 +0200 Subject: [PATCH] different colors for different foods! --- foods.db | Bin 8192 -> 12288 bytes src/create_tables.sql | 3 ++- src/main.rs | 7 +++++-- templates/food.html | 2 +- templates/sum.html | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/foods.db b/foods.db index 5a4e2b624231fb261b20378072a690f9d19a5e16..2b4de6f9ce0ad1c08904fbab1aa70bb5547ebdfb 100644 GIT binary patch delta 813 zcmZp0Xh@hKEqIZEfq|KUfq{vEfq{{Mfq`|RjyeRY3_Pq@A)v{nxv{X7Z(~C>qY5woNd`V%3r602UJL$J z{C)f({DOSf`DXE@@#*lf^1kHV&AV`8;Y}VcOD+xu(O^bKM(N4+@|r?S%4ue)Dak3O zOdJf-u1uVa(vzcPRfU+9%~C8bAX*K2o*Kr(CZT7Wnf@n|Y>){a`FWY?ItsptMY*Xti7BZfI#A0w4E0Sw znkV1Vm*Zv9)L@q7W@nIAXX50T%&#ZLY0SaSARfuc$uaq%o{C_4YIc5dMv0LDJ3E7T zAR{A4R8xvyi$M?(!3+$V8jS1=(zYP!N?k=x16G*gIDJhWQD$}qQF%sA4nqZ3AD`6B zyyC>%)I2%<-3&aSu;4V*H!*+)1jl4{T}@6cPId-qN04C!ddj8(&_LjT2Z9g}JA>) -> Vec { let conn = conn.lock().unwrap(); let mut stmt = conn .prepare( - "SELECT id, portion, name, kc_per_serving, target_servings, actual_servings FROM food", + "SELECT id, portion, name, kc_per_serving, target_servings, actual_servings, color FROM food", ) .unwrap(); let foods = stmt @@ -67,6 +68,7 @@ fn get_foods(conn: &Arc>) -> Vec { kc_per_serving: row.get(3).unwrap(), target_servings: row.get(4).unwrap(), actual_servings: row.get(5).unwrap(), + color: row.get(6).unwrap(), }) }) .unwrap() @@ -99,7 +101,7 @@ fn do_increase(conn: &Arc>, id: i32) { fn get_food(conn: &Arc>, id: i32) -> Food { let conn = conn.lock().unwrap(); - let mut stmt = conn.prepare("SELECT id, portion, name, kc_per_serving, target_servings, actual_servings FROM food WHERE id = ?1").unwrap(); + let mut stmt = conn.prepare("SELECT id, portion, name, kc_per_serving, target_servings, actual_servings, color FROM food WHERE id = ?1").unwrap(); let food = stmt .query_one((id,), |row| { Ok(Food { @@ -109,6 +111,7 @@ fn get_food(conn: &Arc>, id: i32) -> Food { kc_per_serving: row.get(3).unwrap(), target_servings: row.get(4).unwrap(), actual_servings: row.get(5).unwrap(), + color: row.get(6).unwrap(), }) }) .unwrap(); diff --git a/templates/food.html b/templates/food.html index 2f4ed33..17f5d72 100644 --- a/templates/food.html +++ b/templates/food.html @@ -1,4 +1,4 @@ -
+

{{ food.name }} diff --git a/templates/sum.html b/templates/sum.html index 7f66211..e86b650 100644 --- a/templates/sum.html +++ b/templates/sum.html @@ -1,3 +1,3 @@ -

+
Total: {{ sum }} kc.
\ No newline at end of file