zaphar/kitchen
1
0
Fork 0
mirror of https://github.com/zaphar/kitchen.git synced 2025-07-22 19:40:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug in shopping list when missing categories

Browse Source
This commit is contained in:
Jeremy Wall 2022-05-06 21:24:00 -04:00
parent a0d8c07a4b
commit b9e5ebd705
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes/src/lib.rs
View File

@ -176,7 +176,7 @@ impl Step {
/// Unique identifier for an Ingredient. Ingredients are identified by name, form, /// Unique identifier for an Ingredient. Ingredients are identified by name, form,
/// and measurement type. (Volume, Count, Weight) /// and measurement type. (Volume, Count, Weight)
#[derive(PartialEq, PartialOrd, Eq, Ord, Clone, Hash)] #[derive(PartialEq, PartialOrd, Eq, Ord, Clone, Hash, Debug)]
pub struct IngredientKey(String, Option<String>, String); pub struct IngredientKey(String, Option<String>, String);
/// Ingredient in a recipe. The `name` and `form` fields with the measurement type /// Ingredient in a recipe. The `name` and `form` fields with the measurement type

12
web/src/service.rs
View File

@ -25,17 +25,16 @@ use recipes::{parse, Ingredient, IngredientAccumulator, Recipe};
pub struct AppService { pub struct AppService {
recipes: Signal<Vec<(usize, Signal<Recipe>)>>, recipes: Signal<Vec<(usize, Signal<Recipe>)>>,
staples: Signal<Option<Recipe>>, staples: Signal<Option<Recipe>>,
category_map: Signal<Option<BTreeMap<String, String>>>, category_map: Signal<BTreeMap<String, String>>,
menu_list: Signal<BTreeMap<usize, usize>>, menu_list: Signal<BTreeMap<usize, usize>>,
} }
impl AppService { impl AppService {
pub fn new() -> Self { pub fn new() -> Self {
let mut category_map = BTreeMap::new();
Self { Self {
recipes: Signal::new(Vec::new()), recipes: Signal::new(Vec::new()),
staples: Signal::new(None), staples: Signal::new(None),
category_map: Signal::new(None), category_map: Signal::new(BTreeMap::new()),
menu_list: Signal::new(BTreeMap::new()), menu_list: Signal::new(BTreeMap::new()),
} }
} }
@ -193,9 +192,9 @@ impl AppService {
} }
let mut ingredients = acc.ingredients(); let mut ingredients = acc.ingredients();
let mut groups = BTreeMap::new(); let mut groups = BTreeMap::new();
self.category_map.get().as_ref().as_ref().map(|cm| { let cat_map = self.category_map.get().clone();
for (_, (i, recipes)) in ingredients.iter_mut() { for (_, (i, recipes)) in ingredients.iter_mut() {
let category = if let Some(cat) = cm.get(&i.name) { let category = if let Some(cat) = cat_map.get(&i.name) {
cat.clone() cat.clone()
} else { } else {
"other".to_owned() "other".to_owned()
@ -206,7 +205,6 @@ impl AppService {
.or_insert(vec![]) .or_insert(vec![])
.push((i.clone(), recipes.clone())); .push((i.clone(), recipes.clone()));
} }
});
console_debug!("Category map {:?}", self.category_map); console_debug!("Category map {:?}", self.category_map);
// FIXM(jwall): Sort by categories and names. // FIXM(jwall): Sort by categories and names.
groups groups
@ -246,6 +244,6 @@ impl AppService {
} }
pub fn set_categories(&mut self, categories: BTreeMap<String, String>) { pub fn set_categories(&mut self, categories: BTreeMap<String, String>) {
self.category_map.set(Some(categories)); self.category_map.set(categories);
} }
} }