zaphar/kitchen
1
0
Fork 0
mirror of https://github.com/zaphar/kitchen.git synced 2025-07-25 20:09:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Show or don't show staples in shopping list

Browse Source
This commit is contained in:
Jeremy Wall 2022-07-31 15:38:41 -04:00
parent 3f64862205
commit 1b14e5c5d3
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
web/src/components/shopping_list.rs
View File

@ -25,9 +25,12 @@ pub fn shopping_list() -> View<G> {
let ingredients_map = Signal::new(BTreeMap::new());
let extras = Signal::new(Vec::<(usize, (Signal<String>, Signal<String>))>::new());
let modified_amts = Signal::new(BTreeMap::new());
create_effect(cloned!((app_service, ingredients_map) => move || {
ingredients_map.set(app_service.get_shopping_list());
}));
let show_staples = Signal::new(true);
create_effect(
cloned!((app_service, ingredients_map, show_staples) => move || {
ingredients_map.set(app_service.get_shopping_list(*show_staples.get()));
}),
);
debug!(ingredients_map=?ingredients_map.get_untracked());
let ingredients = create_memo(cloned!((ingredients_map, filtered_keys) => move || {
let mut ingredients = Vec::new();
@ -119,15 +122,17 @@ pub fn shopping_list() -> View<G> {
);
view! {
h1 { "Shopping List " }
label(for="show_staples_cb") { "Show staples" }
input(id="show_staples_cb", type="checkbox", bind:checked=show_staples.clone())
(table_view.get().as_ref().clone())
input(type="button", value="Add Item", class="no-print", on:click=cloned!((extras) => move |_| {
let mut cloned_extras: Vec<(Signal<String>, Signal<String>)> = (*extras.get()).iter().map(|(_, v)| v.clone()).collect();
cloned_extras.push((Signal::new("".to_owned()), Signal::new("".to_owned())));
extras.set(cloned_extras.drain(0..).enumerate().collect());
}))
input(type="button", value="Reset", class="no-print", on:click=cloned!((ingredients_map, filtered_keys, app_service, modified_amts, extras) => move |_| {
input(type="button", value="Reset", class="no-print", on:click=cloned!((ingredients_map, filtered_keys, app_service, modified_amts, extras, show_staples) => move |_| {
// TODO(jwall): We should actually pop up a modal here or use a different set of items.
ingredients_map.set(app_service.get_shopping_list());
ingredients_map.set(app_service.get_shopping_list(*show_staples.get()));
// clear the filter_signal
filtered_keys.set(BTreeSet::new());
modified_amts.set(BTreeMap::new());

7
web/src/service.rs
View File

@ -184,7 +184,10 @@ impl AppService {
}
#[instrument(skip(self))]
pub fn get_shopping_list(&self) -> BTreeMap<String, Vec<(Ingredient, BTreeSet<String>)>> {
pub fn get_shopping_list(
&self,
show_staples: bool,
) -> BTreeMap<String, Vec<(Ingredient, BTreeSet<String>)>> {
let mut acc = IngredientAccumulator::new();
let recipe_counts = self.menu_list.get();
for (idx, count) in recipe_counts.iter() {
@ -192,9 +195,11 @@ impl AppService {
acc.accumulate_from(self.get_recipe_by_index(*idx).unwrap().get().as_ref());
}
}
if show_staples {
if let Some(staples) = self.staples.get().as_ref() {
acc.accumulate_from(staples);
}
}
let mut ingredients = acc.ingredients();
let mut groups = BTreeMap::new();
let cat_map = self.category_map.get().clone();