Knyffen/calories
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add fat to nutrition.rs

Browse Source
This commit is contained in:
Knyffen 2025-03-27 17:59:42 +01:00
parent 1ad530127e
commit 48dfd7104c
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/src/lib.rs
View File

@ -59,6 +59,7 @@ pub fn init_camera_feed(product_options_js: JsValue) -> Result<(), String> {
divisor: 0, divisor: 0,
kJ: 0., kJ: 0.,
kcal: 0., kcal: 0.,
fat: 0.,
saturated_fat: 0., saturated_fat: 0.,
carbohydrate: 0., carbohydrate: 0.,
sugar: 0., sugar: 0.,

4
shared/src/structs/nutrition.rs
View File

@ -21,6 +21,7 @@ pub struct Nutrition {
pub divisor: u32, pub divisor: u32,
pub kJ: f32, pub kJ: f32,
pub kcal: f32, pub kcal: f32,
pub fat: f32,
pub saturated_fat: f32, pub saturated_fat: f32,
pub carbohydrate: f32, pub carbohydrate: f32,
pub sugar: f32, pub sugar: f32,
@ -55,6 +56,7 @@ type RowType = HList!(
Option<f32>, Option<f32>,
Option<f32>, Option<f32>,
Option<f32>, Option<f32>,
Option<f32>,
); );
impl Nutrition { impl Nutrition {
@ -81,6 +83,7 @@ impl Nutrition {
divisor, divisor,
k_j, k_j,
kcal, kcal,
fat,
saturated_fat, saturated_fat,
carbohydrate, carbohydrate,
sugar, sugar,
@ -102,6 +105,7 @@ impl Nutrition {
divisor: divisor.unwrap_or(0), divisor: divisor.unwrap_or(0),
kJ: k_j.unwrap_or(0.), kJ: k_j.unwrap_or(0.),
kcal: kcal.unwrap_or(0.), kcal: kcal.unwrap_or(0.),
fat: fat.unwrap_or(0.),
saturated_fat: saturated_fat.unwrap_or(0.), saturated_fat: saturated_fat.unwrap_or(0.),
carbohydrate: carbohydrate.unwrap_or(0.), carbohydrate: carbohydrate.unwrap_or(0.),
sugar: sugar.unwrap_or(0.), sugar: sugar.unwrap_or(0.),