diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue index 173375466..f5a22a316 100644 --- a/vue/src/apps/ShoppingListView/ShoppingListView.vue +++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue @@ -75,7 +75,7 @@ + v-if="(c.count_unchecked > 0 || user_preference_store.device_settings.shopping_show_checked_entries) && (c.count_unchecked + c.count_checked) > 0 && (c.count_delayed_unchecked < c.count_unchecked ||user_preference_store.device_settings.shopping_show_delayed_entries )"> diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js index 6a4aab1e7..bacaf86ab 100644 --- a/vue/src/stores/ShoppingListStore.js +++ b/vue/src/stores/ShoppingListStore.js @@ -65,6 +65,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, { let count_checked = 0 let count_unchecked_food = 0 let count_checked_food = 0 + let count_delayed_unchecked = 0 for (let fi in structure[i]['foods']) { let food_checked = true @@ -74,6 +75,9 @@ export const useShoppingListStore = defineStore(_STORE_ID, { } else { food_checked = false count_unchecked++ + if (structure[i]['foods'][fi]['entries'][ei].delay_until != null){ + count_delayed_unchecked++ + } } } if (food_checked) { @@ -87,6 +91,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, { Vue.set(structure[i], 'count_checked', count_checked) Vue.set(structure[i], 'count_unchecked_food', count_unchecked_food) Vue.set(structure[i], 'count_checked_food', count_checked_food) + Vue.set(structure[i], 'count_delayed_unchecked', count_delayed_unchecked) total_unchecked += count_unchecked total_checked += count_checked