From 840afc7ef4efaf9d6ad551d3b2cb94ca4c2f241f Mon Sep 17 00:00:00 2001 From: traxys Date: Fri, 30 Jun 2023 19:43:26 +0200 Subject: [PATCH] app: Correctly handle person count when adding ingredients --- app/src/recipe.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/recipe.rs b/app/src/recipe.rs index fc75e6e..209603c 100644 --- a/app/src/recipe.rs +++ b/app/src/recipe.rs @@ -405,6 +405,7 @@ struct AddIngredientProps { token: String, household: Uuid, recipe: i64, + person_count: u32, update: Callback<()>, } @@ -422,10 +423,12 @@ fn AddIngredientInner(props: &AddIngredientProps) -> HtmlResult { let household = props.household; let recipe = props.recipe; let update = props.update.clone(); + let pc = props.person_count as f64; let on_submit = Callback::from(move |_| match &*s_ig { &Some((id, _)) => match &*am { &Some(amount) => { - let fut = do_add_ingredient_recipe(token.clone(), household, recipe, id, amount); + let fut = + do_add_ingredient_recipe(token.clone(), household, recipe, id, amount / pc); let am = am.clone(); let s_ig = s_ig.clone(); @@ -516,6 +519,7 @@ fn AddIngredient(props: &AddIngredientProps) -> Html { household={props.household} recipe={props.recipe} update={props.update.clone()} + person_count={props.person_count} /> } @@ -1025,6 +1029,7 @@ fn RecipeInfoView(props: &RecipeInfoProps) -> Html { household={props.household} recipe={props.recipe_id} update={props.update.clone()} + person_count={*person_count} />