lots of WIP stuff

cookbook/models.py

@@ -945,8 +945,8 @@ class Ingredient(ExportModelOperationsMixin('ingredient'), models.Model, Permiss
     space = models.ForeignKey(Space, on_delete=models.CASCADE)
     objects = ScopedManager(space='space')
 
-    def __str__(self):
+    # def __str__(self):
-        return f'{self.pk}: {self.amount} ' + (self.food.name if self.food else ' ') + (self.unit.name if self.unit else '')
+    #     return f'{self.pk}: {self.amount} ' + (self.food.name if self.food else ' ') + (self.unit.name if self.unit else '')
 
     class Meta:
         ordering = ['order', 'pk']
@@ -1299,8 +1299,8 @@ class ShoppingListRecipe(ExportModelOperationsMixin('shopping_list_recipe'), mod
 
     objects = ScopedManager(space='space')
 
-    def __str__(self):
+    # def __str__(self):
-        return f'Shopping list recipe {self.id} - {self.recipe}'
+    #     return f'Shopping list recipe {self.id} - {self.recipe}'
 
     class Meta:
         ordering = ('pk',)
@@ -1317,6 +1317,9 @@ class ShoppingList(ExportModelOperationsMixin('shopping_list'), models.Model, Pe
     space = models.ForeignKey(Space, on_delete=models.CASCADE)
     objects = ScopedManager(space='space')
 
+    class Meta:
+        ordering = ('pk',)
+
 
 class ShoppingListEntry(ExportModelOperationsMixin('shopping_list_entry'), models.Model, PermissionModelMixin):
     shopping_lists = models.ManyToManyField(ShoppingList, blank=True)

cookbook/serializer.py

@@ -186,11 +186,29 @@ class SpaceFilterSerializer(serializers.ListSerializer):
             if isinstance(self.context['request'].user, AnonymousUser):
                 data = []
             else:
-                data = data.filter(userspace__space=self.context['request'].user.get_active_space()).all()
+                iterable = data.all() if hasattr(data, 'all') else data
+                if isinstance(iterable, list) or (isinstance(iterable, QuerySet) and getattr(iterable, '_result_cache', None) is not None):
+                    data = [d for d in iterable if d.userspace.space.id == self.context['request'].space.id]
+                else:
+                    if hasattr(self.context['request'], 'space'):
+                        data = data.filter(userspace__space=self.context['request'].space).all()
+                    else:
+                        # not sure why but this branch can be hit (just normal page load, need to see why)
+                        data = data.filter(userspace__space=self.context['request'].user.get_active_space()).all()
+
         elif isinstance(data, list):
             data = [d for d in data if getattr(d, self.child.Meta.model.get_space_key()[0]) == self.context['request'].space]
         else:
-            data = data.filter(**{'__'.join(self.child.Meta.model.get_space_key()): self.context['request'].space})
+            iterable = data.all() if hasattr(data, 'all') else data
+            if isinstance(iterable, list) or (isinstance(iterable, QuerySet) and getattr(iterable, '_result_cache', None) is not None):
+                keys = self.child.Meta.model.get_space_key()
+                if keys == ('space',):
+                    data = [d for d in iterable if getattr(d, 'space_id') == self.context['request'].space.id]
+                else:
+                    # use cached results here too, just dont have time to test this now, probably obj.get_space()
+                    data = data.filter(**{'__'.join(self.child.Meta.model.get_space_key()): self.context['request'].space})
+            else:
+                data = data.filter(**{'__'.join(self.child.Meta.model.get_space_key()): self.context['request'].space})
         return super().to_representation(data)
 
 
@@ -648,7 +666,7 @@ class KeywordLabelSerializer(serializers.ModelSerializer):
 
     @extend_schema_field(str)
     def get_label(self, obj):
-        return str(obj)
+        return obj.name
 
     class Meta:
         list_serializer_class = SpaceFilterSerializer
@@ -665,7 +683,7 @@ class KeywordSerializer(UniqueFieldsMixin, ExtendedRecipeMixin):
 
     @extend_schema_field(str)
     def get_label(self, obj):
-        return str(obj)
+        return obj.name
 
     def create(self, validated_data):
         # since multi select tags dont have id's
@@ -1327,7 +1345,7 @@ class MealPlanSerializer(SpacedModelSerializer, WritableNestedModelSerializer):
 
     @extend_schema_field(bool)
     def in_shopping(self, obj):
-        return ShoppingListRecipe.objects.filter(mealplan=obj.id).exists()
+        return obj.shoppinglistrecipe_set.count() > 0
 
     def create(self, validated_data):
         validated_data['created_by'] = self.context['request'].user
@@ -1393,7 +1411,7 @@ class ShoppingListRecipeSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = ShoppingListRecipe
-        fields = ('id', 'name', 'recipe', 'recipe_data', 'mealplan', 'meal_plan_data', 'servings', 'created_by',)
+        fields = ('id', 'name', 'recipe', 'recipe_data', 'meal_plan_data', 'mealplan', 'servings', 'created_by',)
         read_only_fields = ('id', 'created_by',)
 
 
@@ -1412,7 +1430,7 @@ class ShoppingListSerializer(SpacedModelSerializer, WritableNestedModelSerialize
 
 
 class ShoppingListEntrySerializer(WritableNestedModelSerializer):
-    food = FoodSerializer(allow_null=True)
+    food = FoodSimpleSerializer(allow_null=True)
     unit = UnitSerializer(allow_null=True, required=False)
     shopping_lists = ShoppingListSerializer(many=True, required=False)
     list_recipe_data = ShoppingListRecipeSerializer(source='list_recipe', read_only=True)

cookbook/views/api.py

@@ -2043,17 +2043,18 @@ class ShoppingListEntryViewSet(LoggingMixin, viewsets.ModelViewSet):
 
         self.queryset = self.queryset.filter(
             Q(created_by=self.request.user)
-            | Q(created_by__in=list(self.request.user.get_shopping_share()))).prefetch_related('created_by', 'food',
+            | Q(created_by__in=list(self.request.user.get_shopping_share()))).prefetch_related('created_by',
-                                                                                               'food__properties',
+                                                                                               'food',
-                                                                                               'food__properties__property_type',
+                                                                                               'shopping_lists',
-                                                                                               'food__inherit_fields',
+                                                                                               'unit',
-                                                                                               'food__supermarket_category',
+                                                                                               'list_recipe',
-                                                                                               'food__onhand_users',
+                                                                                               'list_recipe__recipe__keywords',
-                                                                                               'food__substitute',
+                                                                                               'list_recipe__recipe__created_by',
-                                                                                               'food__child_inherit_fields',
-                                                                                               'unit', 'list_recipe',
                                                                                                'list_recipe__mealplan',
+                                                                                               'list_recipe__mealplan__shared',
+                                                                                               'list_recipe__mealplan__shoppinglistrecipe_set',
                                                                                                'list_recipe__mealplan__recipe',
+                                                                                               'list_recipe__mealplan__recipe__keywords',
                                                                                                ).distinct().all()
 
         updated_after = self.request.query_params.get('updated_after', None)

vue3/src/components/display/ShoppingLineItem.vue

@@ -1,14 +1,17 @@
 <template>
-    <v-list-item class="swipe-container border-t-sm mt-0 mb-0 pt-0 pb-0 pe-0 pa-0" :id="itemContainerId" @touchend="handleSwipe()" @click="dialog = true;"
+    <v-list-item class="swipe-container border-t-sm mt-0 mb-0 pt-0 pb-0 pe-0 pa-0 shopping-border"  :id="itemContainerId" @touchend="handleSwipe()" @click="dialog = true;"
                  v-if="isShoppingListFoodVisible(props.shoppingListFood, useUserPreferenceStore().deviceSettings)"
     >
         <!--        <div class="swipe-action" :class="{'bg-success': !isChecked , 'bg-warning': isChecked }">-->
         <!--            <i class="swipe-icon fa-fw fas" :class="{'fa-check': !isChecked , 'fa-cart-plus': isChecked }"></i>-->
         <!--        </div>-->
 
+        <div class="color-marker-container">
+            <span :style="{background: sl.color}" v-for="sl in shoppingList"></span>
+        </div>
 
-        <div class="flex-grow-1 p-2">
+        <div class="flex-grow-1 p-2" >
-            <div class="d-flex">
+            <div class="d-flex" >
                 <div class="d-flex flex-column pr-2 pl-4">
                     <span v-for="a in amounts" v-bind:key="a.key">
                         <span>
@@ -113,6 +116,17 @@ const actionButtonIcon = computed(() => {
 })
 
 
+const shoppingList = computed(() => {
+    const lists = new Set()
+    for (let entry of entries.value) {
+        if (entry.shoppingLists) {
+            entry.shoppingLists.forEach(l => lists.add(l))
+        }
+    }
+    return Array.from(lists)
+})
+
+
 /**
  * calculate the amounts for the given line
  * can combine 1 to n entries with the same unit
@@ -248,4 +262,22 @@ function handleSwipe() {
 
 <style>
 /* TODO swipe system classes removed because not working (visually, touch detection was working), retrieve from old ShoppingLineItem VCS */
+
+
+/* 2. Container to wrap the color bars and place them to the far left */
+.color-marker-container {
+  position: absolute;
+  top: 0;
+  left: 0;
+  height: 100%;
+  width: 3px;
+  display: flex;
+  flex-direction: column;
+}
+
+.color-marker-container span {
+  width: 100%;
+  flex-grow: 1;
+}
+
 </style>

vue3/src/components/display/ShoppingListView.vue

@@ -89,7 +89,6 @@
 
                 <v-row class="pa-0" dense>
                     <v-col class="pa-0" cols="6">
-
                         <v-chip label density="compact" variant="outlined" :prepend-icon="TSupermarket.icon" append-icon="fa-solid fa-caret-down">
                             <template v-if="useUserPreferenceStore().deviceSettings.shopping_selected_supermarket != null">
                                 {{useUserPreferenceStore().deviceSettings.shopping_selected_supermarket.name}}
@@ -101,11 +100,34 @@
                                     <v-list-item v-for="s in supermarkets" :key="s.id" @click="useUserPreferenceStore().deviceSettings.shopping_selected_supermarket = s">
                                         {{ s.name }}
                                     </v-list-item>
+                                    <v-list-item prepend-icon="$create" :to="{name: 'ModelEditPage', params: {model: 'Supermarket'}}">
+                                        {{$t('Create')}}
+                                    </v-list-item>
                                 </v-list>
                             </v-menu>
                         </v-chip>
+                    </v-col>
+                    <v-col class="pa-0" cols="6">
+                        <v-chip label density="compact" variant="outlined" :prepend-icon="TShoppingList.icon" append-icon="fa-solid fa-caret-down">
+                            <template v-if="useUserPreferenceStore().deviceSettings.shopping_selected_shopping_list != null">
+                                {{useUserPreferenceStore().deviceSettings.shopping_selected_shopping_list.name}}
+                            </template>
+                            <template v-else>{{ $t('ShoppingList') }}</template>
 
-
+                            <v-menu activator="parent">
+                                <v-list density="compact">
+                                    <v-list-item  @click="useUserPreferenceStore().deviceSettings.shopping_selected_shopping_list = null">
+                                        {{$t('All')}}
+                                    </v-list-item>
+                                    <v-list-item v-for="s in shoppingLists" :key="s.id" @click="useUserPreferenceStore().deviceSettings.shopping_selected_shopping_list = s">
+                                        {{ s.name }}
+                                    </v-list-item>
+                                    <v-list-item prepend-icon="$create" :to="{name: 'ModelEditPage', params: {model: 'ShoppingList'}}">
+                                        {{$t('Create')}}
+                                    </v-list-item>
+                                </v-list>
+                            </v-menu>
+                        </v-chip>
                     </v-col>
                 </v-row>
 
@@ -270,7 +292,7 @@
 
 import {computed, onMounted, ref} from "vue";
 import {useShoppingStore} from "@/stores/ShoppingStore";
-import {ApiApi, Recipe, ResponseError, ShoppingListEntry, ShoppingListRecipe, Supermarket} from "@/openapi";
+import {ApiApi, Recipe, ResponseError, ShoppingList, ShoppingListEntry, ShoppingListRecipe, Supermarket} from "@/openapi";
 import {ErrorMessageType, PreparedMessage, useMessageStore} from "@/stores/MessageStore";
 import ShoppingLineItem from "@/components/display/ShoppingLineItem.vue";
 import {useUserPreferenceStore} from "@/stores/UserPreferenceStore";
@@ -287,12 +309,13 @@ import {onBeforeRouteLeave} from "vue-router";
 import {isShoppingCategoryVisible} from "@/utils/logic_utils.ts";
 import ShoppingExportDialog from "@/components/dialogs/ShoppingExportDialog.vue";
 import AddToShoppingDialog from "@/components/dialogs/AddToShoppingDialog.vue";
-import {TSupermarket} from "@/types/Models.ts";
+import {TShoppingList, TSupermarket} from "@/types/Models.ts";
 
 const {t} = useI18n()
 
 const currentTab = ref("shopping")
 const supermarkets = ref([] as Supermarket[])
+const shoppingLists = ref([] as ShoppingList[])
 const manualAddRecipe = ref<undefined | Recipe>(undefined)
 
 /**
@@ -327,6 +350,7 @@ onMounted(() => {
     }
 
     loadSupermarkets()
+    loadShoppingLists()
 })
 
 /**
@@ -401,6 +425,20 @@ function loadSupermarkets() {
     })
 }
 
+/**
+ * load a list of supermarkets
+ */
+function loadShoppingLists() {
+    let api = new ApiApi()
+
+    api.apiShoppingListList().then(r => {
+        shoppingLists.value = r.results
+        // TODO either recursive or add a "favorite" attribute to supermarkets for them to display at all
+    }).catch(err => {
+        useMessageStore().addError(ErrorMessageType.FETCH_ERROR, err)
+    })
+}
+
 </script>
 
 <style scoped>

vue3/src/locales/ar.json

@@ -23,6 +23,7 @@
   "AiModelHelp": "",
   "AiProvider": "",
   "AiProviderHelp": "",
+  "All": "",
   "App": "",
   "Apply": "",
   "Are_You_Sure": "",

vue3/src/locales/bg.json

@@ -23,6 +23,7 @@
   "AiModelHelp": "",
   "AiProvider": "",
   "AiProviderHelp": "",
+  "All": "",
   "App": "Приложение",
   "Apply": "",
   "Are_You_Sure": "Сигурен ли си?",

vue3/src/locales/ca.json

@@ -26,6 +26,7 @@
   "AiProvider": "",
   "AiProviderHelp": "",
   "Alignment": "Alineació",
+  "All": "",
   "Amount": "Quantitat",
   "App": "Aplicació",
   "Apply": "",

vue3/src/locales/cs.json

@@ -26,6 +26,7 @@
   "AiProvider": "",
   "AiProviderHelp": "",
   "Alignment": "Zarovnání",
+  "All": "",
   "Amount": "Množství",
   "App": "Aplikace",
   "Apply": "",

vue3/src/locales/da.json

@@ -26,6 +26,7 @@
   "AiProvider": "",
   "AiProviderHelp": "",
   "Alignment": "Justering",
+  "All": "",
   "Amount": "Mængde",
   "App": "App",
   "Apply": "",

vue3/src/locales/de.json

@@ -39,6 +39,7 @@
   "AiProvider": "AI Anbieter",
   "AiProviderHelp": "Je nach Präferenz können verschiedene AI Anbieter angelegt werden. Diese können auch Space übergreifend sein.",
   "Alignment": "Ausrichtung",
+  "All": "Alle",
   "AllRecipes": "Alle Rezepte",
   "Amount": "Menge",
   "App": "App",

vue3/src/locales/el.json

@@ -26,6 +26,7 @@
   "AiProvider": "",
   "AiProviderHelp": "",
   "Alignment": "Ευθυγράμμιση",
+  "All": "",
   "Amount": "Ποσότητα",
   "App": "Εφαρμογή",
   "Apply": "",

vue3/src/locales/en.json

@@ -37,6 +37,7 @@
   "AiProvider": "AI Provider",
   "AiProviderHelp": "You can configure multiple AI providers according to your preferences. They can even be configured to work across multiple spaces.",
   "Alignment": "Alignment",
+  "All": "All",
   "AllRecipes": "All Recipes",
   "Amount": "Amount",
   "App": "App",

vue3/src/locales/es.json

@@ -36,6 +36,7 @@
   "AiProvider": "",
   "AiProviderHelp": "",
   "Alignment": "Alineación",
+  "All": "",
   "AllRecipes": "Todas las recetas",
   "Amount": "Cantidad",
   "App": "Aplicación",

vue3/src/locales/fi.json

@@ -27,6 +27,7 @@
   "AiProvider": "",
   "AiProviderHelp": "",
   "Alignment": "Tasaus",
+  "All": "",
   "Amount": "Määrä",
   "App": "Applikaatio",
   "Apply": "",

vue3/src/locales/fr.json

@@ -37,6 +37,7 @@
   "AiProvider": "",
   "AiProviderHelp": "",
   "Alignment": "Alignement",
+  "All": "",
   "AllRecipes": "Toutes les recettes",
   "Amount": "Quantité",
   "App": "Appli",

vue3/src/locales/he.json

@@ -26,6 +26,7 @@
   "AiProvider": "",
   "AiProviderHelp": "",
   "Alignment": "יישור",
+  "All": "",
   "Amount": "כמות",
   "App": "אפליקציה",
   "Apply": "",

vue3/src/locales/hr.json

@@ -26,6 +26,7 @@
   "AiProvider": "",
   "AiProviderHelp": "",
   "Alignment": "Poravnanje",
+  "All": "",
   "Amount": "Količina",
   "App": "Aplikacija",
   "Apply": "",

vue3/src/locales/hu.json

@@ -26,6 +26,7 @@
   "AiProvider": "",
   "AiProviderHelp": "",
   "Alignment": "Igazítás",
+  "All": "",
   "Amount": "Összeg",
   "App": "Applikáció",
   "Apply": "",

vue3/src/locales/hy.json

@@ -17,6 +17,7 @@
   "AiModelHelp": "",
   "AiProvider": "",
   "AiProviderHelp": "",
+  "All": "",
   "Apply": "",
   "Automate": "Ավտոմատացնել",
   "BatchDeleteConfirm": "",

vue3/src/locales/id.json

@@ -25,6 +25,7 @@
   "AiModelHelp": "",
   "AiProvider": "",
   "AiProviderHelp": "",
+  "All": "",
   "App": "",
   "Apply": "",
   "Are_You_Sure": "",

vue3/src/locales/is.json

@@ -26,6 +26,7 @@
   "AiProvider": "",
   "AiProviderHelp": "",
   "Alignment": "",
+  "All": "",
   "Amount": "",
   "App": "",
   "Apply": "",

vue3/src/locales/ko.json

@@ -36,6 +36,7 @@
   "AiProvider": "",
   "AiProviderHelp": "",
   "Alignment": "",
+  "All": "",
   "AllRecipes": "",
   "Amount": "",
   "App": "",

vue3/src/locales/lt.json

@@ -26,6 +26,7 @@
   "AiProvider": "",
   "AiProviderHelp": "",
   "Alignment": "",
+  "All": "",
   "Amount": "Suma",
   "App": "",
   "Apply": "",

vue3/src/locales/lv.json

@@ -26,6 +26,7 @@
   "AiProvider": "",
   "AiProviderHelp": "",
   "Alignment": "",
+  "All": "",
   "Amount": "",
   "App": "",
   "Apply": "",

vue3/src/locales/nb_NO.json

@@ -26,6 +26,7 @@
   "AiProvider": "",
   "AiProviderHelp": "",
   "Alignment": "Justering",
+  "All": "",
   "Amount": "Mengde",
   "App": "App",
   "Apply": "",

vue3/src/locales/nl.json

@@ -38,6 +38,7 @@
   "AiProvider": "AI-provider",
   "AiProviderHelp": "Je kunt meerdere AI-providers configureren naar jouw voorkeuren. Ze kunnen zelfs werken in meerdere ruimtes.",
   "Alignment": "Afstemming",
+  "All": "",
   "AllRecipes": "Alle recepten",
   "Amount": "Hoeveelheid",
   "App": "App",

vue3/src/locales/pl.json

@@ -35,6 +35,7 @@
   "AiProvider": "",
   "AiProviderHelp": "",
   "Alignment": "Wyrównanie",
+  "All": "",
   "AllRecipes": "Wszystkie przepisy",
   "Amount": "Ilość",
   "App": "Aplikacja",

vue3/src/locales/pt.json

@@ -19,6 +19,7 @@
   "Added_on": "Adicionado a",
   "Advanced": "Avançado",
   "Alignment": "Alinhamento",
+  "All": "",
   "Amount": "Quantidade",
   "Apply": "",
   "Auto_Planner": "",

vue3/src/locales/pt_BR.json

@@ -36,6 +36,7 @@
   "AiProvider": "",
   "AiProviderHelp": "",
   "Alignment": "Alinhamento",
+  "All": "",
   "AllRecipes": "Todas Receitas",
   "Amount": "Quantidade",
   "App": "Aplicação",

vue3/src/locales/ro.json

@@ -26,6 +26,7 @@
   "AiModelHelp": "",
   "AiProvider": "",
   "AiProviderHelp": "",
+  "All": "",
   "Amount": "Cantitate",
   "App": "Aplicație",
   "Apply": "",

vue3/src/locales/ru.json

@@ -37,6 +37,7 @@
   "AiProvider": "",
   "AiProviderHelp": "",
   "Alignment": "Выравнивание",
+  "All": "",
   "AllRecipes": "Все рецепты",
   "Amount": "Количество",
   "App": "Приложение",

vue3/src/locales/sl.json

@@ -38,6 +38,7 @@
   "AiProvider": "Ponudnik umetne inteligence",
   "AiProviderHelp": "Več ponudnikov umetne inteligence lahko konfigurirate glede na svoje nastavitve. Konfigurirate jih lahko celo za delovanje v več prostorih.",
   "Alignment": "Poravnava",
+  "All": "",
   "AllRecipes": "Vsi recepti",
   "Amount": "Količina",
   "App": "Aplikacija",

vue3/src/locales/tr.json

@@ -26,6 +26,7 @@
   "AiProvider": "",
   "AiProviderHelp": "",
   "Alignment": "Hizalama",
+  "All": "",
   "Amount": "Miktar",
   "App": "Uygulama",
   "Apply": "",

vue3/src/locales/uk.json

@@ -37,6 +37,7 @@
   "AiProvider": "Постачальник ШІ",
   "AiProviderHelp": "Ви можете налаштувати декількох постачальників штучного інтелекту відповідно до своїх уподобань. Їх навіть можна налаштувати для роботи в декількох просторах.",
   "Alignment": "Вирівнювання",
+  "All": "",
   "AllRecipes": "Всі рецепти",
   "Amount": "Кількість",
   "App": "Додаток",

vue3/src/locales/zh_Hans.json

@@ -26,6 +26,7 @@
   "AiProvider": "",
   "AiProviderHelp": "",
   "Alignment": "校准",
+  "All": "",
   "Amount": "数量",
   "App": "应用",
   "Apply": "",

vue3/src/locales/zh_Hant.json

@@ -36,6 +36,7 @@
   "AiProvider": "",
   "AiProviderHelp": "",
   "Alignment": "對齊",
+  "All": "",
   "AllRecipes": "所有食譜",
   "Amount": "數量",
   "App": "應用程式",

vue3/src/stores/ShoppingStore.ts

@@ -50,6 +50,7 @@ export const useShoppingStore = defineStore(_STORE_ID, () => {
      * group by selected grouping key
      */
     const getEntriesByGroup = computed(() => {
+        console.log("--> getEntriesByGroup called")
         stats.value = {
             countChecked: 0,
             countUnchecked: 0,
@@ -221,13 +222,16 @@ export const useShoppingStore = defineStore(_STORE_ID, () => {
      */
     function recLoadShoppingListEntries(requestParameters: ApiShoppingListEntryListRequest) {
         let api = new ApiApi()
-        api.apiShoppingListEntryList(requestParameters).then((r) => {
+        return api.apiShoppingListEntryList(requestParameters).then((r) => {
             r.results.forEach((e) => {
                 entries.value.set(e.id!, e)
             })
-            if (r.next) {
+
-                requestParameters.page = requestParameters.page + 1
+            if (requestParameters.page == 1 && r.next) {
-                recLoadShoppingListEntries(requestParameters)
+                while (Math.ceil(r.count / requestParameters.pageSize) > requestParameters.page) {
+                    requestParameters.page = requestParameters.page + 1
+                    recLoadShoppingListEntries(requestParameters)
+                }
             } else {
                 currentlyUpdating.value = false
                 initialized.value = true

vue3/src/stores/UserPreferenceStore.ts

@@ -228,6 +228,7 @@ export const useUserPreferenceStore = defineStore('user_preference_store', () =>
             shopping_show_selected_supermarket_only: false,
             shopping_selected_grouping: ShoppingGroupingOptions.CATEGORY,
             shopping_selected_supermarket: null,
+            shopping_selected_shopping_list: null,
             shopping_item_info_created_by: false,
             shopping_item_info_mealplan: true,
             shopping_item_info_recipe: true,

vue3/src/types/settings.ts

@@ -1,4 +1,4 @@
-import {Supermarket} from "@/openapi";
+import {ShoppingList, Supermarket} from "@/openapi";
 
 export type DeviceSettings = {
     shopping_show_checked_entries: boolean
@@ -6,6 +6,7 @@ export type DeviceSettings = {
     shopping_show_selected_supermarket_only: boolean
     shopping_selected_grouping: string
     shopping_selected_supermarket: Supermarket | null
+    shopping_selected_shopping_list: ShoppingList | null
     shopping_item_info_created_by: boolean
     shopping_item_info_mealplan: boolean
     shopping_item_info_recipe: boolean

vue3/src/utils/logic_utils.ts

@@ -18,6 +18,10 @@ export function isEntryVisible(entry: ShoppingListEntry, deviceSettings: DeviceS
     if (entry.checked && !deviceSettings.shopping_show_checked_entries) {
         entryVisible = false
     }
+
+    if(deviceSettings.shopping_selected_shopping_list != null && entry.shoppingLists?.findIndex(sl => sl.id == deviceSettings.shopping_selected_shopping_list.id) == -1){
+        entryVisible = false
+    }
     return entryVisible
 }
 
@@ -60,16 +64,15 @@ export function isShoppingListFoodDelayed(slf: IShoppingListFood) {
  * @param category
  */
 export function isShoppingCategoryVisible(category: IShoppingListCategory) {
-    let entryCount = category.stats.countUnchecked
+    console.log('checking if category is visible')
+    let categoryVisible = false
+    category.foods.forEach(food => {
+        if(isShoppingListFoodVisible(food, useUserPreferenceStore().deviceSettings)){
+            categoryVisible = true
+        }
+    })
 
-    if (useUserPreferenceStore().deviceSettings.shopping_show_checked_entries) {
+    return categoryVisible
-        entryCount += category.stats.countChecked
-    }
-    if (useUserPreferenceStore().deviceSettings.shopping_show_delayed_entries) {
-        entryCount += category.stats.countUncheckedDelayed
-    }
-
-    return entryCount > 0
 }
 
 // -------------- SPACE RELATED ----------------------