From ce6c43fb62052d40d1982640d8b660a39425b77c Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sun, 21 Apr 2024 11:49:07 +0200
Subject: [PATCH] shopping stuff

---
 .../components/display/ShoppingListView.vue   |  9 ++++----
 vue3/src/stores/ShoppingStore.ts              | 21 ++++++++++++-------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/vue3/src/components/display/ShoppingListView.vue b/vue3/src/components/display/ShoppingListView.vue
index a3a06696b..3d94c7979 100644
--- a/vue3/src/components/display/ShoppingListView.vue
+++ b/vue3/src/components/display/ShoppingListView.vue
@@ -13,11 +13,11 @@
                     <v-col>
                         <v-list lines="two" density="compact">
 
-                            <template v-for="(value, key) in useShoppingStore().getEntriesByGroup.categories.entries()">
-                                <v-list-subheader>{{ value[0] }}</v-list-subheader>
+                            <template v-for="category in useShoppingStore().getEntriesByGroup">
+                                <v-list-subheader>{{ category.name }}</v-list-subheader>
+                                <v-divider></v-divider>
 
-                                <template v-for="item in value[1].foods">
-                           
+                                <template v-for="item in category.foods">
                                     <v-list-item>
                                         {{ item[1].food.name }}
 
@@ -29,7 +29,6 @@
                                             ></v-btn>
                                         </template>
                                     </v-list-item>
-
                                 </template>
                             </template>
                         </v-list>
diff --git a/vue3/src/stores/ShoppingStore.ts b/vue3/src/stores/ShoppingStore.ts
index 02d7dab0b..a349221f4 100644
--- a/vue3/src/stores/ShoppingStore.ts
+++ b/vue3/src/stores/ShoppingStore.ts
@@ -44,7 +44,7 @@ export const useShoppingStore = defineStore(_STORE_ID, () => {
         let structure = {} as IShoppingList
         structure.categories = new Map<number, IShoppingListCategory>
 
-        let ordered_structure = []
+        let ordered_structure = [] as IShoppingListCategory[]
 
         // build structure
         for (let i in entries.value.keys()) {
@@ -103,12 +103,17 @@ export const useShoppingStore = defineStore(_STORE_ID, () => {
 
         // ordering
 
-        // if (UNDEFINED_CATEGORY in structure) {
-        //     ordered_structure.push(structure[this.UNDEFINED_CATEGORY])
-        //     Vue.delete(structure, this.UNDEFINED_CATEGORY)
-        // }
-        //
-        // if (useUserPreferenceStore().device_settings.shopping_selected_grouping === this.GROUP_CATEGORY && useUserPreferenceStore().device_settings.shopping_selected_supermarket !== null) {
+        if (structure.categories.has(UNDEFINED_CATEGORY)) {
+            ordered_structure.push(structure.categories.get(UNDEFINED_CATEGORY))
+            structure.categories.delete(UNDEFINED_CATEGORY)
+        }
+
+        structure.categories.forEach(category => {
+            ordered_structure.push(category)
+        })
+
+        // TODO implement ordering
+        // if (useUserPreferenceStore().device_settings.shopping_selected_grouping === this.GROUP_CATEGORY && 'useUserPreferenceStore().device_settings.shopping_selected_supermarket' !== null) {
         //     for (let c of useUserPreferenceStore().device_settings.shopping_selected_supermarket.category_to_supermarket) {
         //         if (c.category.name in structure) {
         //             ordered_structure.push(structure[c.category.name])
@@ -126,7 +131,7 @@ export const useShoppingStore = defineStore(_STORE_ID, () => {
         //     }
         // }
 
-        return structure
+        return ordered_structure
     })
 
     /**