From 48dfd7104ce7a728b500cef8b714bb3464edff3c Mon Sep 17 00:00:00 2001 From: Knyffen Date: Thu, 27 Mar 2025 17:59:42 +0100 Subject: [PATCH] Add fat to nutrition.rs --- browser/src/lib.rs | 1 + shared/src/structs/nutrition.rs | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/browser/src/lib.rs b/browser/src/lib.rs index 2226181..ef77549 100644 --- a/browser/src/lib.rs +++ b/browser/src/lib.rs @@ -59,6 +59,7 @@ pub fn init_camera_feed(product_options_js: JsValue) -> Result<(), String> { divisor: 0, kJ: 0., kcal: 0., + fat: 0., saturated_fat: 0., carbohydrate: 0., sugar: 0., diff --git a/shared/src/structs/nutrition.rs b/shared/src/structs/nutrition.rs index a2e7a75..182d328 100644 --- a/shared/src/structs/nutrition.rs +++ b/shared/src/structs/nutrition.rs @@ -21,6 +21,7 @@ pub struct Nutrition { pub divisor: u32, pub kJ: f32, pub kcal: f32, + pub fat: f32, pub saturated_fat: f32, pub carbohydrate: f32, pub sugar: f32, @@ -55,6 +56,7 @@ type RowType = HList!( Option, Option, Option, + Option, ); impl Nutrition { @@ -81,6 +83,7 @@ impl Nutrition { divisor, k_j, kcal, + fat, saturated_fat, carbohydrate, sugar, @@ -102,6 +105,7 @@ impl Nutrition { divisor: divisor.unwrap_or(0), kJ: k_j.unwrap_or(0.), kcal: kcal.unwrap_or(0.), + fat: fat.unwrap_or(0.), saturated_fat: saturated_fat.unwrap_or(0.), carbohydrate: carbohydrate.unwrap_or(0.), sugar: sugar.unwrap_or(0.),