From f65597c3915959200d354b45c3a37bee28f272c0 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Fri, 22 Dec 2023 11:40:17 +0100
Subject: [PATCH 01/95] basic nocer ui, nothing really working

---
 cookbook/serializer.py                        |   4 +-
 .../ShoppingListView/ShoppingListView.vue     |  19 +-
 vue/src/apps/TestView/TestView.vue            |  18 ++
 vue/src/components/ShoppingLineItem.vue       | 205 +++++++++---------
 4 files changed, 138 insertions(+), 108 deletions(-)

diff --git a/cookbook/serializer.py b/cookbook/serializer.py
index ff4e2dfc..fd42bd96 100644
--- a/cookbook/serializer.py
+++ b/cookbook/serializer.py
@@ -1031,6 +1031,8 @@ class ShoppingListRecipeSerializer(serializers.ModelSerializer):
     name = serializers.SerializerMethodField('get_name')  # should this be done at the front end?
     recipe_name = serializers.ReadOnlyField(source='recipe.name')
     mealplan_note = serializers.ReadOnlyField(source='mealplan.note')
+    mealplan_from_date = serializers.ReadOnlyField(source='mealplan.from_date')
+    mealplan_type = serializers.ReadOnlyField(source='mealplan.meal_type.name')
     servings = CustomDecimalField()
 
     def get_name(self, obj):
@@ -1054,7 +1056,7 @@ class ShoppingListRecipeSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = ShoppingListRecipe
-        fields = ('id', 'recipe_name', 'name', 'recipe', 'mealplan', 'servings', 'mealplan_note')
+        fields = ('id', 'recipe_name', 'name', 'recipe', 'mealplan', 'servings', 'mealplan_note','mealplan_from_date', 'mealplan_type')
         read_only_fields = ('id',)
 
 
diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 66867227..b0f8742c 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -155,14 +155,17 @@
                                                          v-for="(entries, index) in Object.entries(foods_group)"
                                                          :key="index">
                                                         <transition name="slide-fade" mode="out-in">
-                                                            <shopping-line-item
-                                                                :entries="entries[1]"
-                                                                :groupby="group_by"
-                                                                :settings="settings"
-                                                                @open-context-menu="openContextMenu"
-                                                                @update-checkbox="updateChecked"
-                                                                @update-delaythis="delayThis"
-                                                            />
+
+
+
+                                                                                                                        <shopping-line-item
+                                                                                                                            :entries="entries[1]"
+                                                                                                                            :groupby="group_by"
+                                                                                                                            :settings="settings"
+                                                                                                                            @open-context-menu="openContextMenu"
+                                                                                                                            @update-checkbox="updateChecked"
+                                                                                                                            @update-delaythis="delayThis"
+                                                                                                                        />
                                                         </transition>
                                                     </div>
                                                 </transition-group>
diff --git a/vue/src/apps/TestView/TestView.vue b/vue/src/apps/TestView/TestView.vue
index 5aa6efff..24520e7f 100644
--- a/vue/src/apps/TestView/TestView.vue
+++ b/vue/src/apps/TestView/TestView.vue
@@ -2,6 +2,24 @@
 
     <div id="app">
         <div>
+
+
+
+            <b-button-group class="w-100 mb-1" >
+                <b-button variant="dark" block class="btn btn-block btn-sm text-left " >100 g Möhren Test <br/><small class="text-muted">Info</small></b-button>
+                <b-button variant="success"><i class="fas fa-check"></i></b-button>
+            </b-button-group>
+            <br/>
+            <b-button-group class="w-100">
+                <b-button variant="dark" block class="btn btn-block text-left" >150 ml Heißwassermöhrenbrühe<br/><small class="text-muted">Info</small></b-button>
+                <b-button variant="success"><i class="fas fa-check"></i></b-button>
+            </b-button-group>
+
+            <br/>
+            <br/>
+            <br/>
+            ----
+
             <markdown-editor-component></markdown-editor-component>
 
         </div>
diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index b1e52f7f..e9796e22 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -1,83 +1,20 @@
 <template>
     <div id="shopping_line_item" class="pt-1">
-        <b-row align-h="start"
-               ref="shopping_line_item" class="invis-border">
-            <b-col cols="2" md="2" class="justify-content-start align-items-center d-flex d-md-none pr-0"
-                   v-if="settings.left_handed">
-                <input type="checkbox" class="form-control form-control-sm checkbox-control-mobile"
-                       :checked="formatChecked" @change="updateChecked" :key="entries[0].id"/>
-                <b-button size="sm" @click="showDetails = !showDetails" class="d-inline-block d-md-none p-0"
-                          variant="link">
-                    <div class="text-nowrap"><i class="fa fa-chevron-right rotate"
-                                                :class="showDetails ? 'rotated' : ''"></i></div>
-                </b-button>
-            </b-col>
-            <b-col cols="1" class="align-items-center d-flex">
-                <div class="dropdown b-dropdown position-static inline-block" data-html2canvas-ignore="true"
-                     @click.stop="$emit('open-context-menu', $event, entries)">
-                    <button
-                        aria-haspopup="true"
-                        aria-expanded="false"
-                        type="button"
-                        :class="settings.left_handed ? 'dropdown-spacing' : ''"
-                        class="btn dropdown-toggle btn-link text-decoration-none text-body pr-0 pl-1 pr-md-3 pl-md-3 dropdown-toggle-no-caret">
-                        <i class="fas fa-ellipsis-v"></i>
-                    </button>
-                </div>
-            </b-col>
-            <b-col cols="1" class="px-1 justify-content-center align-items-center d-none d-md-flex">
-                <input type="checkbox" class="form-control form-control-sm checkbox-control"
-                       :checked="formatChecked" @change="updateChecked" :key="entries[0].id"/>
-            </b-col>
-            <b-col cols="8">
-                <b-row class="d-flex h-100">
-                    <b-col cols="6" md="3" class="d-flex align-items-center" v-touch:start="startHandler" v-touch:moving="moveHandler" v-touch:end="endHandler"
-                           v-if="Object.entries(formatAmount).length == 1">
-                        <strong class="mr-1">{{ Object.entries(formatAmount)[0][1] }}</strong>
-                        {{ Object.entries(formatAmount)[0][0] }}
-                    </b-col>
-                    <b-col cols="6" md="3" class="d-flex flex-column" v-touch:start="startHandler" v-touch:moving="moveHandler" v-touch:end="endHandler"
-                           v-if="Object.entries(formatAmount).length != 1">
-                        <div class="small" v-for="(x, i) in Object.entries(formatAmount)" :key="i">
-                            {{ x[1] }} &ensp;
-                            {{ x[0] }}
-                        </div>
-                    </b-col>
+        <b-row>
+            <b-col cold="12">
+                <b-button-group class="mt-1 w-100 pr-5">
+                    <b-button variant="dark" block class="btn btn-block text-left" @click="detail_modal_visible = true">
+                        <span>{{ food_row }}</span>
+                        <span v-if="info_row"><br/><small class="text-muted">{{ info_row }}</small></span>
+
+                    </b-button>
+                    <b-button variant="success" @click="updateChecked"><i class="fas fa-check"></i></b-button>
+                </b-button-group>
 
-                    <b-col cols="6" md="6" class="align-items-center d-flex pl-0 pr-0 pl-md-2 pr-md-2">
-                        {{ formatFood }}
-                    </b-col>
-                    <b-col cols="3" data-html2canvas-ignore="true" v-touch:start="startHandler" v-touch:moving="moveHandler" v-touch:end="endHandler"
-                           class="align-items-center d-none d-md-flex justify-content-end">
-                        <b-button size="sm" @click="showDetails = !showDetails"
-                                  class="p-0 mr-0 mr-md-2 p-md-2 text-decoration-none" variant="link">
-                            <div class="text-nowrap">
-                                <i class="fa fa-chevron-right rotate" :class="showDetails ? 'rotated' : ''"></i>
-                                <span class="d-none d-md-inline-block"><span class="ml-2">{{
-                                        $t("Details")
-                                    }}</span></span>
-                            </div>
-                        </b-button>
-                    </b-col>
-                </b-row>
-            </b-col>
-            <b-col cols="2" class="justify-content-start align-items-center d-flex d-md-none pl-0 pr-0" v-touch:start="startHandler" v-touch:moving="moveHandler" v-touch:end="endHandler"
-                   v-if="!settings.left_handed">
-                <b-button size="sm" @click="showDetails = !showDetails" class="d-inline-block d-md-none p-0"
-                          variant="link">
-                    <div class="text-nowrap"><i class="fa fa-chevron-right rotate"
-                                                :class="showDetails ? 'rotated' : ''"></i></div>
-                </b-button>
-                <input type="checkbox" class="form-control form-control-sm checkbox-control-mobile"
-                       :checked="formatChecked" @change="updateChecked" :key="entries[0].id"/>
             </b-col>
         </b-row>
-        <b-row align-h="center" class="d-none d-md-flex">
-            <b-col cols="12">
-                <div class="small text-muted text-truncate">{{ formatHint }}</div>
-            </b-col>
-        </b-row>
-        <!-- detail rows -->
+
+        <!--         detail rows -->
         <div class="card no-body mb-1 pt-2 align-content-center shadow-sm" v-if="showDetails">
             <div v-for="(e, x) in entries" :key="e.id">
                 <b-row class="small justify-content-around">
@@ -149,28 +86,52 @@
                 <div class="pb-1 pb-md-4" v-if="x === entries.length - 1"></div>
             </div>
         </div>
-        <hr class="m-1" v-if="!showDetails"/>
-        <ContextMenu ref="recipe_card" triggers="click, hover" :title="$t('Filters')" style="max-width: 300">
-            <template #menu="{ contextData }" v-if="recipe">
-                <ContextMenuItem>
-                    <RecipeCard :recipe="contextData" :detail="false"></RecipeCard>
-                </ContextMenuItem>
-                <ContextMenuItem @click="$refs.menu.close()">
-                    <b-form-group label-cols="9" content-cols="3" class="text-nowrap m-0 mr-2">
-                        <template #label>
-                            <a class="dropdown-item p-2" href="#"><i class="fas fa-pizza-slice"></i>
-                                {{ $t("Servings") }}</a>
-                        </template>
-                        <div @click.prevent.stop>
-                            <b-form-input class="mt-2" min="0" type="number" v-model="servings"></b-form-input>
-                        </div>
-                    </b-form-group>
-                </ContextMenuItem>
+
+        <b-modal v-model="detail_modal_visible" @hidden="detail_modal_visible = false">
+            <template #modal-title>
+                <h5> {{ food_row }}</h5>
+                <small class="text-muted">{{ entries[0].food.description }}</small>
+
             </template>
-        </ContextMenu>
-        <i class="fa fa-hourglass fa-lg" style="display: none; position: absolute" aria-hidden="true"
-           ref="delay_icon"></i>
-        <i class="fa fa-check fa-lg" style="display: none; position: absolute" aria-hidden="true" ref="check_icon"></i>
+
+            <template #default>
+                <h6 class="mt-2">Actions</h6> <!-- TODO localize -->
+                <b-input :placeholder="$t('Category')" class="mb-2"></b-input>  <!-- TODO implement -->
+
+                <b-button variant="success" block>already available</b-button>  <!-- TODO localize -->
+
+                <b-button variant="info" block>Later</b-button> <!-- TODO localize -->
+
+                <b-button variant="danger" block>{{$t('Delete')}}</b-button>
+
+                <h6 class="mt-2">Details</h6> <!-- TODO localize -->
+                <b-row v-for="e in entries" v-bind:key="e.id">
+                    <b-col cold="12">
+                        <b-button-group class="mt-1 w-100">
+                            <b-button variant="dark" block class="btn btn-block text-left">
+                                <span>{{formatOneAmount(e)}} {{formatOneUnit(e)}} {{formatOneFood(e)}}</span>
+                                <span ><br/><small class="text-muted">
+                                    <span v-if="e.recipe_mealplan && e.recipe_mealplan.recipe_name !== ''">
+                                        <a :href="resolveDjangoUrl('view_recipe', e.recipe_mealplan.recipe)"> {{e.recipe_mealplan.recipe_name}} </a>({{e.recipe_mealplan.servings}} {{$t('Servings')}})<br/>
+                                    </span>
+                                    <span v-if="e.recipe_mealplan && e.recipe_mealplan.mealplan_type !== undefined"> {{ e.recipe_mealplan.mealplan_type}} {{formatDate(e.recipe_mealplan.mealplan_from_date)}} <br/></span>
+
+                                    {{ e.created_by.display_name}} {{ formatDate(e.created_at)}}<br/>
+                                </small></span>
+
+                            </b-button>
+                            <b-button variant="success" @click="updateChecked"><i class="fas fa-check"></i></b-button> <!-- TODO implement -->
+                        </b-button-group>
+
+                    </b-col>
+                </b-row>
+            </template>
+
+            <template #modal-footer>
+                <span></span>
+            </template>
+        </b-modal>
+
     </div>
 </template>
 
@@ -180,7 +141,7 @@ import {BootstrapVue} from "bootstrap-vue"
 import "bootstrap-vue/dist/bootstrap-vue.css"
 import ContextMenu from "@/components/ContextMenu/ContextMenu"
 import ContextMenuItem from "@/components/ContextMenu/ContextMenuItem"
-import {ApiMixin} from "@/utils/utils"
+import {ApiMixin, resolveDjangoUrl} from "@/utils/utils"
 import RecipeCard from "./RecipeCard.vue"
 import Vue2TouchEvents from "vue2-touch-events"
 
@@ -192,7 +153,7 @@ export default {
     // or i'm capturing it incorrectly
     name: "ShoppingLineItem",
     mixins: [ApiMixin],
-    components: {RecipeCard, ContextMenu, ContextMenuItem},
+    components: {},
     props: {
         entries: {
             type: Array,
@@ -206,7 +167,8 @@ export default {
             recipe: undefined,
             servings: 1,
             dragStartX: 0,
-            distance_left: 0
+            distance_left: 0,
+            detail_modal_visible: false,
         }
     },
     computed: {
@@ -266,12 +228,57 @@ export default {
             }
             return ""
         },
+
+        food_row: function () {
+            let item = this.entries[0]
+            return this.formatOneAmount(item) + " " + this.formatOneUnit(item) + " " + this.formatOneFood(item)
+        },
+        info_row: function () {
+            // TODO add setting
+
+            // author
+            if (this.entries.length === 123) {
+                let authors = []
+                this.entries.forEach(e => {
+                    if (authors.indexOf(e.created_by.display_name) === -1) {
+                        authors.push(e.created_by.display_name)
+                    }
+                })
+                return authors.join(', ')
+            }
+
+            if (this.entries.length === 1123) {
+                let recipes = []
+                this.entries.forEach(e => {
+                    if (e.recipe_mealplan !== null) {
+                        let recipe_name = e.recipe_mealplan.recipe_name
+                        if (recipes.indexOf(recipe_name) === -1) {
+                            recipes.push(recipe_name)
+                        }
+                    }
+                })
+                if (recipes.length > 1) {
+                    let short_recipes = []
+                    recipes.forEach(r => {
+                        short_recipes.push(r.substring(0, 14) + (r.length > 14 ? '..' : ''))
+                    })
+                }
+                return recipes.join(', ')
+            }
+
+            if (this.entries.length === 123) {
+                return "Abendessen 31.12" // TODO implement mealplan or manual
+            }
+
+            return this.entries.length
+        }
     },
     watch: {},
     mounted() {
         this.servings = this.entries?.[0]?.recipe_mealplan?.servings ?? 0
     },
     methods: {
+        resolveDjangoUrl,
         // this.genericAPI inherited from ApiMixin
 
         formatDate: function (datetime) {

From ddf9ef11a0ad7d35273cea0bc902784ec29e99c2 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Fri, 22 Dec 2023 13:12:28 +0100
Subject: [PATCH 02/95] basic working shopping list store

---
 .../ShoppingListView/ShoppingListView.vue     |   4 +
 vue/src/stores/ShoppingListStore.js           | 123 ++++++++++++++++++
 2 files changed, 127 insertions(+)
 create mode 100644 vue/src/stores/ShoppingListStore.js

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index b0f8742c..c48bc217 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -631,6 +631,7 @@ Vue.use(VueCookies)
 let SETTINGS_COOKIE_NAME = "shopping_settings"
 import {Workbox} from 'workbox-window';
 import BottomNavigationBar from "@/components/BottomNavigationBar.vue";
+import {useShoppingListStore} from "@/stores/ShoppingListStore";
 
 export default {
     name: "ShoppingListView",
@@ -920,6 +921,9 @@ export default {
             }
         })
         this.$i18n.locale = window.CUSTOM_LOCALE
+
+        let store = useShoppingListStore()
+        store.refreshFromAPI()
     },
     methods: {
         /**
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
new file mode 100644
index 00000000..22e3b19b
--- /dev/null
+++ b/vue/src/stores/ShoppingListStore.js
@@ -0,0 +1,123 @@
+import {ApiApiFactory} from "@/utils/openapi/api"
+import {StandardToasts} from "@/utils/utils"
+import {defineStore} from "pinia"
+import Vue from "vue"
+
+const _STORE_ID = "shopping_list_store"
+const _LOCAL_STORAGE_KEY = "SHOPPING_LIST_CLIENT_SETTINGS"
+/*
+ * test store to play around with pinia and see if it can work for my usecases
+ * dont trust that all shopping list entries are in store as there is no cache validation logic, its just a shared data holder
+ * */
+export const useShoppingListStore = defineStore(_STORE_ID, {
+    state: () => ({
+        category_food_entries: {},
+
+        currently_updating: false,
+        settings: null,
+    }),
+    getters: {
+
+        client_settings: function () {
+            if (this.settings === null) {
+                this.settings = this.loadClientSettings()
+            }
+            return this.settings
+        },
+    },
+    actions: {
+        refreshFromAPI() {
+            /**
+             * Retrieves all shopping list entries from the API and parses them into a structured object category > food > entry
+             */
+            this.category_food_entries = {}
+            Vue.set(this.category_food_entries, -1, {'id': -1, 'name': '', foods: {}}) //TODO use localization to get name for undefined category
+
+            if (!this.currently_updating) {
+                this.currently_updating = true
+                let apiClient = new ApiApiFactory()
+                apiClient.listShoppingListEntrys().then((r) => {
+                    r.data.forEach((e) => {
+                        let category = this.getFoodCategory(e.food)
+                        if (!(category in this.category_food_entries)) {
+                            Vue.set(this.category_food_entries, category, {'id': category, 'name': e.food.supermarket_category.name, foods: {}})
+                        }
+                        if (!(e.food.id in this.category_food_entries[category]['foods'])) {
+                            Vue.set(this.category_food_entries[category]['foods'], e.food.id, {'id': e.food.id, 'name': e.food.name, 'entries': {}})
+                        }
+                        Vue.set(this.category_food_entries[category]['foods'][e.food.id]['entries'], e.id, e)
+                    })
+                    this.currently_updating = false
+                })
+            }
+        },
+        createObject(object) {
+            let apiClient = new ApiApiFactory()
+
+            // TODO shared handled in backend?
+
+            return apiClient.createShoppingListEntry(object).then((r) => {
+                Vue.set(this.category_food_entries[this.getFoodCategory(r.food)]['foods'][r.food.id][r.id], r.id, r)
+            }).catch((err) => {
+                StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
+            })
+        },
+        updateObject(object) {
+            let apiClient = new ApiApiFactory()
+            return apiClient.updateShoppingListEntry(object.id, object).then((r) => {
+                Vue.set(this.category_food_entries[this.getFoodCategory(r.food)]['foods'][r.food.id][r.id], r.id, r)
+            }).catch((err) => {
+                StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
+            })
+        },
+        deleteObject(object) {
+            let apiClient = new ApiApiFactory()
+            return apiClient.destroyShoppingListEntry(object.id).then((r) => {
+                Vue.delete(this.category_food_entries[this.getFoodCategory(object.food)]['foods'][object.food.id], object.id)
+            }).catch((err) => {
+                StandardToasts.makeStandardToast(this, StandardToasts.FAIL_DELETE, err)
+            })
+        },
+        updateClientSettings(settings) {
+            // this.settings = settings
+            // localStorage.setItem(_LOCAL_STORAGE_KEY, JSON.stringify(this.settings))
+        },
+        loadClientSettings() {
+            // let s = localStorage.getItem(_LOCAL_STORAGE_KEY)
+            // if (s === null || s === {}) {
+            //     return {
+            //         displayPeriodUom: "week",
+            //         displayPeriodCount: 3,
+            //         startingDayOfWeek: 1,
+            //         displayWeekNumbers: true,
+            //     }
+            // } else {
+            //     return JSON.parse(s)
+            // }
+        },
+
+        // concenience methods
+        getFoodCategory(food) {
+            /**
+             * Get category id from food or return -1 if food has no category
+             */
+            if (food.supermarket_category !== null) {
+                return food.supermarket_category.id
+            }
+            return -1
+        },
+        delayFood(food) {
+            /**
+             * function to handle user "delaying" shopping entry
+             * takes a food object as an argument and delays all entries associated with the food
+             */
+            let delay = 4 //TODO get delay from settings
+            let delay_date = new Date(Date.now() + delay * (60 * 60 * 1000))
+
+            this.category_food_entries[this.getFoodCategory(food)]['foods'][food.id]['entries'].forEach(e => {
+                e.delayed_until = delay_date
+                this.updateObject(e)
+            })
+        },
+    },
+})

From a70ebd5130d3eef9504377cd96ced3fa02d146ca Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Fri, 22 Dec 2023 14:35:17 +0100
Subject: [PATCH 03/95] somewhat working list

---
 .../ShoppingListView/ShoppingListView.vue     |  77 +---
 vue/src/components/ShoppingLineItem.vue       | 398 +++---------------
 vue/src/stores/ShoppingListStore.js           |  10 +
 3 files changed, 87 insertions(+), 398 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index c48bc217..712b5c1e 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -113,66 +113,22 @@
 
                                 </div>
                                 <!-- shopping list table -->
-                                <div v-if="items && items.length > 0">
-                                    <div v-for="(categories, checked_key) in Sections" :key="checked_key">
-                                        <div v-if="checked_key == 'true'"
-                                             class="bg-header w-100 text-center d-flex justify-content-center align-items-center">
-                                            <span class="h4 d-flex mt-1 mb-1">{{ $t("Completed") }}</span>
-                                        </div>
 
-                                        <div v-for="(foods_group, category_key) in categories" :key="category_key">
-                                            <div class="dropdown b-dropdown position-static inline-block"
-                                                 data-html2canvas-ignore="true"
-                                                 v-if="Object.entries(foods_group).length > 0">
-                                                <button
-                                                    aria-haspopup="true"
-                                                    aria-expanded="false"
-                                                    type="button"
-                                                    class="btn dropdown-toggle btn-link text-decoration-none text-dark pr-2 dropdown-toggle-no-caret"
-                                                    @click.stop="openContextMenu($event, foods_group, true)"
-                                                >
-                                                    <i class="fas fa-ellipsis-v"></i>
-                                                </button>
+                                <b-row v-for="c in shopping_list_store.category_food_entries" v-bind:key="c.id" class="pr-4 pl-4">
+                                    <b-col cols="12">
+                                        <b-button-group class="w-100 mt-1">
+                                            <b-button variant="light" block class="btn btn-block text-left">
+                                                <span v-if="c.id === -1">{{$t('Undefined')}}</span>
+                                                <span v-else>{{ c.name}}</span>
+                                            </b-button>
+                                            <b-button variant="success"><i class="fas fa-check"></i></b-button> <!-- todo implement -->
+                                        </b-button-group>
 
-                                                <b-button
-                                                    class="btn btn-lg text-decoration-none text-dark px-1 py-0 border-0"
-                                                    variant="link"
-                                                    data-toggle="collapse"
-                                                    :href="'#section-' + sectionID(checked_key, category_key)"
-                                                    :aria-expanded="'true' ? checked_key == 'false' : 'true'"
-                                                >
-                                                    <i class="fa fa-chevron-right rotate"/>
-                                                    <span class="h6 ml-2 text-secondary">{{ category_key }}</span>
-                                                </b-button>
-                                            </div>
-
-                                            <div class="collapse"
-                                                 :id="'section-' + sectionID(checked_key, category_key)" visible
-                                                 role="tabpanel" :class="{ show: checked_key == 'false' }">
-                                                <!-- passing an array of values to the table grouped by Food -->
-                                                <transition-group name="slide-fade">
-                                                    <div class="pl-4 pr-0"
-                                                         v-for="(entries, index) in Object.entries(foods_group)"
-                                                         :key="index">
-                                                        <transition name="slide-fade" mode="out-in">
-
-
-
-                                                                                                                        <shopping-line-item
-                                                                                                                            :entries="entries[1]"
-                                                                                                                            :groupby="group_by"
-                                                                                                                            :settings="settings"
-                                                                                                                            @open-context-menu="openContextMenu"
-                                                                                                                            @update-checkbox="updateChecked"
-                                                                                                                            @update-delaythis="delayThis"
-                                                                                                                        />
-                                                        </transition>
-                                                    </div>
-                                                </transition-group>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
+                                        <span v-for="f in c.foods" v-bind:key="f.id">
+                                            <shopping-line-item :entries="f['entries']" class="mt-1"/>
+                                        </span>
+                                    </b-col>
+                                </b-row>
                             </div>
                         </div>
                     </div>
@@ -704,7 +660,9 @@ export default {
                 id: undefined,
             },
             add_recipe_servings: 1,
-            shopping_list_height: '60vh'
+            shopping_list_height: '60vh',
+
+            shopping_list_store: useShoppingListStore()
         }
     },
     computed: {
@@ -926,6 +884,7 @@ export default {
         store.refreshFromAPI()
     },
     methods: {
+        useShoppingListStore,
         /**
          * failed requests to sync entry check events are automatically re-queued by the service worker for sync
          * this command allows to manually force replaying those events before re-enabling automatic sync
diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index e9796e22..6dadfa2b 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -1,96 +1,31 @@
 <template>
-    <div id="shopping_line_item" class="pt-1">
-        <b-row>
-            <b-col cold="12">
-                <b-button-group class="mt-1 w-100 pr-5">
-                    <b-button variant="dark" block class="btn btn-block text-left" @click="detail_modal_visible = true">
-                        <span>{{ food_row }}</span>
-                        <span v-if="info_row"><br/><small class="text-muted">{{ info_row }}</small></span>
+    <div id="shopping_line_item">
 
-                    </b-button>
-                    <b-button variant="success" @click="updateChecked"><i class="fas fa-check"></i></b-button>
-                </b-button-group>
+        <b-button-group class="w-100">
+            <b-button variant="dark" block class="btn btn-block text-left" @click="detail_modal_visible = true">
+                <div class="d-flex ">
+                    <div class="d-flex flex-column pr-2" v-if="Object.keys(amounts).length> 0">
+                        <span v-for="a in amounts" v-bind:key="a.id">{{ a.amount }} {{ a.unit }}<br/></span>
+                    </div>
+                    <div class="d-flex  flex-column flex-grow-1 align-self-center">
+                        {{ food.name }}
+                    </div>
+                </div>
 
-            </b-col>
-        </b-row>
+                <div class="flex-row">
+                    <span v-if="info_row"><br/><small class="text-muted">{{ info_row }} INFO</small></span>
+                </div>
+
+
+            </b-button>
+            <b-button variant="success"><i class="fas fa-check"></i></b-button>
+        </b-button-group>
 
-        <!--         detail rows -->
-        <div class="card no-body mb-1 pt-2 align-content-center shadow-sm" v-if="showDetails">
-            <div v-for="(e, x) in entries" :key="e.id">
-                <b-row class="small justify-content-around">
-                    <b-col cols="auto" md="4" class="overflow-hidden text-nowrap">
-                        <button
-                            aria-haspopup="true"
-                            aria-expanded="false"
-                            type="button"
-                            class="btn btn-link btn-sm m-0 p-0 pl-2"
-                            style="text-overflow: ellipsis"
-                            @click.stop="openRecipeCard($event, e)"
-                            @mouseover="openRecipeCard($event, e)"
-                        >
-                            {{ formatOneRecipe(e) }}
-                        </button>
-                    </b-col>
-                    <b-col cols="auto" md="4" class="text-muted">{{ formatOneMealPlan(e) }}</b-col>
-                    <b-col cols="auto" md="4" class="text-muted text-right overflow-hidden text-nowrap pr-4">
-                        {{ formatOneCreatedBy(e) }}
-                        <div v-if="formatOneCompletedAt(e)">{{ formatOneCompletedAt(e) }}</div>
-                    </b-col>
-                </b-row>
-                <b-row align-h="start">
-                    <b-col cols="3" md="2" class="justify-content-start align-items-center d-flex d-md-none pr-0"
-                           v-if="settings.left_handed">
-                        <input type="checkbox" class="form-control form-control-sm checkbox-control-mobile"
-                               :checked="formatChecked" @change="updateChecked" :key="entries[0].id"/>
-                    </b-col>
-                    <b-col cols="2" md="1" class="align-items-center d-flex">
-                        <div class="dropdown b-dropdown position-static inline-block" data-html2canvas-ignore="true"
-                             @click.stop="$emit('open-context-menu', $event, e)">
-                            <button
-                                aria-haspopup="true"
-                                aria-expanded="false"
-                                type="button"
-                                :class="settings.left_handed ? 'dropdown-spacing' : ''"
-                                class="btn dropdown-toggle btn-link text-decoration-none text-body pr-1 pr-md-3 pl-md-3 dropdown-toggle-no-caret"
-                            >
-                                <i class="fas fa-ellipsis-v fa-lg"></i>
-                            </button>
-                        </div>
-                    </b-col>
-                    <b-col cols="1" class="justify-content-center align-items-center d-none d-md-flex">
-                        <input type="checkbox" class="form-control form-control-sm checkbox-control"
-                               :checked="formatChecked" @change="updateChecked" :key="entries[0].id"/>
-                    </b-col>
-                    <b-col cols="7" md="9">
-                        <b-row class="d-flex align-items-center h-100">
-                            <b-col cols="5" md="3" class="d-flex align-items-center">
-                                <strong class="mr-1">{{ formatOneAmount(e) }}</strong> {{ formatOneUnit(e) }}
-                            </b-col>
-                            <b-col cols="7" md="6" class="align-items-center d-flex pl-0 pr-0 pl-md-2 pr-md-2">
-                                {{ formatOneFood(e) }}
-                            </b-col>
-                            <b-col cols="12" class="d-flex d-md-none">
-                                <div class="small text-muted text-truncate" v-for="(n, i) in formatOneNote(e)"
-                                     :key="i">{{ n }}
-                                </div>
-                            </b-col>
-                        </b-row>
-                    </b-col>
-                    <b-col cols="3" md="2" class="justify-content-start align-items-center d-flex d-md-none"
-                           v-if="!settings.left_handed">
-                        <input type="checkbox" class="form-control form-control-sm checkbox-control-mobile"
-                               :checked="formatChecked" @change="updateChecked" :key="entries[0].id"/>
-                    </b-col>
-                </b-row>
-                <hr class="w-75 mt-1 mb-1 mt-md-3 mb-md-3" v-if="x !== entries.length - 1"/>
-                <div class="pb-1 pb-md-4" v-if="x === entries.length - 1"></div>
-            </div>
-        </div>
 
         <b-modal v-model="detail_modal_visible" @hidden="detail_modal_visible = false">
             <template #modal-title>
                 <h5> {{ food_row }}</h5>
-                <small class="text-muted">{{ entries[0].food.description }}</small>
+                <small class="text-muted">{{ food.description }}</small>
 
             </template>
 
@@ -102,25 +37,30 @@
 
                 <b-button variant="info" block>Later</b-button> <!-- TODO localize -->
 
-                <b-button variant="danger" block>{{$t('Delete')}}</b-button>
+                <b-button variant="danger" block>{{ $t('Delete') }}</b-button>
 
                 <h6 class="mt-2">Details</h6> <!-- TODO localize -->
                 <b-row v-for="e in entries" v-bind:key="e.id">
                     <b-col cold="12">
                         <b-button-group class="mt-1 w-100">
                             <b-button variant="dark" block class="btn btn-block text-left">
-                                <span>{{formatOneAmount(e)}} {{formatOneUnit(e)}} {{formatOneFood(e)}}</span>
-                                <span ><br/><small class="text-muted">
+                                <span>{{ food.name }}</span>
+                                <span><br/><small class="text-muted">
                                     <span v-if="e.recipe_mealplan && e.recipe_mealplan.recipe_name !== ''">
-                                        <a :href="resolveDjangoUrl('view_recipe', e.recipe_mealplan.recipe)"> {{e.recipe_mealplan.recipe_name}} </a>({{e.recipe_mealplan.servings}} {{$t('Servings')}})<br/>
+                                        <a :href="resolveDjangoUrl('view_recipe', e.recipe_mealplan.recipe)"> {{ e.recipe_mealplan.recipe_name }} </a>({{
+                                            e.recipe_mealplan.servings
+                                        }} {{ $t('Servings') }})<br/>
                                     </span>
-                                    <span v-if="e.recipe_mealplan && e.recipe_mealplan.mealplan_type !== undefined"> {{ e.recipe_mealplan.mealplan_type}} {{formatDate(e.recipe_mealplan.mealplan_from_date)}} <br/></span>
+                                    <span
+                                        v-if="e.recipe_mealplan && e.recipe_mealplan.mealplan_type !== undefined"> {{
+                                            e.recipe_mealplan.mealplan_type
+                                        }} {{ formatDate(e.recipe_mealplan.mealplan_from_date) }} <br/></span>
 
-                                    {{ e.created_by.display_name}} {{ formatDate(e.created_at)}}<br/>
+                                    {{ e.created_by.display_name }} {{ formatDate(e.created_at) }}<br/>
                                 </small></span>
 
                             </b-button>
-                            <b-button variant="success" @click="updateChecked"><i class="fas fa-check"></i></b-button> <!-- TODO implement -->
+                            <b-button variant="success"><i class="fas fa-check"></i></b-button> <!-- TODO implement -->
                         </b-button-group>
 
                     </b-col>
@@ -139,99 +79,55 @@
 import Vue from "vue"
 import {BootstrapVue} from "bootstrap-vue"
 import "bootstrap-vue/dist/bootstrap-vue.css"
-import ContextMenu from "@/components/ContextMenu/ContextMenu"
-import ContextMenuItem from "@/components/ContextMenu/ContextMenuItem"
 import {ApiMixin, resolveDjangoUrl} from "@/utils/utils"
-import RecipeCard from "./RecipeCard.vue"
-import Vue2TouchEvents from "vue2-touch-events"
+
 
 Vue.use(BootstrapVue)
-Vue.use(Vue2TouchEvents)
 
 export default {
-    // TODO ApiGenerator doesn't capture and share error information - would be nice to share error details when available
-    // or i'm capturing it incorrectly
     name: "ShoppingLineItem",
     mixins: [ApiMixin],
     components: {},
     props: {
-        entries: {
-            type: Array,
-        },
-        settings: Object,
-        groupby: {type: String},
+        entries: {type: Object,},
     },
     data() {
         return {
-            showDetails: false,
-            recipe: undefined,
-            servings: 1,
-            dragStartX: 0,
-            distance_left: 0,
             detail_modal_visible: false,
         }
     },
     computed: {
-        formatAmount: function () {
-            let amount = {}
-            this.entries.forEach((entry) => {
-                let unit = entry?.unit?.name ?? "---"
-                if (entry.amount) {
-                    if (amount[unit]) {
-                        amount[unit] += entry.amount
+        food: function () {
+            return this.entries[Object.keys(this.entries)[0]]['food']
+        },
+        amounts: function () {
+            let unit_amounts = {}
+
+            for (let i in this.entries) {
+                let e = this.entries[i]
+
+                let unit = -1
+                if (e.unit !== undefined && e.unit !== null) {
+                    unit = e.unit.id
+                }
+                if (e.amount > 0) {
+                    if (unit in unit_amounts) {
+                        unit_amounts[unit]['amount'] += e.amount
                     } else {
-                        amount[unit] = entry.amount
+                        if (unit === -1) {
+                            unit_amounts[unit] = {id: -1, unit: "", amount: e.amount}
+                        } else {
+                            unit_amounts[unit] = {id: e.unit.id, unit: e.unit.name, amount: e.amount}
+                        }
+
                     }
                 }
-            })
-            for (const [k, v] of Object.entries(amount)) {
-                amount[k] = Math.round(v * 100 + Number.EPSILON) / 100 // javascript hack to force rounding at 2 places
-            }
-            return amount
-        },
-        formatCategory: function () {
-            return this.formatOneCategory(this.entries[0]) || this.$t("Undefined")
-        },
-        formatChecked: function () {
-            return this.entries.map((x) => x.checked).every((x) => x === true)
-        },
-        formatHint: function () {
-            if (this.groupby == "recipe") {
-                return this.formatCategory
-            } else {
-                return this.formatRecipe
-            }
-        },
-        formatFood: function () {
-            return this.formatOneFood(this.entries[0])
-        },
-        formatUnit: function () {
-            return this.formatOneUnit(this.entries[0])
-        },
-        formatRecipe: function () {
-            if (this.entries?.length == 1) {
-                return this.formatOneMealPlan(this.entries[0]) || ""
-            } else {
-                let mealplan_name = this.entries.filter((x) => x?.recipe_mealplan?.name)
-                // return [this.formatOneMealPlan(mealplan_name?.[0]), this.$t("CountMore", { count: this.entries?.length - 1 })].join("  ")
 
-                return mealplan_name
-                    .map((x) => {
-                        return this.formatOneMealPlan(x)
-                    })
-                    .join(" - ")
             }
+            return unit_amounts
         },
-        formatNotes: function () {
-            if (this.entries?.length == 1) {
-                return this.formatOneNote(this.entries[0]) || ""
-            }
-            return ""
-        },
-
         food_row: function () {
-            let item = this.entries[0]
-            return this.formatOneAmount(item) + " " + this.formatOneUnit(item) + " " + this.formatOneFood(item)
+            return this.food.name
         },
         info_row: function () {
             // TODO add setting
@@ -275,11 +171,10 @@ export default {
     },
     watch: {},
     mounted() {
-        this.servings = this.entries?.[0]?.recipe_mealplan?.servings ?? 0
+
     },
     methods: {
         resolveDjangoUrl,
-        // this.genericAPI inherited from ApiMixin
 
         formatDate: function (datetime) {
             if (!datetime) {
@@ -290,187 +185,12 @@ export default {
                 timeStyle: "short",
             }).format(Date.parse(datetime))
         },
-        startHandler: function (event) {
-            if (event.changedTouches.length > 0) {
-                this.dragStartX = event.changedTouches[0].clientX
-            }
-        },
-        getOffset(el) {
-            let rect = el.getBoundingClientRect();
-            return {
-                left: rect.left + window.scrollX,
-                top: rect.top + window.scrollY,
-                right: rect.right - window.scrollX,
-            };
-        },
-        moveHandler: function (event) {
-            let item = this.$refs['shopping_line_item'];
-            this.distance_left = event.changedTouches[0].clientX - this.dragStartX;
-            item.style.marginLeft = this.distance_left
-            item.style.marginRight = -this.distance_left
-            item.style.backgroundColor = '#ddbf86'
-            item.style.border = "1px solid #000"
 
-            let delay_icon = this.$refs['delay_icon']
-            let check_icon = this.$refs['check_icon']
-
-            let color_factor = Math.abs(this.distance_left) / 100
-
-            if (this.distance_left > 0) {
-                item.parentElement.parentElement.style.backgroundColor = 'rgba(130,170,139,0)'.replace(/[^,]+(?=\))/, color_factor)
-                check_icon.style.display = "block"
-                check_icon.style.left = this.getOffset(item.parentElement.parentElement).left + 40
-                check_icon.style.top = this.getOffset(item.parentElement.parentElement).top - 92
-                check_icon.style.opacity = color_factor - 0.3
-            } else {
-                item.parentElement.parentElement.style.backgroundColor = 'rgba(185,135,102,0)'.replace(/[^,]+(?=\))/, color_factor)
-                delay_icon.style.display = "block"
-                delay_icon.style.left = this.getOffset(item.parentElement.parentElement).right - 40
-                delay_icon.style.top = this.getOffset(item.parentElement.parentElement).top - 92
-                delay_icon.style.opacity = color_factor - 0.3
-            }
-        },
-        endHandler: function (event) {
-            let item = this.$refs['shopping_line_item'];
-            item.removeAttribute('style');
-            item.parentElement.parentElement.removeAttribute('style');
-
-            let delay_icon = this.$refs['delay_icon']
-            let check_icon = this.$refs['check_icon']
-
-            delay_icon.style.display = "none"
-            check_icon.style.display = "none"
-
-            if (Math.abs(this.distance_left) > window.screen.width / 6) {
-                if (this.distance_left > 0) {
-                    let checked = false;
-                    this.entries.forEach((cur) => {
-                        checked = cur.checked
-                    })
-                    let update = {entries: this.entries.map((x) => x.id), checked: !checked}
-                    this.$emit("update-checkbox", update)
-                } else {
-                    this.$emit("update-delaythis", this.entries)
-                }
-            }
-        },
-        formatOneAmount: function (item) {
-            return item?.amount ?? 1
-        },
-        formatOneUnit: function (item) {
-            return item?.unit?.name ?? ""
-        },
-        formatOneCategory: function (item) {
-            return item?.food?.supermarket_category?.name
-        },
-        formatOneCompletedAt: function (item) {
-            if (!item.completed_at) {
-                return false
-            }
-            return [this.$t("Completed"), "@", this.formatDate(item.completed_at)].join(" ")
-        },
-        formatOneFood: function (item) {
-            return item.food.name
-        },
-        formatOneDelayUntil: function (item) {
-            if (!item.delay_until || (item.delay_until && item.checked)) {
-                return false
-            }
-            return [this.$t("DelayUntil"), "-", this.formatDate(item.delay_until)].join(" ")
-        },
-        formatOneMealPlan: function (item) {
-            return item?.recipe_mealplan?.name ?? ""
-        },
-        formatOneRecipe: function (item) {
-            return item?.recipe_mealplan?.recipe_name ?? ""
-        },
-        formatOneNote: function (item) {
-            if (!item) {
-                item = this.entries[0]
-            }
-            return [item?.recipe_mealplan?.mealplan_note, item?.ingredient_note].filter(String)
-        },
-        formatOneCreatedBy: function (item) {
-            return [this.$t("Added_by"), item?.created_by.display_name, "@", this.formatDate(item.created_at)].join(" ")
-        },
-        openRecipeCard: function (e, item) {
-            this.genericAPI(this.Models.RECIPE, this.Actions.FETCH, {id: item.recipe_mealplan.recipe}).then((result) => {
-                let recipe = result.data
-                recipe.steps = undefined
-                this.recipe = true
-                this.$refs.recipe_card.open(e, recipe)
-            })
-        },
-        updateChecked: function (e, item) {
-            let update = undefined
-            if (!item) {
-                update = {entries: this.entries.map((x) => x.id), checked: !this.formatChecked}
-            } else {
-                update = {entries: [item], checked: !item.checked}
-            }
-            console.log(update)
-            this.$emit("update-checkbox", update)
-        },
     },
 }
 </script>
 
-<!--style src="vue-multiselect/dist/vue-multiselect.min.css"></style-->
 
 <style>
-/* table           { border-collapse:collapse } /* Ensure no space between cells   */
-/* tr.strikeout td { position:relative        } /* Setup a new coordinate system   */
-/* tr.strikeout td:before {                     /* Create a new element that       */
-/*   content: " ";                              /* …has no text content            */
-/*   position: absolute;                        /* …is absolutely positioned       */
-/*   left: 0; top: 50%; width: 100%;            /* …with the top across the middle */
-/*   border-bottom: 1px solid #000;             /* …and with a border on the top   */
-/* }   */
-.checkbox-control {
-    font-size: 0.6rem;
-}
 
-.checkbox-control-mobile {
-    font-size: 1rem;
-}
-
-.rotate {
-    -moz-transition: all 0.25s linear;
-    -webkit-transition: all 0.25s linear;
-    transition: all 0.25s linear;
-}
-
-.rotated {
-    -moz-transform: rotate(90deg);
-    -webkit-transform: rotate(90deg);
-    transform: rotate(90deg);
-}
-
-.unit-badge-lg {
-    font-size: 1rem !important;
-    font-weight: 500 !important;
-}
-
-@media (max-width: 768px) {
-    .dropdown-spacing {
-        padding-left: 0 !important;
-        padding-right: 0 !important;
-    }
-}
-
-.invis-border {
-    border: 1px solid transparent;
-}
-
-@media (min-width: 992px) {
-    .fa-ellipsis-v {
-        font-size: 20px;
-    }
-}
-
-@media (min-width: 576px) {
-    .fa-ellipsis-v {
-        font-size: 16px;
-    }
-}
 </style>
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index 22e3b19b..8dfed2bd 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -106,6 +106,16 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
             }
             return -1
         },
+        toggleFoodCheckedState(food) {
+            /**
+             * function to handle user checking or unchecking a food
+             */
+
+            this.category_food_entries[this.getFoodCategory(food)]['foods'][food.id]['entries'].forEach(e => {
+                e.checked = !e.checked
+                this.updateObject(e)
+            })
+        },
         delayFood(food) {
             /**
              * function to handle user "delaying" shopping entry

From 3b916cc6a40f364e96356164767e3ea07c8ac16d Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Fri, 22 Dec 2023 14:48:58 +0100
Subject: [PATCH 04/95] fixed schema for recipe from source endpoint

---
 cookbook/views/api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cookbook/views/api.py b/cookbook/views/api.py
index 189d04fd..55261fff 100644
--- a/cookbook/views/api.py
+++ b/cookbook/views/api.py
@@ -1340,7 +1340,7 @@ class CustomAuthToken(ObtainAuthToken):
         })
 
 
-class RecipeUrlImportView(ObtainAuthToken):
+class RecipeUrlImportView(APIView):
     throttle_classes = [RecipeImportThrottle]
     permission_classes = [CustomIsUser & CustomTokenHasReadWriteScope]
 

From 245e8311ba4688f7b6adc54468114a64e31aeedd Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Fri, 22 Dec 2023 15:10:56 +0100
Subject: [PATCH 05/95] more basics working

---
 vue/src/components/ShoppingLineItem.vue |   12 +-
 vue/src/locales/en.json                 |    1 +
 vue/src/stores/ShoppingListStore.js     |   34 +-
 vue/src/utils/openapi/api.ts            | 3935 ++++++++++++++++++++++-
 4 files changed, 3902 insertions(+), 80 deletions(-)

diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index 6dadfa2b..ed4ee492 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -18,7 +18,7 @@
 
 
             </b-button>
-            <b-button variant="success"><i class="fas fa-check"></i></b-button>
+            <b-button variant="success" @click="useShoppingListStore().toggleFoodCheckedState(food)"><i class="fas fa-check"></i></b-button>
         </b-button-group>
 
 
@@ -33,11 +33,11 @@
                 <h6 class="mt-2">Actions</h6> <!-- TODO localize -->
                 <b-input :placeholder="$t('Category')" class="mb-2"></b-input>  <!-- TODO implement -->
 
-                <b-button variant="success" block>already available</b-button>  <!-- TODO localize -->
+                <b-button variant="success" block @click="detail_modal_visible = false;"> {{ $t("Edit_Food") }}</b-button>  <!-- TODO implement -->
 
-                <b-button variant="info" block>Later</b-button> <!-- TODO localize -->
+                <b-button variant="info" block @click="detail_modal_visible = false;useShoppingListStore().delayFood(food)">{{$t('Delay')}}</b-button>
 
-                <b-button variant="danger" block>{{ $t('Delete') }}</b-button>
+                <b-button variant="danger" block @click="detail_modal_visible = false;useShoppingListStore().deleteFood(food)">{{ $t('Delete') }}</b-button>
 
                 <h6 class="mt-2">Details</h6> <!-- TODO localize -->
                 <b-row v-for="e in entries" v-bind:key="e.id">
@@ -80,6 +80,8 @@ import Vue from "vue"
 import {BootstrapVue} from "bootstrap-vue"
 import "bootstrap-vue/dist/bootstrap-vue.css"
 import {ApiMixin, resolveDjangoUrl} from "@/utils/utils"
+import {useMealPlanStore} from "@/stores/MealPlanStore";
+import {useShoppingListStore} from "@/stores/ShoppingListStore";
 
 
 Vue.use(BootstrapVue)
@@ -174,6 +176,8 @@ export default {
 
     },
     methods: {
+        useShoppingListStore,
+        useMealPlanStore,
         resolveDjangoUrl,
 
         formatDate: function (datetime) {
diff --git a/vue/src/locales/en.json b/vue/src/locales/en.json
index d775f7c3..3f18e1a5 100644
--- a/vue/src/locales/en.json
+++ b/vue/src/locales/en.json
@@ -342,6 +342,7 @@
     "copy_markdown_table": "Copy as Markdown Table",
     "in_shopping": "In Shopping List",
     "DelayUntil": "Delay Until",
+    "Delay": "Delay",
     "Pin": "Pin",
     "Unpin": "Unpin",
     "PinnedConfirmation": "{recipe} has been pinned.",
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index 8dfed2bd..982387b0 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -73,7 +73,11 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
         deleteObject(object) {
             let apiClient = new ApiApiFactory()
             return apiClient.destroyShoppingListEntry(object.id).then((r) => {
-                Vue.delete(this.category_food_entries[this.getFoodCategory(object.food)]['foods'][object.food.id], object.id)
+
+                Vue.delete(this.category_food_entries[this.getFoodCategory(object.food)]['foods'][object.food.id]['entries'], object.id)
+                if (Object.keys(this.category_food_entries[this.getFoodCategory(object.food)]['foods'][object.food.id]['entries']).length === 0) {
+                    Vue.delete(this.category_food_entries[this.getFoodCategory(object.food)]['foods'], object.food.id)
+                }
             }).catch((err) => {
                 StandardToasts.makeStandardToast(this, StandardToasts.FAIL_DELETE, err)
             })
@@ -111,10 +115,11 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
              * function to handle user checking or unchecking a food
              */
 
-            this.category_food_entries[this.getFoodCategory(food)]['foods'][food.id]['entries'].forEach(e => {
-                e.checked = !e.checked
-                this.updateObject(e)
-            })
+            let entries = this.category_food_entries[this.getFoodCategory(food)]['foods'][food.id]['entries']
+            for (let i in entries) {
+                entries[i].checked = !entries[i].checked
+                this.updateObject(entries[i])
+            }
         },
         delayFood(food) {
             /**
@@ -124,10 +129,21 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
             let delay = 4 //TODO get delay from settings
             let delay_date = new Date(Date.now() + delay * (60 * 60 * 1000))
 
-            this.category_food_entries[this.getFoodCategory(food)]['foods'][food.id]['entries'].forEach(e => {
-                e.delayed_until = delay_date
-                this.updateObject(e)
-            })
+            let entries = this.category_food_entries[this.getFoodCategory(food)]['foods'][food.id]['entries']
+            for (let i in entries) {
+                entries[i].delayed_until = delay_date
+                this.updateObject(entries[i])
+            }
+
+        },
+        deleteFood(food) {
+            /**
+             * function to handle user deleting all entries of a certain food
+             */
+            let entries = this.category_food_entries[this.getFoodCategory(food)]['foods'][food.id]['entries']
+            for (let i in entries) {
+                this.deleteObject(entries[i])
+            }
         },
     },
 })
diff --git a/vue/src/utils/openapi/api.ts b/vue/src/utils/openapi/api.ts
index c3fa5339..d61dbcb8 100644
--- a/vue/src/utils/openapi/api.ts
+++ b/vue/src/utils/openapi/api.ts
@@ -2091,6 +2091,957 @@ export interface MealType {
      */
     created_by?: string;
 }
+/**
+ * 
+ * @export
+ * @interface OpenDataCategory
+ */
+export interface OpenDataCategory {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataCategory
+     */
+    id?: number;
+    /**
+     * 
+     * @type {OpenDataUnitVersion}
+     * @memberof OpenDataCategory
+     */
+    version: OpenDataUnitVersion;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataCategory
+     */
+    slug: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataCategory
+     */
+    name: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataCategory
+     */
+    description?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataCategory
+     */
+    comment?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataCategory
+     */
+    created_by?: string;
+}
+/**
+ * 
+ * @export
+ * @interface OpenDataConversion
+ */
+export interface OpenDataConversion {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataConversion
+     */
+    id?: number;
+    /**
+     * 
+     * @type {OpenDataUnitVersion}
+     * @memberof OpenDataConversion
+     */
+    version: OpenDataUnitVersion;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversion
+     */
+    slug: string;
+    /**
+     * 
+     * @type {OpenDataConversionFood}
+     * @memberof OpenDataConversion
+     */
+    food: OpenDataConversionFood;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversion
+     */
+    base_amount: string;
+    /**
+     * 
+     * @type {OpenDataConversionFoodPropertiesFoodUnit}
+     * @memberof OpenDataConversion
+     */
+    base_unit: OpenDataConversionFoodPropertiesFoodUnit;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversion
+     */
+    converted_amount: string;
+    /**
+     * 
+     * @type {OpenDataConversionFoodPropertiesFoodUnit}
+     * @memberof OpenDataConversion
+     */
+    converted_unit: OpenDataConversionFoodPropertiesFoodUnit;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversion
+     */
+    source: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversion
+     */
+    comment?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversion
+     */
+    created_by?: string;
+}
+/**
+ * 
+ * @export
+ * @interface OpenDataConversionFood
+ */
+export interface OpenDataConversionFood {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataConversionFood
+     */
+    id?: number;
+    /**
+     * 
+     * @type {OpenDataUnitVersion}
+     * @memberof OpenDataConversionFood
+     */
+    version: OpenDataUnitVersion;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFood
+     */
+    slug: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFood
+     */
+    name: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFood
+     */
+    plural_name: string;
+    /**
+     * 
+     * @type {OpenDataStoreCategory}
+     * @memberof OpenDataConversionFood
+     */
+    store_category: OpenDataStoreCategory;
+    /**
+     * 
+     * @type {OpenDataConversionFoodPreferredUnitMetric}
+     * @memberof OpenDataConversionFood
+     */
+    preferred_unit_metric?: OpenDataConversionFoodPreferredUnitMetric | null;
+    /**
+     * 
+     * @type {OpenDataConversionFoodPreferredUnitMetric}
+     * @memberof OpenDataConversionFood
+     */
+    preferred_shopping_unit_metric?: OpenDataConversionFoodPreferredUnitMetric | null;
+    /**
+     * 
+     * @type {OpenDataConversionFoodPreferredUnitMetric}
+     * @memberof OpenDataConversionFood
+     */
+    preferred_unit_imperial?: OpenDataConversionFoodPreferredUnitMetric | null;
+    /**
+     * 
+     * @type {OpenDataConversionFoodPreferredUnitMetric}
+     * @memberof OpenDataConversionFood
+     */
+    preferred_shopping_unit_imperial?: OpenDataConversionFoodPreferredUnitMetric | null;
+    /**
+     * 
+     * @type {Array<OpenDataConversionFoodProperties>}
+     * @memberof OpenDataConversionFood
+     */
+    properties: Array<OpenDataConversionFoodProperties> | null;
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataConversionFood
+     */
+    properties_food_amount?: number;
+    /**
+     * 
+     * @type {OpenDataConversionFoodPropertiesFoodUnit}
+     * @memberof OpenDataConversionFood
+     */
+    properties_food_unit: OpenDataConversionFoodPropertiesFoodUnit;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFood
+     */
+    properties_source?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFood
+     */
+    fdc_id: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFood
+     */
+    comment?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFood
+     */
+    created_by?: string;
+}
+/**
+ * 
+ * @export
+ * @interface OpenDataConversionFoodPreferredUnitMetric
+ */
+export interface OpenDataConversionFoodPreferredUnitMetric {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataConversionFoodPreferredUnitMetric
+     */
+    id?: number;
+    /**
+     * 
+     * @type {OpenDataUnitVersion}
+     * @memberof OpenDataConversionFoodPreferredUnitMetric
+     */
+    version: OpenDataUnitVersion;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodPreferredUnitMetric
+     */
+    slug: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodPreferredUnitMetric
+     */
+    name: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodPreferredUnitMetric
+     */
+    plural_name?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodPreferredUnitMetric
+     */
+    base_unit?: OpenDataConversionFoodPreferredUnitMetricBaseUnitEnum;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodPreferredUnitMetric
+     */
+    type: OpenDataConversionFoodPreferredUnitMetricTypeEnum;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodPreferredUnitMetric
+     */
+    comment?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodPreferredUnitMetric
+     */
+    created_by?: string;
+}
+
+/**
+    * @export
+    * @enum {string}
+    */
+export enum OpenDataConversionFoodPreferredUnitMetricBaseUnitEnum {
+    G = 'G',
+    Kg = 'KG',
+    Ml = 'ML',
+    L = 'L',
+    Ounce = 'OUNCE',
+    Pound = 'POUND',
+    FluidOunce = 'FLUID_OUNCE',
+    Tsp = 'TSP',
+    Tbsp = 'TBSP',
+    Cup = 'CUP',
+    Pint = 'PINT',
+    Quart = 'QUART',
+    Gallon = 'GALLON',
+    ImperialFluidOunce = 'IMPERIAL_FLUID_OUNCE',
+    ImperialPint = 'IMPERIAL_PINT',
+    ImperialQuart = 'IMPERIAL_QUART',
+    ImperialGallon = 'IMPERIAL_GALLON'
+}
+/**
+    * @export
+    * @enum {string}
+    */
+export enum OpenDataConversionFoodPreferredUnitMetricTypeEnum {
+    Weight = 'WEIGHT',
+    Volume = 'VOLUME',
+    Other = 'OTHER'
+}
+
+/**
+ * 
+ * @export
+ * @interface OpenDataConversionFoodProperties
+ */
+export interface OpenDataConversionFoodProperties {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataConversionFoodProperties
+     */
+    id?: number;
+    /**
+     * 
+     * @type {OpenDataConversionFoodProperty}
+     * @memberof OpenDataConversionFoodProperties
+     */
+    property: OpenDataConversionFoodProperty;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodProperties
+     */
+    property_amount: string;
+}
+/**
+ * 
+ * @export
+ * @interface OpenDataConversionFoodPropertiesFoodUnit
+ */
+export interface OpenDataConversionFoodPropertiesFoodUnit {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataConversionFoodPropertiesFoodUnit
+     */
+    id?: number;
+    /**
+     * 
+     * @type {OpenDataUnitVersion}
+     * @memberof OpenDataConversionFoodPropertiesFoodUnit
+     */
+    version: OpenDataUnitVersion;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodPropertiesFoodUnit
+     */
+    slug: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodPropertiesFoodUnit
+     */
+    name: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodPropertiesFoodUnit
+     */
+    plural_name?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodPropertiesFoodUnit
+     */
+    base_unit?: OpenDataConversionFoodPropertiesFoodUnitBaseUnitEnum;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodPropertiesFoodUnit
+     */
+    type: OpenDataConversionFoodPropertiesFoodUnitTypeEnum;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodPropertiesFoodUnit
+     */
+    comment?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodPropertiesFoodUnit
+     */
+    created_by?: string;
+}
+
+/**
+    * @export
+    * @enum {string}
+    */
+export enum OpenDataConversionFoodPropertiesFoodUnitBaseUnitEnum {
+    G = 'G',
+    Kg = 'KG',
+    Ml = 'ML',
+    L = 'L',
+    Ounce = 'OUNCE',
+    Pound = 'POUND',
+    FluidOunce = 'FLUID_OUNCE',
+    Tsp = 'TSP',
+    Tbsp = 'TBSP',
+    Cup = 'CUP',
+    Pint = 'PINT',
+    Quart = 'QUART',
+    Gallon = 'GALLON',
+    ImperialFluidOunce = 'IMPERIAL_FLUID_OUNCE',
+    ImperialPint = 'IMPERIAL_PINT',
+    ImperialQuart = 'IMPERIAL_QUART',
+    ImperialGallon = 'IMPERIAL_GALLON'
+}
+/**
+    * @export
+    * @enum {string}
+    */
+export enum OpenDataConversionFoodPropertiesFoodUnitTypeEnum {
+    Weight = 'WEIGHT',
+    Volume = 'VOLUME',
+    Other = 'OTHER'
+}
+
+/**
+ * 
+ * @export
+ * @interface OpenDataConversionFoodProperty
+ */
+export interface OpenDataConversionFoodProperty {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataConversionFoodProperty
+     */
+    id?: number;
+    /**
+     * 
+     * @type {OpenDataUnitVersion}
+     * @memberof OpenDataConversionFoodProperty
+     */
+    version: OpenDataUnitVersion;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodProperty
+     */
+    slug: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodProperty
+     */
+    name: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodProperty
+     */
+    unit?: string;
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataConversionFoodProperty
+     */
+    fdc_id?: number | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodProperty
+     */
+    comment?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodProperty
+     */
+    created_by?: string;
+}
+/**
+ * 
+ * @export
+ * @interface OpenDataFood
+ */
+export interface OpenDataFood {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataFood
+     */
+    id?: number;
+    /**
+     * 
+     * @type {OpenDataUnitVersion}
+     * @memberof OpenDataFood
+     */
+    version: OpenDataUnitVersion;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataFood
+     */
+    slug: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataFood
+     */
+    name: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataFood
+     */
+    plural_name: string;
+    /**
+     * 
+     * @type {OpenDataStoreCategory}
+     * @memberof OpenDataFood
+     */
+    store_category: OpenDataStoreCategory;
+    /**
+     * 
+     * @type {OpenDataConversionFoodPreferredUnitMetric}
+     * @memberof OpenDataFood
+     */
+    preferred_unit_metric?: OpenDataConversionFoodPreferredUnitMetric | null;
+    /**
+     * 
+     * @type {OpenDataConversionFoodPreferredUnitMetric}
+     * @memberof OpenDataFood
+     */
+    preferred_shopping_unit_metric?: OpenDataConversionFoodPreferredUnitMetric | null;
+    /**
+     * 
+     * @type {OpenDataConversionFoodPreferredUnitMetric}
+     * @memberof OpenDataFood
+     */
+    preferred_unit_imperial?: OpenDataConversionFoodPreferredUnitMetric | null;
+    /**
+     * 
+     * @type {OpenDataConversionFoodPreferredUnitMetric}
+     * @memberof OpenDataFood
+     */
+    preferred_shopping_unit_imperial?: OpenDataConversionFoodPreferredUnitMetric | null;
+    /**
+     * 
+     * @type {Array<OpenDataConversionFoodProperties>}
+     * @memberof OpenDataFood
+     */
+    properties: Array<OpenDataConversionFoodProperties> | null;
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataFood
+     */
+    properties_food_amount?: number;
+    /**
+     * 
+     * @type {OpenDataConversionFoodPropertiesFoodUnit}
+     * @memberof OpenDataFood
+     */
+    properties_food_unit: OpenDataConversionFoodPropertiesFoodUnit;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataFood
+     */
+    properties_source?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataFood
+     */
+    fdc_id: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataFood
+     */
+    comment?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataFood
+     */
+    created_by?: string;
+}
+/**
+ * 
+ * @export
+ * @interface OpenDataProperty
+ */
+export interface OpenDataProperty {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataProperty
+     */
+    id?: number;
+    /**
+     * 
+     * @type {OpenDataUnitVersion}
+     * @memberof OpenDataProperty
+     */
+    version: OpenDataUnitVersion;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataProperty
+     */
+    slug: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataProperty
+     */
+    name: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataProperty
+     */
+    unit?: string;
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataProperty
+     */
+    fdc_id?: number | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataProperty
+     */
+    comment?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataProperty
+     */
+    created_by?: string;
+}
+/**
+ * 
+ * @export
+ * @interface OpenDataStore
+ */
+export interface OpenDataStore {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataStore
+     */
+    id?: number;
+    /**
+     * 
+     * @type {OpenDataUnitVersion}
+     * @memberof OpenDataStore
+     */
+    version: OpenDataUnitVersion;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataStore
+     */
+    slug: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataStore
+     */
+    name: string;
+    /**
+     * 
+     * @type {Array<OpenDataStoreCategoryToStore>}
+     * @memberof OpenDataStore
+     */
+    category_to_store: Array<OpenDataStoreCategoryToStore> | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataStore
+     */
+    comment?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataStore
+     */
+    created_by?: string;
+}
+/**
+ * 
+ * @export
+ * @interface OpenDataStoreCategory
+ */
+export interface OpenDataStoreCategory {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataStoreCategory
+     */
+    id?: number;
+    /**
+     * 
+     * @type {OpenDataUnitVersion}
+     * @memberof OpenDataStoreCategory
+     */
+    version: OpenDataUnitVersion;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataStoreCategory
+     */
+    slug: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataStoreCategory
+     */
+    name: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataStoreCategory
+     */
+    description?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataStoreCategory
+     */
+    comment?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataStoreCategory
+     */
+    created_by?: string;
+}
+/**
+ * 
+ * @export
+ * @interface OpenDataStoreCategoryToStore
+ */
+export interface OpenDataStoreCategoryToStore {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataStoreCategoryToStore
+     */
+    id?: number;
+    /**
+     * 
+     * @type {OpenDataStoreCategory}
+     * @memberof OpenDataStoreCategoryToStore
+     */
+    category: OpenDataStoreCategory;
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataStoreCategoryToStore
+     */
+    store: number;
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataStoreCategoryToStore
+     */
+    order?: number;
+}
+/**
+ * 
+ * @export
+ * @interface OpenDataUnit
+ */
+export interface OpenDataUnit {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataUnit
+     */
+    id?: number;
+    /**
+     * 
+     * @type {OpenDataUnitVersion}
+     * @memberof OpenDataUnit
+     */
+    version: OpenDataUnitVersion;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataUnit
+     */
+    slug: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataUnit
+     */
+    name: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataUnit
+     */
+    plural_name?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataUnit
+     */
+    base_unit?: OpenDataUnitBaseUnitEnum;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataUnit
+     */
+    type: OpenDataUnitTypeEnum;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataUnit
+     */
+    comment?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataUnit
+     */
+    created_by?: string;
+}
+
+/**
+    * @export
+    * @enum {string}
+    */
+export enum OpenDataUnitBaseUnitEnum {
+    G = 'G',
+    Kg = 'KG',
+    Ml = 'ML',
+    L = 'L',
+    Ounce = 'OUNCE',
+    Pound = 'POUND',
+    FluidOunce = 'FLUID_OUNCE',
+    Tsp = 'TSP',
+    Tbsp = 'TBSP',
+    Cup = 'CUP',
+    Pint = 'PINT',
+    Quart = 'QUART',
+    Gallon = 'GALLON',
+    ImperialFluidOunce = 'IMPERIAL_FLUID_OUNCE',
+    ImperialPint = 'IMPERIAL_PINT',
+    ImperialQuart = 'IMPERIAL_QUART',
+    ImperialGallon = 'IMPERIAL_GALLON'
+}
+/**
+    * @export
+    * @enum {string}
+    */
+export enum OpenDataUnitTypeEnum {
+    Weight = 'WEIGHT',
+    Volume = 'VOLUME',
+    Other = 'OTHER'
+}
+
+/**
+ * 
+ * @export
+ * @interface OpenDataUnitVersion
+ */
+export interface OpenDataUnitVersion {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataUnitVersion
+     */
+    id?: number;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataUnitVersion
+     */
+    name: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataUnitVersion
+     */
+    code: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataUnitVersion
+     */
+    comment?: string;
+}
+/**
+ * 
+ * @export
+ * @interface OpenDataVersion
+ */
+export interface OpenDataVersion {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataVersion
+     */
+    id?: number;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataVersion
+     */
+    name: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataVersion
+     */
+    code: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataVersion
+     */
+    comment?: string;
+}
 /**
  * 
  * @export
@@ -3262,6 +4213,18 @@ export interface ShoppingListRecipe {
      * @memberof ShoppingListRecipe
      */
     mealplan_note?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ShoppingListRecipe
+     */
+    mealplan_from_date?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ShoppingListRecipe
+     */
+    mealplan_type?: string;
 }
 /**
  * 
@@ -3311,6 +4274,18 @@ export interface ShoppingListRecipeMealplan {
      * @memberof ShoppingListRecipeMealplan
      */
     mealplan_note?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ShoppingListRecipeMealplan
+     */
+    mealplan_from_date?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ShoppingListRecipeMealplan
+     */
+    mealplan_type?: string;
 }
 /**
  * 
@@ -3360,6 +4335,18 @@ export interface ShoppingListRecipes {
      * @memberof ShoppingListRecipes
      */
     mealplan_note?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ShoppingListRecipes
+     */
+    mealplan_from_date?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ShoppingListRecipes
+     */
+    mealplan_type?: string;
 }
 /**
  * 
@@ -4875,6 +5862,237 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * 
+         * @param {OpenDataCategory} [openDataCategory] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createOpenDataCategory: async (openDataCategory?: OpenDataCategory, options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-category/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataCategory, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {OpenDataConversion} [openDataConversion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createOpenDataConversion: async (openDataConversion?: OpenDataConversion, options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-conversion/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataConversion, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {OpenDataFood} [openDataFood] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createOpenDataFood: async (openDataFood?: OpenDataFood, options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-food/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataFood, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {OpenDataProperty} [openDataProperty] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createOpenDataProperty: async (openDataProperty?: OpenDataProperty, options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-property/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataProperty, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {OpenDataStore} [openDataStore] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createOpenDataStore: async (openDataStore?: OpenDataStore, options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-store/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataStore, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {OpenDataUnit} [openDataUnit] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createOpenDataUnit: async (openDataUnit?: OpenDataUnit, options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-unit/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataUnit, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {OpenDataVersion} [openDataVersion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createOpenDataVersion: async (openDataVersion?: OpenDataVersion, options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-version/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataVersion, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @param {Property} [property] 
@@ -5040,6 +6258,39 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * function to retrieve a recipe from a given url or source string :param request: standard request with additional post parameters         - url: url to use for importing recipe         - data: if no url is given recipe is imported from provided source data         - (optional) bookmarklet: id of bookmarklet import to use, overrides URL and data attributes :return: JsonResponse containing the parsed json and images
+         * @param {any} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createRecipeUrlImport: async (body?: any, options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/recipe-from-source/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(body, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @param {ShoppingList} [shoppingList] 
@@ -5524,39 +6775,6 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
 
 
     
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(body, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * function to retrieve a recipe from a given url or source string :param request: standard request with additional post parameters         - url: url to use for importing recipe         - data: if no url is given recipe is imported from provided source data         - (optional) bookmarklet: id of bookmarklet import to use, overrides URL and data attributes :return: JsonResponse containing the parsed json and images
-         * @param {any} [body] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        createrecipeFromSource: async (body?: any, options: any = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/recipe-from-source/`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
             localVarHeaderParameter['Content-Type'] = 'application/json';
 
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
@@ -5989,6 +7207,237 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
 
 
     
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data category.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyOpenDataCategory: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('destroyOpenDataCategory', 'id', id)
+            const localVarPath = `/api/open-data-category/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'DELETE', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data conversion.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyOpenDataConversion: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('destroyOpenDataConversion', 'id', id)
+            const localVarPath = `/api/open-data-conversion/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'DELETE', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data food.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyOpenDataFood: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('destroyOpenDataFood', 'id', id)
+            const localVarPath = `/api/open-data-food/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'DELETE', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data property.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyOpenDataProperty: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('destroyOpenDataProperty', 'id', id)
+            const localVarPath = `/api/open-data-property/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'DELETE', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data store.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyOpenDataStore: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('destroyOpenDataStore', 'id', id)
+            const localVarPath = `/api/open-data-store/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'DELETE', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data unit.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyOpenDataUnit: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('destroyOpenDataUnit', 'id', id)
+            const localVarPath = `/api/open-data-unit/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'DELETE', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data version.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyOpenDataVersion: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('destroyOpenDataVersion', 'id', id)
+            const localVarPath = `/api/open-data-version/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'DELETE', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -7180,7 +8629,7 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
          * optional parameters  - **from_date**: filter from (inclusive) a certain date onward - **to_date**: filter upward to (inclusive) certain date - **meal_type**: filter meal plans based on meal_type ID
          * @param {string} [fromDate] Filter meal plans from date (inclusive) in the format of YYYY-MM-DD.
          * @param {string} [toDate] Filter meal plans to date (inclusive) in the format of YYYY-MM-DD.
-         * @param {number} [mealType] Query string matched (fuzzy) against object name.
+         * @param {number} [mealType] Filter meal plans with MealType ID. For multiple repeat parameter.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -7240,6 +8689,238 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
 
 
     
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataCategorys: async (options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-category/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataConversions: async (options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-conversion/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataFoods: async (options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-food/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataPropertys: async (options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-property/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataStatisticsViewSets: async (options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-stats/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataStores: async (options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-store/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataUnits: async (options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-unit/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataVersions: async (options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-version/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -8876,6 +10557,265 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data category.
+         * @param {OpenDataCategory} [openDataCategory] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateOpenDataCategory: async (id: string, openDataCategory?: OpenDataCategory, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('partialUpdateOpenDataCategory', 'id', id)
+            const localVarPath = `/api/open-data-category/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PATCH', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataCategory, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data conversion.
+         * @param {OpenDataConversion} [openDataConversion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateOpenDataConversion: async (id: string, openDataConversion?: OpenDataConversion, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('partialUpdateOpenDataConversion', 'id', id)
+            const localVarPath = `/api/open-data-conversion/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PATCH', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataConversion, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data food.
+         * @param {OpenDataFood} [openDataFood] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateOpenDataFood: async (id: string, openDataFood?: OpenDataFood, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('partialUpdateOpenDataFood', 'id', id)
+            const localVarPath = `/api/open-data-food/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PATCH', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataFood, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data property.
+         * @param {OpenDataProperty} [openDataProperty] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateOpenDataProperty: async (id: string, openDataProperty?: OpenDataProperty, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('partialUpdateOpenDataProperty', 'id', id)
+            const localVarPath = `/api/open-data-property/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PATCH', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataProperty, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data store.
+         * @param {OpenDataStore} [openDataStore] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateOpenDataStore: async (id: string, openDataStore?: OpenDataStore, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('partialUpdateOpenDataStore', 'id', id)
+            const localVarPath = `/api/open-data-store/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PATCH', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataStore, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data unit.
+         * @param {OpenDataUnit} [openDataUnit] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateOpenDataUnit: async (id: string, openDataUnit?: OpenDataUnit, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('partialUpdateOpenDataUnit', 'id', id)
+            const localVarPath = `/api/open-data-unit/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PATCH', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataUnit, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data version.
+         * @param {OpenDataVersion} [openDataVersion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateOpenDataVersion: async (id: string, openDataVersion?: OpenDataVersion, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('partialUpdateOpenDataVersion', 'id', id)
+            const localVarPath = `/api/open-data-version/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PATCH', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataVersion, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -9946,6 +11886,39 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
 
 
     
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveFDCViewSet: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('retrieveFDCViewSet', 'id', id)
+            const localVarPath = `/api/open-data-FDC/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -10243,6 +12216,237 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
 
 
     
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data category.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveOpenDataCategory: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('retrieveOpenDataCategory', 'id', id)
+            const localVarPath = `/api/open-data-category/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data conversion.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveOpenDataConversion: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('retrieveOpenDataConversion', 'id', id)
+            const localVarPath = `/api/open-data-conversion/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data food.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveOpenDataFood: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('retrieveOpenDataFood', 'id', id)
+            const localVarPath = `/api/open-data-food/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data property.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveOpenDataProperty: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('retrieveOpenDataProperty', 'id', id)
+            const localVarPath = `/api/open-data-property/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data store.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveOpenDataStore: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('retrieveOpenDataStore', 'id', id)
+            const localVarPath = `/api/open-data-store/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data unit.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveOpenDataUnit: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('retrieveOpenDataUnit', 'id', id)
+            const localVarPath = `/api/open-data-unit/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data version.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveOpenDataVersion: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('retrieveOpenDataVersion', 'id', id)
+            const localVarPath = `/api/open-data-version/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -11665,6 +13869,265 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data category.
+         * @param {OpenDataCategory} [openDataCategory] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateOpenDataCategory: async (id: string, openDataCategory?: OpenDataCategory, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('updateOpenDataCategory', 'id', id)
+            const localVarPath = `/api/open-data-category/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataCategory, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data conversion.
+         * @param {OpenDataConversion} [openDataConversion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateOpenDataConversion: async (id: string, openDataConversion?: OpenDataConversion, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('updateOpenDataConversion', 'id', id)
+            const localVarPath = `/api/open-data-conversion/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataConversion, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data food.
+         * @param {OpenDataFood} [openDataFood] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateOpenDataFood: async (id: string, openDataFood?: OpenDataFood, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('updateOpenDataFood', 'id', id)
+            const localVarPath = `/api/open-data-food/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataFood, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data property.
+         * @param {OpenDataProperty} [openDataProperty] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateOpenDataProperty: async (id: string, openDataProperty?: OpenDataProperty, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('updateOpenDataProperty', 'id', id)
+            const localVarPath = `/api/open-data-property/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataProperty, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data store.
+         * @param {OpenDataStore} [openDataStore] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateOpenDataStore: async (id: string, openDataStore?: OpenDataStore, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('updateOpenDataStore', 'id', id)
+            const localVarPath = `/api/open-data-store/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataStore, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data unit.
+         * @param {OpenDataUnit} [openDataUnit] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateOpenDataUnit: async (id: string, openDataUnit?: OpenDataUnit, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('updateOpenDataUnit', 'id', id)
+            const localVarPath = `/api/open-data-unit/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataUnit, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data version.
+         * @param {OpenDataVersion} [openDataVersion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateOpenDataVersion: async (id: string, openDataVersion?: OpenDataVersion, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('updateOpenDataVersion', 'id', id)
+            const localVarPath = `/api/open-data-version/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataVersion, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -12515,6 +14978,76 @@ export const ApiApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.createMealType(mealType, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * 
+         * @param {OpenDataCategory} [openDataCategory] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async createOpenDataCategory(openDataCategory?: OpenDataCategory, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataCategory>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.createOpenDataCategory(openDataCategory, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {OpenDataConversion} [openDataConversion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async createOpenDataConversion(openDataConversion?: OpenDataConversion, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataConversion>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.createOpenDataConversion(openDataConversion, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {OpenDataFood} [openDataFood] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async createOpenDataFood(openDataFood?: OpenDataFood, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataFood>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.createOpenDataFood(openDataFood, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {OpenDataProperty} [openDataProperty] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async createOpenDataProperty(openDataProperty?: OpenDataProperty, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataProperty>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.createOpenDataProperty(openDataProperty, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {OpenDataStore} [openDataStore] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async createOpenDataStore(openDataStore?: OpenDataStore, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataStore>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.createOpenDataStore(openDataStore, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {OpenDataUnit} [openDataUnit] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async createOpenDataUnit(openDataUnit?: OpenDataUnit, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataUnit>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.createOpenDataUnit(openDataUnit, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {OpenDataVersion} [openDataVersion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async createOpenDataVersion(openDataVersion?: OpenDataVersion, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataVersion>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.createOpenDataVersion(openDataVersion, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @param {Property} [property] 
@@ -12565,6 +15098,16 @@ export const ApiApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.createRecipeBookEntry(recipeBookEntry, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * function to retrieve a recipe from a given url or source string :param request: standard request with additional post parameters         - url: url to use for importing recipe         - data: if no url is given recipe is imported from provided source data         - (optional) bookmarklet: id of bookmarklet import to use, overrides URL and data attributes :return: JsonResponse containing the parsed json and images
+         * @param {any} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async createRecipeUrlImport(body?: any, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<any>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.createRecipeUrlImport(body, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @param {ShoppingList} [shoppingList] 
@@ -12710,16 +15253,6 @@ export const ApiApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.createimportFiles(body, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
-        /**
-         * function to retrieve a recipe from a given url or source string :param request: standard request with additional post parameters         - url: url to use for importing recipe         - data: if no url is given recipe is imported from provided source data         - (optional) bookmarklet: id of bookmarklet import to use, overrides URL and data attributes :return: JsonResponse containing the parsed json and images
-         * @param {any} [body] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async createrecipeFromSource(body?: any, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<any>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.createrecipeFromSource(body, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
         /**
          * 
          * @param {string} id A unique integer value identifying this access token.
@@ -12850,6 +15383,76 @@ export const ApiApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.destroyMealType(id, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data category.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async destroyOpenDataCategory(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.destroyOpenDataCategory(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data conversion.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async destroyOpenDataConversion(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.destroyOpenDataConversion(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data food.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async destroyOpenDataFood(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.destroyOpenDataFood(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data property.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async destroyOpenDataProperty(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.destroyOpenDataProperty(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data store.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async destroyOpenDataStore(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.destroyOpenDataStore(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data unit.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async destroyOpenDataUnit(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.destroyOpenDataUnit(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data version.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async destroyOpenDataVersion(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.destroyOpenDataVersion(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -13202,7 +15805,7 @@ export const ApiApiFp = function(configuration?: Configuration) {
          * optional parameters  - **from_date**: filter from (inclusive) a certain date onward - **to_date**: filter upward to (inclusive) certain date - **meal_type**: filter meal plans based on meal_type ID
          * @param {string} [fromDate] Filter meal plans from date (inclusive) in the format of YYYY-MM-DD.
          * @param {string} [toDate] Filter meal plans to date (inclusive) in the format of YYYY-MM-DD.
-         * @param {number} [mealType] Query string matched (fuzzy) against object name.
+         * @param {number} [mealType] Filter meal plans with MealType ID. For multiple repeat parameter.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -13219,6 +15822,78 @@ export const ApiApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.listMealTypes(options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async listOpenDataCategorys(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<OpenDataCategory>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listOpenDataCategorys(options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async listOpenDataConversions(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<OpenDataConversion>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listOpenDataConversions(options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async listOpenDataFoods(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<OpenDataFood>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listOpenDataFoods(options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async listOpenDataPropertys(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<OpenDataProperty>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listOpenDataPropertys(options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async listOpenDataStatisticsViewSets(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<any>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listOpenDataStatisticsViewSets(options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async listOpenDataStores(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<OpenDataStore>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listOpenDataStores(options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async listOpenDataUnits(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<OpenDataUnit>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listOpenDataUnits(options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async listOpenDataVersions(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<OpenDataVersion>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listOpenDataVersions(options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @param {*} [options] Override http request option.
@@ -13687,6 +16362,83 @@ export const ApiApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateMealType(id, mealType, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data category.
+         * @param {OpenDataCategory} [openDataCategory] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async partialUpdateOpenDataCategory(id: string, openDataCategory?: OpenDataCategory, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataCategory>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateOpenDataCategory(id, openDataCategory, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data conversion.
+         * @param {OpenDataConversion} [openDataConversion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async partialUpdateOpenDataConversion(id: string, openDataConversion?: OpenDataConversion, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataConversion>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateOpenDataConversion(id, openDataConversion, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data food.
+         * @param {OpenDataFood} [openDataFood] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async partialUpdateOpenDataFood(id: string, openDataFood?: OpenDataFood, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataFood>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateOpenDataFood(id, openDataFood, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data property.
+         * @param {OpenDataProperty} [openDataProperty] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async partialUpdateOpenDataProperty(id: string, openDataProperty?: OpenDataProperty, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataProperty>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateOpenDataProperty(id, openDataProperty, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data store.
+         * @param {OpenDataStore} [openDataStore] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async partialUpdateOpenDataStore(id: string, openDataStore?: OpenDataStore, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataStore>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateOpenDataStore(id, openDataStore, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data unit.
+         * @param {OpenDataUnit} [openDataUnit] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async partialUpdateOpenDataUnit(id: string, openDataUnit?: OpenDataUnit, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataUnit>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateOpenDataUnit(id, openDataUnit, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data version.
+         * @param {OpenDataVersion} [openDataVersion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async partialUpdateOpenDataVersion(id: string, openDataVersion?: OpenDataVersion, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataVersion>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateOpenDataVersion(id, openDataVersion, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -14004,6 +16756,16 @@ export const ApiApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveExportLog(id, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * 
+         * @param {string} id 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async retrieveFDCViewSet(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<any>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveFDCViewSet(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this food.
@@ -14094,6 +16856,76 @@ export const ApiApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveMealType(id, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data category.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async retrieveOpenDataCategory(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataCategory>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveOpenDataCategory(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data conversion.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async retrieveOpenDataConversion(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataConversion>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveOpenDataConversion(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data food.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async retrieveOpenDataFood(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataFood>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveOpenDataFood(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data property.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async retrieveOpenDataProperty(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataProperty>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveOpenDataProperty(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data store.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async retrieveOpenDataStore(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataStore>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveOpenDataStore(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data unit.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async retrieveOpenDataUnit(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataUnit>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveOpenDataUnit(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data version.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async retrieveOpenDataVersion(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataVersion>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveOpenDataVersion(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -14519,6 +17351,83 @@ export const ApiApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.updateMealType(id, mealType, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data category.
+         * @param {OpenDataCategory} [openDataCategory] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async updateOpenDataCategory(id: string, openDataCategory?: OpenDataCategory, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataCategory>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.updateOpenDataCategory(id, openDataCategory, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data conversion.
+         * @param {OpenDataConversion} [openDataConversion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async updateOpenDataConversion(id: string, openDataConversion?: OpenDataConversion, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataConversion>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.updateOpenDataConversion(id, openDataConversion, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data food.
+         * @param {OpenDataFood} [openDataFood] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async updateOpenDataFood(id: string, openDataFood?: OpenDataFood, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataFood>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.updateOpenDataFood(id, openDataFood, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data property.
+         * @param {OpenDataProperty} [openDataProperty] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async updateOpenDataProperty(id: string, openDataProperty?: OpenDataProperty, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataProperty>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.updateOpenDataProperty(id, openDataProperty, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data store.
+         * @param {OpenDataStore} [openDataStore] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async updateOpenDataStore(id: string, openDataStore?: OpenDataStore, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataStore>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.updateOpenDataStore(id, openDataStore, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data unit.
+         * @param {OpenDataUnit} [openDataUnit] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async updateOpenDataUnit(id: string, openDataUnit?: OpenDataUnit, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataUnit>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.updateOpenDataUnit(id, openDataUnit, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data version.
+         * @param {OpenDataVersion} [openDataVersion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async updateOpenDataVersion(id: string, openDataVersion?: OpenDataVersion, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataVersion>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.updateOpenDataVersion(id, openDataVersion, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -14858,6 +17767,69 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         createMealType(mealType?: MealType, options?: any): AxiosPromise<MealType> {
             return localVarFp.createMealType(mealType, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @param {OpenDataCategory} [openDataCategory] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createOpenDataCategory(openDataCategory?: OpenDataCategory, options?: any): AxiosPromise<OpenDataCategory> {
+            return localVarFp.createOpenDataCategory(openDataCategory, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {OpenDataConversion} [openDataConversion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createOpenDataConversion(openDataConversion?: OpenDataConversion, options?: any): AxiosPromise<OpenDataConversion> {
+            return localVarFp.createOpenDataConversion(openDataConversion, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {OpenDataFood} [openDataFood] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createOpenDataFood(openDataFood?: OpenDataFood, options?: any): AxiosPromise<OpenDataFood> {
+            return localVarFp.createOpenDataFood(openDataFood, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {OpenDataProperty} [openDataProperty] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createOpenDataProperty(openDataProperty?: OpenDataProperty, options?: any): AxiosPromise<OpenDataProperty> {
+            return localVarFp.createOpenDataProperty(openDataProperty, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {OpenDataStore} [openDataStore] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createOpenDataStore(openDataStore?: OpenDataStore, options?: any): AxiosPromise<OpenDataStore> {
+            return localVarFp.createOpenDataStore(openDataStore, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {OpenDataUnit} [openDataUnit] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createOpenDataUnit(openDataUnit?: OpenDataUnit, options?: any): AxiosPromise<OpenDataUnit> {
+            return localVarFp.createOpenDataUnit(openDataUnit, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {OpenDataVersion} [openDataVersion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createOpenDataVersion(openDataVersion?: OpenDataVersion, options?: any): AxiosPromise<OpenDataVersion> {
+            return localVarFp.createOpenDataVersion(openDataVersion, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @param {Property} [property] 
@@ -14903,6 +17875,15 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         createRecipeBookEntry(recipeBookEntry?: RecipeBookEntry, options?: any): AxiosPromise<RecipeBookEntry> {
             return localVarFp.createRecipeBookEntry(recipeBookEntry, options).then((request) => request(axios, basePath));
         },
+        /**
+         * function to retrieve a recipe from a given url or source string :param request: standard request with additional post parameters         - url: url to use for importing recipe         - data: if no url is given recipe is imported from provided source data         - (optional) bookmarklet: id of bookmarklet import to use, overrides URL and data attributes :return: JsonResponse containing the parsed json and images
+         * @param {any} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createRecipeUrlImport(body?: any, options?: any): AxiosPromise<any> {
+            return localVarFp.createRecipeUrlImport(body, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @param {ShoppingList} [shoppingList] 
@@ -15034,15 +18015,6 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         createimportFiles(body?: any, options?: any): AxiosPromise<any> {
             return localVarFp.createimportFiles(body, options).then((request) => request(axios, basePath));
         },
-        /**
-         * function to retrieve a recipe from a given url or source string :param request: standard request with additional post parameters         - url: url to use for importing recipe         - data: if no url is given recipe is imported from provided source data         - (optional) bookmarklet: id of bookmarklet import to use, overrides URL and data attributes :return: JsonResponse containing the parsed json and images
-         * @param {any} [body] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        createrecipeFromSource(body?: any, options?: any): AxiosPromise<any> {
-            return localVarFp.createrecipeFromSource(body, options).then((request) => request(axios, basePath));
-        },
         /**
          * 
          * @param {string} id A unique integer value identifying this access token.
@@ -15160,6 +18132,69 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         destroyMealType(id: string, options?: any): AxiosPromise<void> {
             return localVarFp.destroyMealType(id, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data category.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyOpenDataCategory(id: string, options?: any): AxiosPromise<void> {
+            return localVarFp.destroyOpenDataCategory(id, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data conversion.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyOpenDataConversion(id: string, options?: any): AxiosPromise<void> {
+            return localVarFp.destroyOpenDataConversion(id, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data food.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyOpenDataFood(id: string, options?: any): AxiosPromise<void> {
+            return localVarFp.destroyOpenDataFood(id, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data property.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyOpenDataProperty(id: string, options?: any): AxiosPromise<void> {
+            return localVarFp.destroyOpenDataProperty(id, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data store.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyOpenDataStore(id: string, options?: any): AxiosPromise<void> {
+            return localVarFp.destroyOpenDataStore(id, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data unit.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyOpenDataUnit(id: string, options?: any): AxiosPromise<void> {
+            return localVarFp.destroyOpenDataUnit(id, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data version.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyOpenDataVersion(id: string, options?: any): AxiosPromise<void> {
+            return localVarFp.destroyOpenDataVersion(id, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -15478,7 +18513,7 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
          * optional parameters  - **from_date**: filter from (inclusive) a certain date onward - **to_date**: filter upward to (inclusive) certain date - **meal_type**: filter meal plans based on meal_type ID
          * @param {string} [fromDate] Filter meal plans from date (inclusive) in the format of YYYY-MM-DD.
          * @param {string} [toDate] Filter meal plans to date (inclusive) in the format of YYYY-MM-DD.
-         * @param {number} [mealType] Query string matched (fuzzy) against object name.
+         * @param {number} [mealType] Filter meal plans with MealType ID. For multiple repeat parameter.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -15493,6 +18528,70 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         listMealTypes(options?: any): AxiosPromise<Array<MealType>> {
             return localVarFp.listMealTypes(options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataCategorys(options?: any): AxiosPromise<Array<OpenDataCategory>> {
+            return localVarFp.listOpenDataCategorys(options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataConversions(options?: any): AxiosPromise<Array<OpenDataConversion>> {
+            return localVarFp.listOpenDataConversions(options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataFoods(options?: any): AxiosPromise<Array<OpenDataFood>> {
+            return localVarFp.listOpenDataFoods(options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataPropertys(options?: any): AxiosPromise<Array<OpenDataProperty>> {
+            return localVarFp.listOpenDataPropertys(options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataStatisticsViewSets(options?: any): AxiosPromise<Array<any>> {
+            return localVarFp.listOpenDataStatisticsViewSets(options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataStores(options?: any): AxiosPromise<Array<OpenDataStore>> {
+            return localVarFp.listOpenDataStores(options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataUnits(options?: any): AxiosPromise<Array<OpenDataUnit>> {
+            return localVarFp.listOpenDataUnits(options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataVersions(options?: any): AxiosPromise<Array<OpenDataVersion>> {
+            return localVarFp.listOpenDataVersions(options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @param {*} [options] Override http request option.
@@ -15919,6 +19018,76 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         partialUpdateMealType(id: string, mealType?: MealType, options?: any): AxiosPromise<MealType> {
             return localVarFp.partialUpdateMealType(id, mealType, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data category.
+         * @param {OpenDataCategory} [openDataCategory] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateOpenDataCategory(id: string, openDataCategory?: OpenDataCategory, options?: any): AxiosPromise<OpenDataCategory> {
+            return localVarFp.partialUpdateOpenDataCategory(id, openDataCategory, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data conversion.
+         * @param {OpenDataConversion} [openDataConversion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateOpenDataConversion(id: string, openDataConversion?: OpenDataConversion, options?: any): AxiosPromise<OpenDataConversion> {
+            return localVarFp.partialUpdateOpenDataConversion(id, openDataConversion, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data food.
+         * @param {OpenDataFood} [openDataFood] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateOpenDataFood(id: string, openDataFood?: OpenDataFood, options?: any): AxiosPromise<OpenDataFood> {
+            return localVarFp.partialUpdateOpenDataFood(id, openDataFood, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data property.
+         * @param {OpenDataProperty} [openDataProperty] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateOpenDataProperty(id: string, openDataProperty?: OpenDataProperty, options?: any): AxiosPromise<OpenDataProperty> {
+            return localVarFp.partialUpdateOpenDataProperty(id, openDataProperty, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data store.
+         * @param {OpenDataStore} [openDataStore] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateOpenDataStore(id: string, openDataStore?: OpenDataStore, options?: any): AxiosPromise<OpenDataStore> {
+            return localVarFp.partialUpdateOpenDataStore(id, openDataStore, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data unit.
+         * @param {OpenDataUnit} [openDataUnit] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateOpenDataUnit(id: string, openDataUnit?: OpenDataUnit, options?: any): AxiosPromise<OpenDataUnit> {
+            return localVarFp.partialUpdateOpenDataUnit(id, openDataUnit, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data version.
+         * @param {OpenDataVersion} [openDataVersion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateOpenDataVersion(id: string, openDataVersion?: OpenDataVersion, options?: any): AxiosPromise<OpenDataVersion> {
+            return localVarFp.partialUpdateOpenDataVersion(id, openDataVersion, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -16207,6 +19376,15 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         retrieveExportLog(id: string, options?: any): AxiosPromise<ExportLog> {
             return localVarFp.retrieveExportLog(id, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @param {string} id 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveFDCViewSet(id: string, options?: any): AxiosPromise<any> {
+            return localVarFp.retrieveFDCViewSet(id, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this food.
@@ -16288,6 +19466,69 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         retrieveMealType(id: string, options?: any): AxiosPromise<MealType> {
             return localVarFp.retrieveMealType(id, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data category.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveOpenDataCategory(id: string, options?: any): AxiosPromise<OpenDataCategory> {
+            return localVarFp.retrieveOpenDataCategory(id, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data conversion.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveOpenDataConversion(id: string, options?: any): AxiosPromise<OpenDataConversion> {
+            return localVarFp.retrieveOpenDataConversion(id, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data food.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveOpenDataFood(id: string, options?: any): AxiosPromise<OpenDataFood> {
+            return localVarFp.retrieveOpenDataFood(id, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data property.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveOpenDataProperty(id: string, options?: any): AxiosPromise<OpenDataProperty> {
+            return localVarFp.retrieveOpenDataProperty(id, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data store.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveOpenDataStore(id: string, options?: any): AxiosPromise<OpenDataStore> {
+            return localVarFp.retrieveOpenDataStore(id, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data unit.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveOpenDataUnit(id: string, options?: any): AxiosPromise<OpenDataUnit> {
+            return localVarFp.retrieveOpenDataUnit(id, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data version.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveOpenDataVersion(id: string, options?: any): AxiosPromise<OpenDataVersion> {
+            return localVarFp.retrieveOpenDataVersion(id, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -16672,6 +19913,76 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         updateMealType(id: string, mealType?: MealType, options?: any): AxiosPromise<MealType> {
             return localVarFp.updateMealType(id, mealType, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data category.
+         * @param {OpenDataCategory} [openDataCategory] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateOpenDataCategory(id: string, openDataCategory?: OpenDataCategory, options?: any): AxiosPromise<OpenDataCategory> {
+            return localVarFp.updateOpenDataCategory(id, openDataCategory, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data conversion.
+         * @param {OpenDataConversion} [openDataConversion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateOpenDataConversion(id: string, openDataConversion?: OpenDataConversion, options?: any): AxiosPromise<OpenDataConversion> {
+            return localVarFp.updateOpenDataConversion(id, openDataConversion, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data food.
+         * @param {OpenDataFood} [openDataFood] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateOpenDataFood(id: string, openDataFood?: OpenDataFood, options?: any): AxiosPromise<OpenDataFood> {
+            return localVarFp.updateOpenDataFood(id, openDataFood, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data property.
+         * @param {OpenDataProperty} [openDataProperty] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateOpenDataProperty(id: string, openDataProperty?: OpenDataProperty, options?: any): AxiosPromise<OpenDataProperty> {
+            return localVarFp.updateOpenDataProperty(id, openDataProperty, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data store.
+         * @param {OpenDataStore} [openDataStore] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateOpenDataStore(id: string, openDataStore?: OpenDataStore, options?: any): AxiosPromise<OpenDataStore> {
+            return localVarFp.updateOpenDataStore(id, openDataStore, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data unit.
+         * @param {OpenDataUnit} [openDataUnit] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateOpenDataUnit(id: string, openDataUnit?: OpenDataUnit, options?: any): AxiosPromise<OpenDataUnit> {
+            return localVarFp.updateOpenDataUnit(id, openDataUnit, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data version.
+         * @param {OpenDataVersion} [openDataVersion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateOpenDataVersion(id: string, openDataVersion?: OpenDataVersion, options?: any): AxiosPromise<OpenDataVersion> {
+            return localVarFp.updateOpenDataVersion(id, openDataVersion, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -17021,6 +20332,83 @@ export class ApiApi extends BaseAPI {
         return ApiApiFp(this.configuration).createMealType(mealType, options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 
+     * @param {OpenDataCategory} [openDataCategory] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public createOpenDataCategory(openDataCategory?: OpenDataCategory, options?: any) {
+        return ApiApiFp(this.configuration).createOpenDataCategory(openDataCategory, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {OpenDataConversion} [openDataConversion] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public createOpenDataConversion(openDataConversion?: OpenDataConversion, options?: any) {
+        return ApiApiFp(this.configuration).createOpenDataConversion(openDataConversion, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {OpenDataFood} [openDataFood] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public createOpenDataFood(openDataFood?: OpenDataFood, options?: any) {
+        return ApiApiFp(this.configuration).createOpenDataFood(openDataFood, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {OpenDataProperty} [openDataProperty] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public createOpenDataProperty(openDataProperty?: OpenDataProperty, options?: any) {
+        return ApiApiFp(this.configuration).createOpenDataProperty(openDataProperty, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {OpenDataStore} [openDataStore] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public createOpenDataStore(openDataStore?: OpenDataStore, options?: any) {
+        return ApiApiFp(this.configuration).createOpenDataStore(openDataStore, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {OpenDataUnit} [openDataUnit] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public createOpenDataUnit(openDataUnit?: OpenDataUnit, options?: any) {
+        return ApiApiFp(this.configuration).createOpenDataUnit(openDataUnit, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {OpenDataVersion} [openDataVersion] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public createOpenDataVersion(openDataVersion?: OpenDataVersion, options?: any) {
+        return ApiApiFp(this.configuration).createOpenDataVersion(openDataVersion, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @param {Property} [property] 
@@ -17076,6 +20464,17 @@ export class ApiApi extends BaseAPI {
         return ApiApiFp(this.configuration).createRecipeBookEntry(recipeBookEntry, options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * function to retrieve a recipe from a given url or source string :param request: standard request with additional post parameters         - url: url to use for importing recipe         - data: if no url is given recipe is imported from provided source data         - (optional) bookmarklet: id of bookmarklet import to use, overrides URL and data attributes :return: JsonResponse containing the parsed json and images
+     * @param {any} [body] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public createRecipeUrlImport(body?: any, options?: any) {
+        return ApiApiFp(this.configuration).createRecipeUrlImport(body, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @param {ShoppingList} [shoppingList] 
@@ -17235,17 +20634,6 @@ export class ApiApi extends BaseAPI {
         return ApiApiFp(this.configuration).createimportFiles(body, options).then((request) => request(this.axios, this.basePath));
     }
 
-    /**
-     * function to retrieve a recipe from a given url or source string :param request: standard request with additional post parameters         - url: url to use for importing recipe         - data: if no url is given recipe is imported from provided source data         - (optional) bookmarklet: id of bookmarklet import to use, overrides URL and data attributes :return: JsonResponse containing the parsed json and images
-     * @param {any} [body] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public createrecipeFromSource(body?: any, options?: any) {
-        return ApiApiFp(this.configuration).createrecipeFromSource(body, options).then((request) => request(this.axios, this.basePath));
-    }
-
     /**
      * 
      * @param {string} id A unique integer value identifying this access token.
@@ -17389,6 +20777,83 @@ export class ApiApi extends BaseAPI {
         return ApiApiFp(this.configuration).destroyMealType(id, options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data category.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public destroyOpenDataCategory(id: string, options?: any) {
+        return ApiApiFp(this.configuration).destroyOpenDataCategory(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data conversion.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public destroyOpenDataConversion(id: string, options?: any) {
+        return ApiApiFp(this.configuration).destroyOpenDataConversion(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data food.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public destroyOpenDataFood(id: string, options?: any) {
+        return ApiApiFp(this.configuration).destroyOpenDataFood(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data property.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public destroyOpenDataProperty(id: string, options?: any) {
+        return ApiApiFp(this.configuration).destroyOpenDataProperty(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data store.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public destroyOpenDataStore(id: string, options?: any) {
+        return ApiApiFp(this.configuration).destroyOpenDataStore(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data unit.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public destroyOpenDataUnit(id: string, options?: any) {
+        return ApiApiFp(this.configuration).destroyOpenDataUnit(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data version.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public destroyOpenDataVersion(id: string, options?: any) {
+        return ApiApiFp(this.configuration).destroyOpenDataVersion(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @param {string} id A unique integer value identifying this property.
@@ -17775,7 +21240,7 @@ export class ApiApi extends BaseAPI {
      * optional parameters  - **from_date**: filter from (inclusive) a certain date onward - **to_date**: filter upward to (inclusive) certain date - **meal_type**: filter meal plans based on meal_type ID
      * @param {string} [fromDate] Filter meal plans from date (inclusive) in the format of YYYY-MM-DD.
      * @param {string} [toDate] Filter meal plans to date (inclusive) in the format of YYYY-MM-DD.
-     * @param {number} [mealType] Query string matched (fuzzy) against object name.
+     * @param {number} [mealType] Filter meal plans with MealType ID. For multiple repeat parameter.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof ApiApi
@@ -17794,6 +21259,86 @@ export class ApiApi extends BaseAPI {
         return ApiApiFp(this.configuration).listMealTypes(options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public listOpenDataCategorys(options?: any) {
+        return ApiApiFp(this.configuration).listOpenDataCategorys(options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public listOpenDataConversions(options?: any) {
+        return ApiApiFp(this.configuration).listOpenDataConversions(options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public listOpenDataFoods(options?: any) {
+        return ApiApiFp(this.configuration).listOpenDataFoods(options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public listOpenDataPropertys(options?: any) {
+        return ApiApiFp(this.configuration).listOpenDataPropertys(options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public listOpenDataStatisticsViewSets(options?: any) {
+        return ApiApiFp(this.configuration).listOpenDataStatisticsViewSets(options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public listOpenDataStores(options?: any) {
+        return ApiApiFp(this.configuration).listOpenDataStores(options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public listOpenDataUnits(options?: any) {
+        return ApiApiFp(this.configuration).listOpenDataUnits(options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public listOpenDataVersions(options?: any) {
+        return ApiApiFp(this.configuration).listOpenDataVersions(options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @param {*} [options] Override http request option.
@@ -18304,6 +21849,90 @@ export class ApiApi extends BaseAPI {
         return ApiApiFp(this.configuration).partialUpdateMealType(id, mealType, options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data category.
+     * @param {OpenDataCategory} [openDataCategory] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public partialUpdateOpenDataCategory(id: string, openDataCategory?: OpenDataCategory, options?: any) {
+        return ApiApiFp(this.configuration).partialUpdateOpenDataCategory(id, openDataCategory, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data conversion.
+     * @param {OpenDataConversion} [openDataConversion] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public partialUpdateOpenDataConversion(id: string, openDataConversion?: OpenDataConversion, options?: any) {
+        return ApiApiFp(this.configuration).partialUpdateOpenDataConversion(id, openDataConversion, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data food.
+     * @param {OpenDataFood} [openDataFood] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public partialUpdateOpenDataFood(id: string, openDataFood?: OpenDataFood, options?: any) {
+        return ApiApiFp(this.configuration).partialUpdateOpenDataFood(id, openDataFood, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data property.
+     * @param {OpenDataProperty} [openDataProperty] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public partialUpdateOpenDataProperty(id: string, openDataProperty?: OpenDataProperty, options?: any) {
+        return ApiApiFp(this.configuration).partialUpdateOpenDataProperty(id, openDataProperty, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data store.
+     * @param {OpenDataStore} [openDataStore] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public partialUpdateOpenDataStore(id: string, openDataStore?: OpenDataStore, options?: any) {
+        return ApiApiFp(this.configuration).partialUpdateOpenDataStore(id, openDataStore, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data unit.
+     * @param {OpenDataUnit} [openDataUnit] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public partialUpdateOpenDataUnit(id: string, openDataUnit?: OpenDataUnit, options?: any) {
+        return ApiApiFp(this.configuration).partialUpdateOpenDataUnit(id, openDataUnit, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data version.
+     * @param {OpenDataVersion} [openDataVersion] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public partialUpdateOpenDataVersion(id: string, openDataVersion?: OpenDataVersion, options?: any) {
+        return ApiApiFp(this.configuration).partialUpdateOpenDataVersion(id, openDataVersion, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @param {string} id A unique integer value identifying this property.
@@ -18650,6 +22279,17 @@ export class ApiApi extends BaseAPI {
         return ApiApiFp(this.configuration).retrieveExportLog(id, options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 
+     * @param {string} id 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public retrieveFDCViewSet(id: string, options?: any) {
+        return ApiApiFp(this.configuration).retrieveFDCViewSet(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @param {string} id A unique integer value identifying this food.
@@ -18749,6 +22389,83 @@ export class ApiApi extends BaseAPI {
         return ApiApiFp(this.configuration).retrieveMealType(id, options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data category.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public retrieveOpenDataCategory(id: string, options?: any) {
+        return ApiApiFp(this.configuration).retrieveOpenDataCategory(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data conversion.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public retrieveOpenDataConversion(id: string, options?: any) {
+        return ApiApiFp(this.configuration).retrieveOpenDataConversion(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data food.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public retrieveOpenDataFood(id: string, options?: any) {
+        return ApiApiFp(this.configuration).retrieveOpenDataFood(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data property.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public retrieveOpenDataProperty(id: string, options?: any) {
+        return ApiApiFp(this.configuration).retrieveOpenDataProperty(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data store.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public retrieveOpenDataStore(id: string, options?: any) {
+        return ApiApiFp(this.configuration).retrieveOpenDataStore(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data unit.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public retrieveOpenDataUnit(id: string, options?: any) {
+        return ApiApiFp(this.configuration).retrieveOpenDataUnit(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data version.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public retrieveOpenDataVersion(id: string, options?: any) {
+        return ApiApiFp(this.configuration).retrieveOpenDataVersion(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @param {string} id A unique integer value identifying this property.
@@ -19215,6 +22932,90 @@ export class ApiApi extends BaseAPI {
         return ApiApiFp(this.configuration).updateMealType(id, mealType, options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data category.
+     * @param {OpenDataCategory} [openDataCategory] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public updateOpenDataCategory(id: string, openDataCategory?: OpenDataCategory, options?: any) {
+        return ApiApiFp(this.configuration).updateOpenDataCategory(id, openDataCategory, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data conversion.
+     * @param {OpenDataConversion} [openDataConversion] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public updateOpenDataConversion(id: string, openDataConversion?: OpenDataConversion, options?: any) {
+        return ApiApiFp(this.configuration).updateOpenDataConversion(id, openDataConversion, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data food.
+     * @param {OpenDataFood} [openDataFood] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public updateOpenDataFood(id: string, openDataFood?: OpenDataFood, options?: any) {
+        return ApiApiFp(this.configuration).updateOpenDataFood(id, openDataFood, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data property.
+     * @param {OpenDataProperty} [openDataProperty] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public updateOpenDataProperty(id: string, openDataProperty?: OpenDataProperty, options?: any) {
+        return ApiApiFp(this.configuration).updateOpenDataProperty(id, openDataProperty, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data store.
+     * @param {OpenDataStore} [openDataStore] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public updateOpenDataStore(id: string, openDataStore?: OpenDataStore, options?: any) {
+        return ApiApiFp(this.configuration).updateOpenDataStore(id, openDataStore, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data unit.
+     * @param {OpenDataUnit} [openDataUnit] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public updateOpenDataUnit(id: string, openDataUnit?: OpenDataUnit, options?: any) {
+        return ApiApiFp(this.configuration).updateOpenDataUnit(id, openDataUnit, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data version.
+     * @param {OpenDataVersion} [openDataVersion] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public updateOpenDataVersion(id: string, openDataVersion?: OpenDataVersion, options?: any) {
+        return ApiApiFp(this.configuration).updateOpenDataVersion(id, openDataVersion, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @param {string} id A unique integer value identifying this property.

From e6f7f0722029465ec24902a590cbe7c7aa5d0af3 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Fri, 22 Dec 2023 23:31:28 +0100
Subject: [PATCH 06/95] some things actually working

---
 .../ShoppingListView/ShoppingListView.vue     | 175 +++++-------------
 vue/src/components/ShoppingLineItem.vue       |  18 +-
 vue/src/locales/en.json                       |   1 +
 vue/src/stores/ShoppingListStore.js           |  27 +--
 4 files changed, 77 insertions(+), 144 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 712b5c1e..9fa95d7e 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -4,10 +4,7 @@
 
         <div class="row float-top w-100">
             <div class="col-auto no-gutter ml-auto">
-                <b-button variant="link" class="px-1 pt-0 pb-1 d-none d-md-inline-block">
-                    <i class="btn fas fa-plus-circle fa-lg px-0" @click="entrymode = !entrymode"
-                       :class="entrymode ? 'text-success' : 'text-primary'"/>
-                </b-button>
+
                 <b-button variant="link" class="px-1 pt-0 pb-1 d-none d-md-inline-block">
                     <i class="fas fa-download fa-lg nav-link dropdown-toggle text-primary px-1"
                        id="downloadShoppingLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></i>
@@ -37,102 +34,41 @@
                     <span
                         class="d-none d-md-inline-block">{{ $t('Shopping_list') + ` (${items.filter(x => x.checked === false).length})` }}</span>
                 </template>
-                <div class="container p-0 p-md-3 pb-5" id="shoppinglist">
-                    <div class="row pb-5">
-                        <div class="col col-md-12 p-0 p-lg-3">
-                            <div role="tablist">
-                                <!-- add to shopping form -->
-                                <div class="container d-lg-block d-print-none d-none">
-                                    <b-row class="justify-content-md-center align-items-center pl-1 pr-1"
-                                           v-if="entrymode">
-                                        <b-col cols="12" md="3" v-if="!ui.entry_mode_simple"
-                                               class="d-none d-md-block mt-1">
-                                            <b-form-input
-                                                size="lg"
-                                                min="1"
-                                                type="number"
-                                                :description="$t('Amount')"
-                                                v-model="new_item.amount"
-                                                style="font-size: 16px; border-radius: 5px !important; border: 1px solid #e8e8e8 !important"
-                                                ref="amount_input_complex"
-                                            ></b-form-input>
-                                        </b-col>
-                                        <b-col cols="12" md="4" v-if="!ui.entry_mode_simple" class="mt-1">
-                                            <lookup-input :class_list="'mb-0'" :form="formUnit" :model="Models.UNIT"
-                                                          @change="new_item.unit = $event" :show_label="false"
-                                                          :clear="clear"/>
-                                        </b-col>
-                                        <b-col cols="12" md="4" v-if="!ui.entry_mode_simple" class="mt-1">
-                                            <lookup-input :class_list="'mb-0'" :form="formFood" :model="Models.FOOD"
-                                                          @change="new_item.food = $event" :show_label="false"
-                                                          :clear="clear"/>
-                                        </b-col>
-                                        <b-col cols="12" md="11" v-if="ui.entry_mode_simple" class="mt-1">
-                                            <b-form-input size="lg" type="text" :placeholder="$t('QuickEntry')"
-                                                          v-model="new_item.ingredient"
-                                                          @keyup.enter="addItem"
-                                                          ref="amount_input_simple"></b-form-input>
-                                        </b-col>
-                                        <b-col cols="12" md="1" class="d-none d-md-block mt-1">
-                                            <b-button variant="link" class="px-0" type="submit">
-                                                <i class="btn fas fa-cart-plus fa-lg px-0 text-success"
-                                                   @click="addItem"/>
-                                            </b-button>
-                                        </b-col>
-                                        <b-col cols="12" md="3" v-if="!ui.entry_mode_simple"
-                                               class="d-block d-md-none mt-1">
-                                            <b-row>
-                                                <b-col cols="9">
-                                                    <b-form-input
-                                                        size="lg"
-                                                        min="1"
-                                                        type="number"
-                                                        :description="$t('Amount')"
-                                                        v-model="new_item.amount"
-                                                        style="font-size: 16px; border-radius: 5px !important; border: 1px solid #e8e8e8 !important"
-                                                    ></b-form-input>
-                                                </b-col>
-                                                <b-col cols="3" class="flex-grow-1">
-                                                    <b-button variant="success" class="p-0 pt-1 w-100 h-100">
-                                                        <i class="btn fas fa-cart-plus fa-lg" @click="addItem"/>
-                                                    </b-button>
-                                                </b-col>
-                                            </b-row>
-                                        </b-col>
-                                    </b-row>
 
-                                    <b-row class="row justify-content-around mt-2" v-if="entrymode">
-                                        <b-form-checkbox switch v-model="ui.entry_mode_simple">
-                                            {{ $t("QuickEntry") }}
-                                        </b-form-checkbox>
-                                        <b-button variant="success" size="sm" class="d-flex d-md-none p-0"
-                                                  v-if="ui.entry_mode_simple">
-                                            <i class="btn fas fa-cart-plus" @click="addItem"/>
-                                        </b-button>
-                                    </b-row>
+                <b-row class="d-lg-block d-print-none d-none pr-4 pl-4 mb-3 mt-3">
+                    <b-col cols="12">
+                        <b-input-group>
+                            <b-form-input type="text" :placeholder="$t('Food')"
+                                          v-model="new_item.ingredient"
+                                          @keyup.enter="addItem"
+                                          ref="amount_input_simple"></b-form-input>
+                            <b-input-group-append>
+                                <b-button variant="success">
+                                    <i class="fas fa-cart-plus" @click="addItem"/>
+                                </b-button>
+                            </b-input-group-append>
+                        </b-input-group>
+                    </b-col>
+                </b-row>
 
-                                </div>
-                                <!-- shopping list table -->
+                <!-- shopping list table -->
 
-                                <b-row v-for="c in shopping_list_store.category_food_entries" v-bind:key="c.id" class="pr-4 pl-4">
-                                    <b-col cols="12">
-                                        <b-button-group class="w-100 mt-1">
-                                            <b-button variant="light" block class="btn btn-block text-left">
-                                                <span v-if="c.id === -1">{{$t('Undefined')}}</span>
-                                                <span v-else>{{ c.name}}</span>
-                                            </b-button>
-                                            <b-button variant="success"><i class="fas fa-check"></i></b-button> <!-- todo implement -->
-                                        </b-button-group>
+                <b-row v-for="c in shopping_list_store.category_food_entries" v-bind:key="c.id" class="pr-4 pl-4">
+                    <b-col cols="12">
+                        <b-button-group class="w-100 mt-1">
+                            <b-button variant="light" block class="btn btn-block text-left">
+                                <span v-if="c.id === -1">{{ $t('Undefined') }}</span>
+                                <span v-else>{{ c.name }}</span>
+                            </b-button>
+                            <b-button variant="success"><i class="fas fa-check"></i></b-button> <!-- todo implement -->
+                        </b-button-group>
 
-                                        <span v-for="f in c.foods" v-bind:key="f.id">
+                        <span v-for="f in c.foods" v-bind:key="f.id">
                                             <shopping-line-item :entries="f['entries']" class="mt-1"/>
                                         </span>
-                                    </b-col>
-                                </b-row>
-                            </div>
-                        </div>
-                    </div>
-                </div>
+                    </b-col>
+                </b-row>
+
             </b-tab>
             <!-- recipe tab -->
             <b-tab :title="$t('Recipes')">
@@ -530,7 +466,7 @@
                 <div class="d-flex flex-row justify-content-around mb-3">
 
                     <b-input-group>
-                        <b-form-input v-model="new_item.ingredient" :placeholder="$t('Food')"></b-form-input>
+                        <b-form-input v-model="new_item.ingredient" :placeholder="$t('Food')" @keyup.enter="addItem"></b-form-input>
                         <b-input-group-append>
                             <b-button @click="addItem" variant="success">
                                 <i class="fas fa-cart-plus "/>
@@ -597,7 +533,6 @@ export default {
         ContextMenuItem,
         ShoppingLineItem,
         GenericMultiselect,
-        LookupInput,
         DownloadPDF,
         DownloadCSV,
         CopyToClipboard,
@@ -918,43 +853,27 @@ export default {
         },
         // this.genericAPI inherited from ApiMixin
         addItem: function () {
-            if (this.ui.entry_mode_simple) {
-                if (this.new_item.ingredient !== "" && this.new_item.ingredient !== undefined) {
-                    this.genericPostAPI("api_ingredient_from_string", {text: this.new_item.ingredient}).then((result) => {
-                        let unit = null
-                        if (result.data.unit !== null) {
-                            unit = {name: result.data.unit}
-                        }
 
-                        this.new_item = {
-                            amount: result.data.amount,
-                            unit: unit,
-                            food: {name: result.data.food},
-                        }
-                        this.addEntry()
-                    })
-                }
-            } else {
-                this.addEntry()
-            }
-            this.setFocus()
-        },
-        addEntry: function (x) {
-            let api = new ApiApiFactory()
-            api.createShoppingListEntry(this.new_item)
-                .then((results) => {
-                    if (results?.data) {
-                        this.items.push(results.data)
-                        StandardToasts.makeStandardToast(this, StandardToasts.SUCCESS_CREATE)
-                    } else {
-                        console.log("no data returned")
+            if (this.new_item.ingredient !== "" && this.new_item.ingredient !== undefined) {
+                this.genericPostAPI("api_ingredient_from_string", {text: this.new_item.ingredient}).then((result) => {
+                    let unit = null
+                    if (result.data.unit !== null) {
+                        unit = {name: result.data.unit}
                     }
+
+                    //TODO clean up from here on
+                    this.new_item = {
+                        amount: result.data.amount,
+                        unit: unit,
+                        food: {name: result.data.food, supermarket_category: null},
+                    }
+                    this.useShoppingListStore().createObject(this.new_item)
                     this.new_item = {amount: 1, unit: undefined, food: undefined, ingredient: undefined}
                     this.clear += 1
                 })
-                .catch((err) => {
-                    StandardToasts.makeStandardToast(this, StandardToasts.FAIL_CREATE, err)
-                })
+            }
+
+            this.setFocus()
         },
         resetFilters: function () {
             this.ui.selected_supermarket = undefined
diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index ed4ee492..67a5ff44 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -1,8 +1,8 @@
 <template>
     <div id="shopping_line_item">
 
-        <b-button-group class="w-100">
-            <b-button variant="dark" block class="btn btn-block text-left" @click="detail_modal_visible = true">
+        <b-button-group class="w-100" v-if="useShoppingListStore().show_checked_entries || !is_checked">
+            <b-button :class="{'btn-dark': !is_checked, 'btn-success': is_checked}" block class="btn btn-block text-left" @click="detail_modal_visible = true">
                 <div class="d-flex ">
                     <div class="d-flex flex-column pr-2" v-if="Object.keys(amounts).length> 0">
                         <span v-for="a in amounts" v-bind:key="a.id">{{ a.amount }} {{ a.unit }}<br/></span>
@@ -18,7 +18,7 @@
 
 
             </b-button>
-            <b-button variant="success" @click="useShoppingListStore().toggleFoodCheckedState(food)"><i class="fas fa-check"></i></b-button>
+            <b-button variant="success" @click="useShoppingListStore().toggleFoodCheckedState(food)" :class="{'btn-success': !is_checked, 'btn-warning': is_checked}"><i class="fas" :class="{'fa-check': !is_checked, 'fa-times': is_checked}"></i></b-button>
         </b-button-group>
 
 
@@ -37,7 +37,7 @@
 
                 <b-button variant="info" block @click="detail_modal_visible = false;useShoppingListStore().delayFood(food)">{{$t('Delay')}}</b-button>
 
-                <b-button variant="danger" block @click="detail_modal_visible = false;useShoppingListStore().deleteFood(food)">{{ $t('Delete') }}</b-button>
+                <b-button variant="danger" block @click="detail_modal_visible = false;useShoppingListStore().deleteFood(food)">{{ $t('Delete_All') }}</b-button>
 
                 <h6 class="mt-2">Details</h6> <!-- TODO localize -->
                 <b-row v-for="e in entries" v-bind:key="e.id">
@@ -60,7 +60,7 @@
                                 </small></span>
 
                             </b-button>
-                            <b-button variant="success"><i class="fas fa-check"></i></b-button> <!-- TODO implement -->
+                            <b-button variant="warning" @click="detail_modal_visible = false; useShoppingListStore().deleteObject(e)"><i class="fas fa-trash"></i></b-button> <!-- TODO implement -->
                         </b-button-group>
 
                     </b-col>
@@ -99,6 +99,14 @@ export default {
         }
     },
     computed: {
+        is_checked: function (){
+            for (let i in this.entries) {
+                if(!this.entries[i].checked){
+                    return false
+                }
+            }
+            return true
+        },
         food: function () {
             return this.entries[Object.keys(this.entries)[0]]['food']
         },
diff --git a/vue/src/locales/en.json b/vue/src/locales/en.json
index 3f18e1a5..34bf5e94 100644
--- a/vue/src/locales/en.json
+++ b/vue/src/locales/en.json
@@ -181,6 +181,7 @@
     "Unit_Alias": "Unit Alias",
     "Keyword_Alias": "Keyword Alias",
     "Delete_Food": "Delete Food",
+    "Delete_All": "Delete All",
     "No_ID": "ID not found, cannot delete.",
     "Meal_Plan_Days": "Future meal plans",
     "merge_title": "Merge {type}",
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index 982387b0..9e97cc95 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -13,6 +13,8 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
     state: () => ({
         category_food_entries: {},
 
+        show_checked_entries: false,
+
         currently_updating: false,
         settings: null,
     }),
@@ -31,21 +33,14 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
              * Retrieves all shopping list entries from the API and parses them into a structured object category > food > entry
              */
             this.category_food_entries = {}
-            Vue.set(this.category_food_entries, -1, {'id': -1, 'name': '', foods: {}}) //TODO use localization to get name for undefined category
+            Vue.set(this.category_food_entries, -1, {'id': -1, 'name': '', foods: {}})
 
             if (!this.currently_updating) {
                 this.currently_updating = true
                 let apiClient = new ApiApiFactory()
                 apiClient.listShoppingListEntrys().then((r) => {
                     r.data.forEach((e) => {
-                        let category = this.getFoodCategory(e.food)
-                        if (!(category in this.category_food_entries)) {
-                            Vue.set(this.category_food_entries, category, {'id': category, 'name': e.food.supermarket_category.name, foods: {}})
-                        }
-                        if (!(e.food.id in this.category_food_entries[category]['foods'])) {
-                            Vue.set(this.category_food_entries[category]['foods'], e.food.id, {'id': e.food.id, 'name': e.food.name, 'entries': {}})
-                        }
-                        Vue.set(this.category_food_entries[category]['foods'][e.food.id]['entries'], e.id, e)
+                        this.updateEntryInStructure(e)
                     })
                     this.currently_updating = false
                 })
@@ -57,7 +52,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
             // TODO shared handled in backend?
 
             return apiClient.createShoppingListEntry(object).then((r) => {
-                Vue.set(this.category_food_entries[this.getFoodCategory(r.food)]['foods'][r.food.id][r.id], r.id, r)
+                this.updateEntryInStructure(r.data)
             }).catch((err) => {
                 StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
             })
@@ -65,7 +60,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
         updateObject(object) {
             let apiClient = new ApiApiFactory()
             return apiClient.updateShoppingListEntry(object.id, object).then((r) => {
-                Vue.set(this.category_food_entries[this.getFoodCategory(r.food)]['foods'][r.food.id][r.id], r.id, r)
+                this.updateEntryInStructure(r.data)
             }).catch((err) => {
                 StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
             })
@@ -110,6 +105,16 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
             }
             return -1
         },
+        updateEntryInStructure(entry) {
+            let category = this.getFoodCategory(entry.food)
+            if (!(category in this.category_food_entries)) {
+                Vue.set(this.category_food_entries, category, {'id': category, 'name': entry.food.supermarket_category.name, 'foods': {}})
+            }
+            if (!(entry.food.id in this.category_food_entries[category]['foods'])) {
+                Vue.set(this.category_food_entries[category]['foods'], entry.food.id, {'id': entry.food.id, 'name': entry.food.name, 'entries': {}})
+            }
+            Vue.set(this.category_food_entries[category]['foods'][entry.food.id]['entries'], entry.id, entry)
+        },
         toggleFoodCheckedState(food) {
             /**
              * function to handle user checking or unchecking a food

From d1c4e51842e9bb65f2b8ac63eff489f50800278c Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sat, 23 Dec 2023 08:46:31 +0100
Subject: [PATCH 07/95] fixed popover header in dark theme

---
 cookbook/static/themes/tandoor_dark.min.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cookbook/static/themes/tandoor_dark.min.css b/cookbook/static/themes/tandoor_dark.min.css
index 97c9cf6c..c21d8703 100644
--- a/cookbook/static/themes/tandoor_dark.min.css
+++ b/cookbook/static/themes/tandoor_dark.min.css
@@ -6155,7 +6155,7 @@ a.close.disabled {
     padding: .5rem .75rem;
     margin-bottom: 0;
     font-size: 1rem;
-    background-color: #f7f7f7;
+    background-color: #242424;
     border-bottom: 1px solid #ebebeb;
     border-top-left-radius: calc(.3rem - 1px);
     border-top-right-radius: calc(.3rem - 1px)

From ae3818611df36ba3592a9ce22ff8fff7d2ddbec1 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sat, 23 Dec 2023 08:46:42 +0100
Subject: [PATCH 08/95] fixed checking food always works

---
 vue/src/components/ShoppingLineItem.vue | 18 ++++++++++--------
 vue/src/stores/ShoppingListStore.js     |  4 ++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index 67a5ff44..a39f77c6 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -12,13 +12,15 @@
                     </div>
                 </div>
 
-                <div class="flex-row">
-                    <span v-if="info_row"><br/><small class="text-muted">{{ info_row }} INFO</small></span>
-                </div>
+
+                    <span v-if="info_row"><small class="text-muted">{{ info_row }}</small></span>
+
 
 
             </b-button>
-            <b-button variant="success" @click="useShoppingListStore().toggleFoodCheckedState(food)" :class="{'btn-success': !is_checked, 'btn-warning': is_checked}"><i class="fas" :class="{'fa-check': !is_checked, 'fa-times': is_checked}"></i></b-button>
+            <b-button variant="success" @click="useShoppingListStore().setFoodCheckedState(food, !is_checked)" :class="{'btn-success': !is_checked, 'btn-warning': is_checked}">
+                <i class="fas" :class="{'fa-check': !is_checked, 'fa-times': is_checked}"></i>
+            </b-button>
         </b-button-group>
 
 
@@ -35,7 +37,7 @@
 
                 <b-button variant="success" block @click="detail_modal_visible = false;"> {{ $t("Edit_Food") }}</b-button>  <!-- TODO implement -->
 
-                <b-button variant="info" block @click="detail_modal_visible = false;useShoppingListStore().delayFood(food)">{{$t('Delay')}}</b-button>
+                <b-button variant="info" block @click="detail_modal_visible = false;useShoppingListStore().delayFood(food)">{{ $t('Delay') }}</b-button>
 
                 <b-button variant="danger" block @click="detail_modal_visible = false;useShoppingListStore().deleteFood(food)">{{ $t('Delete_All') }}</b-button>
 
@@ -99,9 +101,9 @@ export default {
         }
     },
     computed: {
-        is_checked: function (){
+        is_checked: function () {
             for (let i in this.entries) {
-                if(!this.entries[i].checked){
+                if (!this.entries[i].checked) {
                     return false
                 }
             }
@@ -172,7 +174,7 @@ export default {
                 return recipes.join(', ')
             }
 
-            if (this.entries.length === 123) {
+            if (Object.keys(this.entries ).length === 1) {
                 return "Abendessen 31.12" // TODO implement mealplan or manual
             }
 
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index 9e97cc95..4813fe30 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -115,14 +115,14 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
             }
             Vue.set(this.category_food_entries[category]['foods'][entry.food.id]['entries'], entry.id, entry)
         },
-        toggleFoodCheckedState(food) {
+        setFoodCheckedState(food, checked) {
             /**
              * function to handle user checking or unchecking a food
              */
 
             let entries = this.category_food_entries[this.getFoodCategory(food)]['foods'][food.id]['entries']
             for (let i in entries) {
-                entries[i].checked = !entries[i].checked
+                entries[i].checked = checked
                 this.updateObject(entries[i])
             }
         },

From b0c561661b8a496cb3b721b008bb08f03568dae1 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sat, 23 Dec 2023 11:11:36 +0100
Subject: [PATCH 09/95] basic category chaning

---
 .../ShoppingListView/ShoppingListView.vue     | 18 ++-------
 vue/src/components/ShoppingLineItem.vue       | 39 +++++++++++++++----
 vue/src/locales/en.json                       |  1 +
 vue/src/stores/ShoppingListStore.js           | 11 +++++-
 4 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 9fa95d7e..48d066be 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -555,7 +555,6 @@ export default {
             supermarket_categories_only: false,
             shopcat: null,
             delay: 0,
-            clear: Math.random(),
             generic_action: null,
             generic_model: null,
             ui: {
@@ -843,13 +842,7 @@ export default {
             })
         },
         setFocus() {
-            if (this.ui.entry_mode_simple) {
-                this.$refs['amount_input_simple'].focus()
-            } else {
-                if (this.$refs['amount_input_complex']) {
-                    this.$refs['amount_input_complex'].focus()
-                }
-            }
+            this.$refs['amount_input_simple'].focus()
         },
         // this.genericAPI inherited from ApiMixin
         addItem: function () {
@@ -861,19 +854,14 @@ export default {
                         unit = {name: result.data.unit}
                     }
 
-                    //TODO clean up from here on
-                    this.new_item = {
+                    this.useShoppingListStore().createObject({
                         amount: result.data.amount,
                         unit: unit,
                         food: {name: result.data.food, supermarket_category: null},
-                    }
-                    this.useShoppingListStore().createObject(this.new_item)
+                    })
                     this.new_item = {amount: 1, unit: undefined, food: undefined, ingredient: undefined}
-                    this.clear += 1
                 })
             }
-
-            this.setFocus()
         },
         resetFilters: function () {
             this.ui.selected_supermarket = undefined
diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index a39f77c6..bc016a06 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -13,8 +13,7 @@
                 </div>
 
 
-                    <span v-if="info_row"><small class="text-muted">{{ info_row }}</small></span>
-
+                <span v-if="info_row"><small class="text-muted">{{ info_row }}</small></span>
 
 
             </b-button>
@@ -33,15 +32,24 @@
 
             <template #default>
                 <h6 class="mt-2">Actions</h6> <!-- TODO localize -->
-                <b-input :placeholder="$t('Category')" class="mb-2"></b-input>  <!-- TODO implement -->
+                <b-form-select
+                    class="form-control mb-2"
+                    :options="useShoppingListStore().supermarket_categories"
+                    text-field="name"
+                    value-field="id"
+                    v-model="food.supermarket_category"
+                    @change="detail_modal_visible = false; updateFoodCategory(food)"
+                ></b-form-select>  <!-- TODO change to lookup input or something else that works with dicts -->
 
                 <b-button variant="success" block @click="detail_modal_visible = false;"> {{ $t("Edit_Food") }}</b-button>  <!-- TODO implement -->
 
                 <b-button variant="info" block @click="detail_modal_visible = false;useShoppingListStore().delayFood(food)">{{ $t('Delay') }}</b-button>
 
+
+                <h6 class="mt-2">{{ $t('Entries') }}</h6>
+
                 <b-button variant="danger" block @click="detail_modal_visible = false;useShoppingListStore().deleteFood(food)">{{ $t('Delete_All') }}</b-button>
 
-                <h6 class="mt-2">Details</h6> <!-- TODO localize -->
                 <b-row v-for="e in entries" v-bind:key="e.id">
                     <b-col cold="12">
                         <b-button-group class="mt-1 w-100">
@@ -81,9 +89,10 @@
 import Vue from "vue"
 import {BootstrapVue} from "bootstrap-vue"
 import "bootstrap-vue/dist/bootstrap-vue.css"
-import {ApiMixin, resolveDjangoUrl} from "@/utils/utils"
+import {ApiMixin, resolveDjangoUrl, StandardToasts} from "@/utils/utils"
 import {useMealPlanStore} from "@/stores/MealPlanStore";
 import {useShoppingListStore} from "@/stores/ShoppingListStore";
+import {ApiApiFactory} from "@/utils/openapi/api";
 
 
 Vue.use(BootstrapVue)
@@ -174,11 +183,11 @@ export default {
                 return recipes.join(', ')
             }
 
-            if (Object.keys(this.entries ).length === 1) {
+            if (Object.keys(this.entries).length === 123) {
                 return "Abendessen 31.12" // TODO implement mealplan or manual
             }
 
-            return this.entries.length
+            return "IMPLEMENT INFO ROW!!"
         }
     },
     watch: {},
@@ -187,7 +196,6 @@ export default {
     },
     methods: {
         useShoppingListStore,
-        useMealPlanStore,
         resolveDjangoUrl,
 
         formatDate: function (datetime) {
@@ -200,6 +208,21 @@ export default {
             }).format(Date.parse(datetime))
         },
 
+        updateFoodCategory: function (food) {
+
+            if (typeof food.supermarket_category === "number"){
+                food.supermarket_category = this.useShoppingListStore().supermarket_categories.filter(sc => sc.id === food.supermarket_category)[0]
+            }
+
+            let apiClient = new ApiApiFactory()
+            apiClient.updateFood(food.id, food).then(r => {
+
+            }).catch((err) => {
+                StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
+            })
+        }
+
+
     },
 }
 </script>
diff --git a/vue/src/locales/en.json b/vue/src/locales/en.json
index 34bf5e94..846887ab 100644
--- a/vue/src/locales/en.json
+++ b/vue/src/locales/en.json
@@ -346,6 +346,7 @@
     "Delay": "Delay",
     "Pin": "Pin",
     "Unpin": "Unpin",
+    "Entries": "Entries",
     "PinnedConfirmation": "{recipe} has been pinned.",
     "UnpinnedConfirmation": "{recipe} has been unpinned.",
     "mark_complete": "Mark Complete",
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index 4813fe30..83d46236 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -12,8 +12,9 @@ const _LOCAL_STORAGE_KEY = "SHOPPING_LIST_CLIENT_SETTINGS"
 export const useShoppingListStore = defineStore(_STORE_ID, {
     state: () => ({
         category_food_entries: {},
+        supermarket_categories: [],
 
-        show_checked_entries: false,
+        show_checked_entries: false, // TODO move to settings
 
         currently_updating: false,
         settings: null,
@@ -43,6 +44,14 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                         this.updateEntryInStructure(e)
                     })
                     this.currently_updating = false
+                }).catch((err) => {
+                    StandardToasts.makeStandardToast(this, StandardToasts.FAIL_FETCH, err)
+                })
+
+                apiClient.listSupermarketCategorys().then(r => {
+                    this.supermarket_categories = r.data
+                }).catch((err) => {
+                    StandardToasts.makeStandardToast(this, StandardToasts.FAIL_FETCH, err)
                 })
             }
         },

From d3376b33d84ed3d066c6269e6f7c198822590ed7 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Wed, 27 Dec 2023 11:34:55 +0100
Subject: [PATCH 10/95] new datastructure

---
 .idea/dictionaries/vaben.xml                  |  1 +
 .../ShoppingListView/ShoppingListView.vue     |  4 +-
 vue/src/apps/TestView/TestView.vue            | 29 +++----
 vue/src/components/ShoppingLineItem.vue       | 20 +++--
 vue/src/stores/ShoppingListStore.js           | 83 +++++++++++++------
 5 files changed, 87 insertions(+), 50 deletions(-)

diff --git a/.idea/dictionaries/vaben.xml b/.idea/dictionaries/vaben.xml
index e910c82d..a8b8f4df 100644
--- a/.idea/dictionaries/vaben.xml
+++ b/.idea/dictionaries/vaben.xml
@@ -1,6 +1,7 @@
 <component name="ProjectDictionaryState">
   <dictionary name="vaben">
     <words>
+      <w>mealplan</w>
       <w>pinia</w>
       <w>selfhosted</w>
       <w>unapplied</w>
diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 48d066be..9b856989 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -53,7 +53,7 @@
 
                 <!-- shopping list table -->
 
-                <b-row v-for="c in shopping_list_store.category_food_entries" v-bind:key="c.id" class="pr-4 pl-4">
+                <b-row v-for="c in shopping_list_store.get_entries_by_group" v-bind:key="c.id" class="pr-4 pl-4">
                     <b-col cols="12">
                         <b-button-group class="w-100 mt-1">
                             <b-button variant="light" block class="btn btn-block text-left">
@@ -750,7 +750,7 @@ export default {
             handler() {
                 this.$cookies.set(SETTINGS_COOKIE_NAME, {ui: this.ui, settings: {entrymode: this.entrymode}}, "100y")
                 if (this.entrymode) {
-                    document.getElementById('shoppinglist').scrollTop = 0
+                    //document.getElementById('shoppinglist').scrollTop = 0
                     this.$nextTick(function () {
                         this.setFocus()
                     })
diff --git a/vue/src/apps/TestView/TestView.vue b/vue/src/apps/TestView/TestView.vue
index 24520e7f..d1faca5c 100644
--- a/vue/src/apps/TestView/TestView.vue
+++ b/vue/src/apps/TestView/TestView.vue
@@ -3,21 +3,18 @@
     <div id="app">
         <div>
 
-
-
-            <b-button-group class="w-100 mb-1" >
-                <b-button variant="dark" block class="btn btn-block btn-sm text-left " >100 g Möhren Test <br/><small class="text-muted">Info</small></b-button>
-                <b-button variant="success"><i class="fas fa-check"></i></b-button>
-            </b-button-group>
-            <br/>
-            <b-button-group class="w-100">
-                <b-button variant="dark" block class="btn btn-block text-left" >150 ml Heißwassermöhrenbrühe<br/><small class="text-muted">Info</small></b-button>
-                <b-button variant="success"><i class="fas fa-check"></i></b-button>
-            </b-button-group>
-
-            <br/>
-            <br/>
-            <br/>
+            <generic-multiselect
+                :model="Models.SHOPPING_CATEGORY"
+                :multiple="false"
+            ></generic-multiselect>
+            <generic-multiselect
+                :model="Models.SHOPPING_CATEGORY"
+                :multiple="false"
+            ></generic-multiselect>
+            <generic-multiselect
+                :model="Models.SHOPPING_CATEGORY"
+                :multiple="false"
+            ></generic-multiselect>
             ----
 
             <markdown-editor-component></markdown-editor-component>
@@ -48,7 +45,7 @@ Vue.use(BootstrapVue)
 export default {
     name: "TestView",
     mixins: [ApiMixin],
-    components: {MarkdownEditorComponent},
+    components: {GenericMultiselect, MarkdownEditorComponent},
     computed: {},
     data() {
         return {}
diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index bc016a06..744f98a7 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -2,7 +2,7 @@
     <div id="shopping_line_item">
 
         <b-button-group class="w-100" v-if="useShoppingListStore().show_checked_entries || !is_checked">
-            <b-button :class="{'btn-dark': !is_checked, 'btn-success': is_checked}" block class="btn btn-block text-left" @click="detail_modal_visible = true">
+            <b-button :class="{'btn-dark': (!is_checked && !is_delayed), 'btn-success': is_checked, 'btn-warning': is_delayed}" block class="btn btn-block text-left" @click="detail_modal_visible = true">
                 <div class="d-flex ">
                     <div class="d-flex flex-column pr-2" v-if="Object.keys(amounts).length> 0">
                         <span v-for="a in amounts" v-bind:key="a.id">{{ a.amount }} {{ a.unit }}<br/></span>
@@ -17,7 +17,7 @@
 
 
             </b-button>
-            <b-button variant="success" @click="useShoppingListStore().setFoodCheckedState(food, !is_checked)" :class="{'btn-success': !is_checked, 'btn-warning': is_checked}">
+            <b-button variant="success" @click="useShoppingListStore().setEntriesCheckedState(entries, !is_checked)" :class="{'btn-success': !is_checked, 'btn-warning': is_checked}">
                 <i class="fas" :class="{'fa-check': !is_checked, 'fa-times': is_checked}"></i>
             </b-button>
         </b-button-group>
@@ -31,7 +31,7 @@
             </template>
 
             <template #default>
-                <h6 class="mt-2">Actions</h6> <!-- TODO localize -->
+                <h6 class="mt-2">{{ $t('Quick actions')}}</h6>
                 <b-form-select
                     class="form-control mb-2"
                     :options="useShoppingListStore().supermarket_categories"
@@ -39,11 +39,11 @@
                     value-field="id"
                     v-model="food.supermarket_category"
                     @change="detail_modal_visible = false; updateFoodCategory(food)"
-                ></b-form-select>  <!-- TODO change to lookup input or something else that works with dicts -->
+                ></b-form-select>
 
                 <b-button variant="success" block @click="detail_modal_visible = false;"> {{ $t("Edit_Food") }}</b-button>  <!-- TODO implement -->
 
-                <b-button variant="info" block @click="detail_modal_visible = false;useShoppingListStore().delayFood(food)">{{ $t('Delay') }}</b-button>
+                <b-button variant="info" block @click="detail_modal_visible = false;useShoppingListStore().delayEntries(entries)">{{ $t('Delay') }}</b-button>
 
 
                 <h6 class="mt-2">{{ $t('Entries') }}</h6>
@@ -118,6 +118,14 @@ export default {
             }
             return true
         },
+        is_delayed: function () {
+            for (let i in this.entries) {
+                if ( Date.parse(this.entries[i].delay_until) > new Date(Date.now())) {
+                    return true
+                }
+            }
+            return false
+        },
         food: function () {
             return this.entries[Object.keys(this.entries)[0]]['food']
         },
@@ -210,7 +218,7 @@ export default {
 
         updateFoodCategory: function (food) {
 
-            if (typeof food.supermarket_category === "number"){
+            if (typeof food.supermarket_category === "number"){ // not the best solution, but as long as generic multiselect does not support caching, I don't want to use a proper model
                 food.supermarket_category = this.useShoppingListStore().supermarket_categories.filter(sc => sc.id === food.supermarket_category)[0]
             }
 
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index 83d46236..3f95344d 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -2,15 +2,18 @@ import {ApiApiFactory} from "@/utils/openapi/api"
 import {StandardToasts} from "@/utils/utils"
 import {defineStore} from "pinia"
 import Vue from "vue"
+import _ from 'lodash';
 
 const _STORE_ID = "shopping_list_store"
 const _LOCAL_STORAGE_KEY = "SHOPPING_LIST_CLIENT_SETTINGS"
 /*
- * test store to play around with pinia and see if it can work for my usecases
- * dont trust that all shopping list entries are in store as there is no cache validation logic, its just a shared data holder
+ * test store to play around with pinia and see if it can work for my use cases
+ * don't trust that all shopping list entries are in store as there is no cache validation logic, its just a shared data holder
  * */
 export const useShoppingListStore = defineStore(_STORE_ID, {
     state: () => ({
+        entries: {},
+
         category_food_entries: {},
         supermarket_categories: [],
 
@@ -18,9 +21,25 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
 
         currently_updating: false,
         settings: null,
+
+
+        GROUP_CATEGORY: 'food.supermarket_category.name',
+        GROUP_CREATED_BY: 'created_by.display_name',
+        GROUP_RECIPE: 'recipe_mealplan.recipe_name',
+        GROUP_MEALPLAN: 'recipe_mealplan.mealplan', //TODO give this some name from the API
+
+        selected_group: 'food.supermarket_category.name',
     }),
     getters: {
 
+        get_entries_by_group: function () {
+            let structure = {}
+            for (let i in this.entries) {
+                structure = this.updateEntryInStructure(structure, this.entries[i], this.selected_group)
+            }
+            return structure
+        },
+
         client_settings: function () {
             if (this.settings === null) {
                 this.settings = this.loadClientSettings()
@@ -41,7 +60,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                 let apiClient = new ApiApiFactory()
                 apiClient.listShoppingListEntrys().then((r) => {
                     r.data.forEach((e) => {
-                        this.updateEntryInStructure(e)
+                        Vue.set(this.entries, e.id, e)
                     })
                     this.currently_updating = false
                 }).catch((err) => {
@@ -61,7 +80,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
             // TODO shared handled in backend?
 
             return apiClient.createShoppingListEntry(object).then((r) => {
-                this.updateEntryInStructure(r.data)
+                Vue.set(this.entries, r.data.id, r.data)
             }).catch((err) => {
                 StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
             })
@@ -69,7 +88,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
         updateObject(object) {
             let apiClient = new ApiApiFactory()
             return apiClient.updateShoppingListEntry(object.id, object).then((r) => {
-                this.updateEntryInStructure(r.data)
+                Vue.set(this.entries, r.data.id, r.data)
             }).catch((err) => {
                 StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
             })
@@ -114,28 +133,41 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
             }
             return -1
         },
-        updateEntryInStructure(entry) {
-            let category = this.getFoodCategory(entry.food)
-            if (!(category in this.category_food_entries)) {
-                Vue.set(this.category_food_entries, category, {'id': category, 'name': entry.food.supermarket_category.name, 'foods': {}})
+        /**
+         * function to set entry to its proper place in the data structure to perform grouping
+         * @param {{}} structure datastructure
+         * @param {*} entry entry to place
+         * @param {*} group group to place entry into (must be of ShoppingListStore.GROUP_XXX/dot notation of entry property)
+         * @returns updated datastructure including entry
+         */
+        updateEntryInStructure(structure, entry, group) {
+            let grouping_key = _.get(entry, group, -1)
+            // todo handele parent
+            if (grouping_key === undefined || grouping_key === null) {
+                grouping_key = -1
             }
-            if (!(entry.food.id in this.category_food_entries[category]['foods'])) {
-                Vue.set(this.category_food_entries[category]['foods'], entry.food.id, {'id': entry.food.id, 'name': entry.food.name, 'entries': {}})
-            }
-            Vue.set(this.category_food_entries[category]['foods'][entry.food.id]['entries'], entry.id, entry)
-        },
-        setFoodCheckedState(food, checked) {
-            /**
-             * function to handle user checking or unchecking a food
-             */
 
-            let entries = this.category_food_entries[this.getFoodCategory(food)]['foods'][food.id]['entries']
+            if (!(grouping_key in structure)) {
+                Vue.set(structure, grouping_key, {'name': grouping_key, 'foods': {}})
+            }
+            if (!(entry.food.id in structure[grouping_key]['foods'])) {
+                Vue.set(structure[grouping_key]['foods'], entry.food.id, {'id': entry.food.id, 'name': entry.food.name, 'entries': {}})
+            }
+            Vue.set(structure[grouping_key]['foods'][entry.food.id]['entries'], entry.id, entry)
+            return structure
+        },
+        /**
+         * function to handle user checking or unchecking a set of entries
+         * @param {{}} entries set of entries
+         * @param checked boolean to set checked state of entry to
+         */
+        setEntriesCheckedState(entries, checked) {
             for (let i in entries) {
-                entries[i].checked = checked
-                this.updateObject(entries[i])
+                this.entries[i].checked = checked
+                this.updateObject(this.entries[i])
             }
         },
-        delayFood(food) {
+        delayEntries(entries) {
             /**
              * function to handle user "delaying" shopping entry
              * takes a food object as an argument and delays all entries associated with the food
@@ -143,12 +175,11 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
             let delay = 4 //TODO get delay from settings
             let delay_date = new Date(Date.now() + delay * (60 * 60 * 1000))
 
-            let entries = this.category_food_entries[this.getFoodCategory(food)]['foods'][food.id]['entries']
             for (let i in entries) {
-                entries[i].delayed_until = delay_date
-                this.updateObject(entries[i])
+                console.log('DELAYING ', i, ' until ', delay_date)
+                this.entries[i].delay_until = delay_date
+                this.updateObject(this.entries[i])
             }
-
         },
         deleteFood(food) {
             /**

From 20bc1c5c2ae53782ef126fb80a5663c38af877c9 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Wed, 27 Dec 2023 12:01:13 +0100
Subject: [PATCH 11/95] fixed deleting objects

---
 vue/src/components/ShoppingLineItem.vue |  2 +-
 vue/src/stores/ShoppingListStore.js     | 26 +++++++++++--------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index 744f98a7..9d49518d 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -48,7 +48,7 @@
 
                 <h6 class="mt-2">{{ $t('Entries') }}</h6>
 
-                <b-button variant="danger" block @click="detail_modal_visible = false;useShoppingListStore().deleteFood(food)">{{ $t('Delete_All') }}</b-button>
+                <b-button variant="danger" block @click="detail_modal_visible = false;useShoppingListStore().deleteEntries(entries)">{{ $t('Delete_All') }}</b-button>
 
                 <b-row v-for="e in entries" v-bind:key="e.id">
                     <b-col cold="12">
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index 3f95344d..7d7182aa 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -96,11 +96,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
         deleteObject(object) {
             let apiClient = new ApiApiFactory()
             return apiClient.destroyShoppingListEntry(object.id).then((r) => {
-
-                Vue.delete(this.category_food_entries[this.getFoodCategory(object.food)]['foods'][object.food.id]['entries'], object.id)
-                if (Object.keys(this.category_food_entries[this.getFoodCategory(object.food)]['foods'][object.food.id]['entries']).length === 0) {
-                    Vue.delete(this.category_food_entries[this.getFoodCategory(object.food)]['foods'], object.food.id)
-                }
+                Vue.delete(this.entries, object.id)
             }).catch((err) => {
                 StandardToasts.makeStandardToast(this, StandardToasts.FAIL_DELETE, err)
             })
@@ -167,11 +163,11 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                 this.updateObject(this.entries[i])
             }
         },
+        /**
+         * function to handle user "delaying" shopping entries
+         * @param {{}} entries set of entries
+         */
         delayEntries(entries) {
-            /**
-             * function to handle user "delaying" shopping entry
-             * takes a food object as an argument and delays all entries associated with the food
-             */
             let delay = 4 //TODO get delay from settings
             let delay_date = new Date(Date.now() + delay * (60 * 60 * 1000))
 
@@ -181,13 +177,13 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                 this.updateObject(this.entries[i])
             }
         },
-        deleteFood(food) {
-            /**
-             * function to handle user deleting all entries of a certain food
-             */
-            let entries = this.category_food_entries[this.getFoodCategory(food)]['foods'][food.id]['entries']
+        /**
+         * delete list of entries
+         * @param {{}} entries set of entries
+         */
+        deleteEntries(entries) {
             for (let i in entries) {
-                this.deleteObject(entries[i])
+                this.deleteObject(this.entries[i])
             }
         },
     },

From 629dfd5d52173f4cefb922cda19c8e931bd40163 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Wed, 27 Dec 2023 14:04:36 +0100
Subject: [PATCH 12/95] configurable info row

---
 .../ShoppingListView/ShoppingListView.vue     |  2 +-
 vue/src/components/ShoppingLineItem.vue       | 70 ++++++++++++-------
 2 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 9b856989..653f34e9 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -57,7 +57,7 @@
                     <b-col cols="12">
                         <b-button-group class="w-100 mt-1">
                             <b-button variant="light" block class="btn btn-block text-left">
-                                <span v-if="c.id === -1">{{ $t('Undefined') }}</span>
+                                <span v-if="c.name === -1">{{ $t('Undefined') }}</span>
                                 <span v-else>{{ c.name }}</span>
                             </b-button>
                             <b-button variant="success"><i class="fas fa-check"></i></b-button> <!-- todo implement -->
diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index 9d49518d..ba307839 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -1,7 +1,7 @@
 <template>
     <div id="shopping_line_item">
 
-        <b-button-group class="w-100" v-if="useShoppingListStore().show_checked_entries || !is_checked">
+        <b-button-group class="w-100" v-if="(useShoppingListStore().show_checked_entries || !is_checked) && !is_delayed">
             <b-button :class="{'btn-dark': (!is_checked && !is_delayed), 'btn-success': is_checked, 'btn-warning': is_delayed}" block class="btn btn-block text-left" @click="detail_modal_visible = true">
                 <div class="d-flex ">
                     <div class="d-flex flex-column pr-2" v-if="Object.keys(amounts).length> 0">
@@ -31,7 +31,7 @@
             </template>
 
             <template #default>
-                <h6 class="mt-2">{{ $t('Quick actions')}}</h6>
+                <h6 class="mt-2">{{ $t('Quick actions') }}</h6>
                 <b-form-select
                     class="form-control mb-2"
                     :options="useShoppingListStore().supermarket_categories"
@@ -120,7 +120,7 @@ export default {
         },
         is_delayed: function () {
             for (let i in this.entries) {
-                if ( Date.parse(this.entries[i].delay_until) > new Date(Date.now())) {
+                if (Date.parse(this.entries[i].delay_until) > new Date(Date.now())) {
                     return true
                 }
             }
@@ -160,42 +160,61 @@ export default {
         },
         info_row: function () {
             // TODO add setting
+            let info_row = []
 
-            // author
-            if (this.entries.length === 123) {
-                let authors = []
-                this.entries.forEach(e => {
-                    if (authors.indexOf(e.created_by.display_name) === -1) {
-                        authors.push(e.created_by.display_name)
+
+            let display_authors = false
+            let display_recipes = true
+            let display_mealplans = true
+
+            let authors = []
+            let recipes = []
+            let meal_pans = []
+
+            for (let i in this.entries) {
+                let e = this.entries[i]
+
+                if (authors.indexOf(e.created_by.display_name) === -1) {
+                    authors.push(e.created_by.display_name)
+                }
+
+
+                if (e.recipe_mealplan !== null) {
+                    let recipe_name = e.recipe_mealplan.recipe_name
+                    if (recipes.indexOf(recipe_name) === -1) {
+                        recipes.push(recipe_name)
                     }
-                })
-                return authors.join(', ')
-            }
 
-            if (this.entries.length === 1123) {
-                let recipes = []
-                this.entries.forEach(e => {
-                    if (e.recipe_mealplan !== null) {
-                        let recipe_name = e.recipe_mealplan.recipe_name
-                        if (recipes.indexOf(recipe_name) === -1) {
-                            recipes.push(recipe_name)
+                    if ('mealplan_from_date' in e.recipe_mealplan) {
+                        let meal_plan_entry = (e?.recipe_mealplan?.mealplan_type || '') + ' (' + this.formatDate(e.recipe_mealplan.mealplan_from_date) + ')'
+                        if (meal_pans.indexOf(meal_plan_entry) === -1) {
+                            meal_pans.push(meal_plan_entry)
                         }
                     }
-                })
+                }
+
                 if (recipes.length > 1) {
                     let short_recipes = []
                     recipes.forEach(r => {
                         short_recipes.push(r.substring(0, 14) + (r.length > 14 ? '..' : ''))
                     })
+                    recipes = short_recipes
                 }
-                return recipes.join(', ')
             }
 
-            if (Object.keys(this.entries).length === 123) {
-                return "Abendessen 31.12" // TODO implement mealplan or manual
+
+            if (display_authors && authors.length > 0) {
+                info_row.push(authors.join(', '))
+            }
+            if (display_recipes && recipes.length > 0) {
+                info_row.push(recipes.join(', '))
+            }
+            if (display_mealplans && meal_pans.length > 0) {
+                info_row.push(meal_pans.join(', '))
             }
 
-            return "IMPLEMENT INFO ROW!!"
+
+            return info_row.join(' - ')
         }
     },
     watch: {},
@@ -212,13 +231,12 @@ export default {
             }
             return Intl.DateTimeFormat(window.navigator.language, {
                 dateStyle: "short",
-                timeStyle: "short",
             }).format(Date.parse(datetime))
         },
 
         updateFoodCategory: function (food) {
 
-            if (typeof food.supermarket_category === "number"){ // not the best solution, but as long as generic multiselect does not support caching, I don't want to use a proper model
+            if (typeof food.supermarket_category === "number") { // not the best solution, but as long as generic multiselect does not support caching, I don't want to use a proper model
                 food.supermarket_category = this.useShoppingListStore().supermarket_categories.filter(sc => sc.id === food.supermarket_category)[0]
             }
 

From 0dacdcc72ff0e913a3bd0d730925179e7b0f06bf Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Wed, 27 Dec 2023 15:39:17 +0100
Subject: [PATCH 13/95] paddings

---
 vue/src/apps/ShoppingListView/ShoppingListView.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 653f34e9..b616ddea 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -35,7 +35,7 @@
                         class="d-none d-md-inline-block">{{ $t('Shopping_list') + ` (${items.filter(x => x.checked === false).length})` }}</span>
                 </template>
 
-                <b-row class="d-lg-block d-print-none d-none pr-4 pl-4 mb-3 mt-3">
+                <b-row class="d-lg-block d-print-none d-none pr-1 pl-1 mb-3 mt-3">
                     <b-col cols="12">
                         <b-input-group>
                             <b-form-input type="text" :placeholder="$t('Food')"
@@ -53,7 +53,7 @@
 
                 <!-- shopping list table -->
 
-                <b-row v-for="c in shopping_list_store.get_entries_by_group" v-bind:key="c.id" class="pr-4 pl-4">
+                <b-row v-for="c in shopping_list_store.get_entries_by_group" v-bind:key="c.id" class="pr-1 pl-1">
                     <b-col cols="12">
                         <b-button-group class="w-100 mt-1">
                             <b-button variant="light" block class="btn btn-block text-left">

From 0ce4d45eeb5c2ec902ca622f9db699e74705de93 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Wed, 27 Dec 2023 21:15:24 +0100
Subject: [PATCH 14/95] sorting

---
 .../ShoppingListView/ShoppingListView.vue     | 67 +++++++++---------
 vue/src/components/ShoppingLineItem.vue       |  8 ++-
 vue/src/locales/en.json                       |  1 +
 vue/src/stores/ShoppingListStore.js           | 69 +++++++++++++------
 4 files changed, 88 insertions(+), 57 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index b616ddea..02349f52 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -52,20 +52,19 @@
                 </b-row>
 
                 <!-- shopping list table -->
-
                 <b-row v-for="c in shopping_list_store.get_entries_by_group" v-bind:key="c.id" class="pr-1 pl-1">
                     <b-col cols="12">
                         <b-button-group class="w-100 mt-1">
                             <b-button variant="light" block class="btn btn-block text-left">
-                                <span v-if="c.name === -1">{{ $t('Undefined') }}</span>
+                                <span v-if="c.name === shopping_list_store.UNDEFINED_CATEGORY">{{ $t('Undefined') }}</span>
                                 <span v-else>{{ c.name }}</span>
                             </b-button>
                             <b-button variant="success"><i class="fas fa-check"></i></b-button> <!-- todo implement -->
                         </b-button-group>
 
                         <span v-for="f in c.foods" v-bind:key="f.id">
-                                            <shopping-line-item :entries="f['entries']" class="mt-1"/>
-                                        </span>
+                            <shopping-line-item :entries="f['entries']" class="mt-1"/>
+                        </span>
                     </b-col>
                 </b-row>
 
@@ -371,8 +370,9 @@
                     <b-form-select v-model="group_by" :options="group_by_choices" size="sm"></b-form-select>
                 </b-form-group>
                 <b-form-group v-bind:label="$t('Supermarket')" label-for="popover-input-2" label-cols="6" class="mb-1">
-                    <b-form-select v-model="ui.selected_supermarket" :options="supermarkets" text-field="name"
-                                   value-field="id" size="sm"></b-form-select>
+                    <generic-multiselect :model="Models.SUPERMARKET" @change="shopping_list_store.selected_supermarket = $event.val" :multiple="false"></generic-multiselect>
+<!--                    <b-form-select v-model="shopping_list_store.selected_supermarket" :options="shopping_list_store.supermarkets" text-field="name"-->
+<!--                                   value-field="id" size="sm"></b-form-select>-->
                 </b-form-group>
                 <!-- TODO: shade filters red when they are actually filtering content -->
                 <b-form-group v-bind:label="$t('ShowDelayed')" label-for="popover-input-3" content-cols="1"
@@ -814,8 +814,7 @@ export default {
         })
         this.$i18n.locale = window.CUSTOM_LOCALE
 
-        let store = useShoppingListStore()
-        store.refreshFromAPI()
+        this.shopping_list_store.refreshFromAPI()
     },
     methods: {
         useShoppingListStore,
@@ -951,32 +950,32 @@ export default {
             } else {
                 this.loading = true
             }
-            this.genericAPI(this.Models.SHOPPING_LIST, this.Actions.LIST, params).then((results) => {
-                if (!autosync) {
-                    if (results.data?.length) {
-                        this.items = results.data
-                    } else {
-                        console.log("no data returned")
-                    }
-                    this.loading = false
-                } else {
-                    if (!this.auto_sync_blocked) {
-                        this.getSyncQueueLength().then((r) => {
-                            if (r === 0) {
-                                this.mergeShoppingList(results.data)
-                            } else {
-                                this.auto_sync_running = false
-                                this.replaySyncQueue()
-                            }
-                        })
-                    }
-                }
-            })
-                .catch((err) => {
-                    if (!autosync) {
-                        StandardToasts.makeStandardToast(this, StandardToasts.FAIL_FETCH, err)
-                    }
-                })
+            // this.genericAPI(this.Models.SHOPPING_LIST, this.Actions.LIST, params).then((results) => {
+            //     if (!autosync) {
+            //         if (results.data?.length) {
+            //             this.items = results.data
+            //         } else {
+            //             console.log("no data returned")
+            //         }
+            //         this.loading = false
+            //     } else {
+            //         if (!this.auto_sync_blocked) {
+            //             this.getSyncQueueLength().then((r) => {
+            //                 if (r === 0) {
+            //                     this.mergeShoppingList(results.data)
+            //                 } else {
+            //                     this.auto_sync_running = false
+            //                     this.replaySyncQueue()
+            //                 }
+            //             })
+            //         }
+            //     }
+            // })
+            //     .catch((err) => {
+            //         if (!autosync) {
+            //             StandardToasts.makeStandardToast(this, StandardToasts.FAIL_FETCH, err)
+            //         }
+            //     })
         },
         getSupermarkets: function () {
             let api = new ApiApiFactory()
diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index ba307839..ffddc206 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -31,7 +31,8 @@
             </template>
 
             <template #default>
-                <h6 class="mt-2">{{ $t('Quick actions') }}</h6>
+                <h5 class="mt-2">{{ $t('Quick actions') }}</h5>
+                {{ $t('Category')}}
                 <b-form-select
                     class="form-control mb-2"
                     :options="useShoppingListStore().supermarket_categories"
@@ -41,9 +42,10 @@
                     @change="detail_modal_visible = false; updateFoodCategory(food)"
                 ></b-form-select>
 
-                <b-button variant="success" block @click="detail_modal_visible = false;"> {{ $t("Edit_Food") }}</b-button>  <!-- TODO implement -->
+                <!-- TODO implement -->
+<!--                <b-button variant="success" block @click="detail_modal_visible = false;"> {{ $t("Edit_Food") }}</b-button>  -->
 
-                <b-button variant="info" block @click="detail_modal_visible = false;useShoppingListStore().delayEntries(entries)">{{ $t('Delay') }}</b-button>
+                <b-button variant="info" block @click="detail_modal_visible = false;useShoppingListStore().delayEntries(entries)">{{ $t('Shop_later') }}</b-button>
 
 
                 <h6 class="mt-2">{{ $t('Entries') }}</h6>
diff --git a/vue/src/locales/en.json b/vue/src/locales/en.json
index 846887ab..ada615ec 100644
--- a/vue/src/locales/en.json
+++ b/vue/src/locales/en.json
@@ -67,6 +67,7 @@
     "Step_Type": "Step Type",
     "Make_Header": "Make Header",
     "Make_Ingredient": "Make Ingredient",
+    "Shop_later": "Shop later",
     "Amount": "Amount",
     "Enable_Amount": "Enable Amount",
     "Disable_Amount": "Disable Amount",
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index 7d7182aa..a0be612e 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -12,32 +12,66 @@ const _LOCAL_STORAGE_KEY = "SHOPPING_LIST_CLIENT_SETTINGS"
  * */
 export const useShoppingListStore = defineStore(_STORE_ID, {
     state: () => ({
+        // shopping data
         entries: {},
-
-        category_food_entries: {},
         supermarket_categories: [],
+        supermarkets: [],
 
+        //settings
         show_checked_entries: false, // TODO move to settings
+        show_delayed_entries: false,
+        show_selected_supermarket_only: false,
+        selected_supermarket: null,
+        selected_group: 'food.supermarket_category.name',
 
+        // internal
         currently_updating: false,
         settings: null,
 
-
+        // constants
         GROUP_CATEGORY: 'food.supermarket_category.name',
         GROUP_CREATED_BY: 'created_by.display_name',
         GROUP_RECIPE: 'recipe_mealplan.recipe_name',
         GROUP_MEALPLAN: 'recipe_mealplan.mealplan', //TODO give this some name from the API
-
-        selected_group: 'food.supermarket_category.name',
+        UNDEFINED_CATEGORY: 'shopping_undefined_category'
     }),
     getters: {
-
+        /**
+         * build a multi-level data structure ready for display from shopping list entries
+         * group by selected grouping key
+         * @return {{}}
+         */
         get_entries_by_group: function () {
             let structure = {}
+            let ordered_structure = []
             for (let i in this.entries) {
                 structure = this.updateEntryInStructure(structure, this.entries[i], this.selected_group)
             }
-            return structure
+
+            if (this.selected_group === this.GROUP_CATEGORY && this.selected_supermarket !== null) {
+                if (this.UNDEFINED_CATEGORY in structure) {
+                    ordered_structure.push(structure[this.UNDEFINED_CATEGORY])
+                    Vue.delete(structure, this.UNDEFINED_CATEGORY)
+                }
+
+                for (let c of this.selected_supermarket.category_to_supermarket) {
+                    if (c.category.name in structure) {
+                        ordered_structure.push(structure[c.category.name])
+                        Vue.delete(structure, c.category.name)
+                    }
+                }
+                if (!this.show_selected_supermarket_only) {
+                    for (let i in structure) {
+                        ordered_structure.push(structure[i])
+                    }
+                }
+            } else {
+                for (let i in structure) {
+                    ordered_structure.push(structure[i])
+                }
+            }
+
+            return ordered_structure
         },
 
         client_settings: function () {
@@ -52,8 +86,6 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
             /**
              * Retrieves all shopping list entries from the API and parses them into a structured object category > food > entry
              */
-            this.category_food_entries = {}
-            Vue.set(this.category_food_entries, -1, {'id': -1, 'name': '', foods: {}})
 
             if (!this.currently_updating) {
                 this.currently_updating = true
@@ -72,6 +104,12 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                 }).catch((err) => {
                     StandardToasts.makeStandardToast(this, StandardToasts.FAIL_FETCH, err)
                 })
+
+                apiClient.listSupermarkets().then(r => {
+                    this.supermarkets = r.data
+                }).catch((err) => {
+                    StandardToasts.makeStandardToast(this, StandardToasts.FAIL_FETCH, err)
+                })
             }
         },
         createObject(object) {
@@ -120,15 +158,6 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
         },
 
         // concenience methods
-        getFoodCategory(food) {
-            /**
-             * Get category id from food or return -1 if food has no category
-             */
-            if (food.supermarket_category !== null) {
-                return food.supermarket_category.id
-            }
-            return -1
-        },
         /**
          * function to set entry to its proper place in the data structure to perform grouping
          * @param {{}} structure datastructure
@@ -137,10 +166,10 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
          * @returns updated datastructure including entry
          */
         updateEntryInStructure(structure, entry, group) {
-            let grouping_key = _.get(entry, group, -1)
+            let grouping_key = _.get(entry, group, this.UNDEFINED_CATEGORY)
             // todo handele parent
             if (grouping_key === undefined || grouping_key === null) {
-                grouping_key = -1
+                grouping_key = this.UNDEFINED_CATEGORY
             }
 
             if (!(grouping_key in structure)) {

From 5e5caf201c0b92ab88ae1cb406dbd3bf6fde4b94 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Wed, 27 Dec 2023 22:39:45 +0100
Subject: [PATCH 15/95] shopping device settings

---
 .../ShoppingListView/ShoppingListView.vue     | 93 +++++--------------
 vue/src/components/ShoppingLineItem.vue       |  4 +-
 vue/src/locales/en.json                       |  8 +-
 vue/src/stores/ShoppingListStore.js           | 75 +++++++--------
 vue/src/stores/UserPreferenceStore.js         | 46 ++++++++-
 5 files changed, 108 insertions(+), 118 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 02349f52..43e74a25 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -367,25 +367,25 @@
         <b-popover target="id_filters_button" triggers="click" placement="bottomleft" :title="$t('Filters')">
             <div>
                 <b-form-group v-bind:label="$t('GroupBy')" label-for="popover-input-1" label-cols="6" class="mb-1">
-                    <b-form-select v-model="group_by" :options="group_by_choices" size="sm"></b-form-select>
+                    <b-form-select v-model="user_preference_store.device_settings.shopping_selected_grouping" size="sm">
+                        <b-form-select-option v-for="go in shopping_list_store.grouping_options" :value="go.id" v-bind:key="go.id">{{ $t(go.translatable_label)}}</b-form-select-option>
+                    </b-form-select>
                 </b-form-group>
                 <b-form-group v-bind:label="$t('Supermarket')" label-for="popover-input-2" label-cols="6" class="mb-1">
-                    <generic-multiselect :model="Models.SUPERMARKET" @change="shopping_list_store.selected_supermarket = $event.val" :multiple="false"></generic-multiselect>
-<!--                    <b-form-select v-model="shopping_list_store.selected_supermarket" :options="shopping_list_store.supermarkets" text-field="name"-->
-<!--                                   value-field="id" size="sm"></b-form-select>-->
+                    <generic-multiselect :model="Models.SUPERMARKET" :initial_single_selection="user_preference_store.device_settings.shopping_selected_supermarket"
+                                         @change="user_preference_store.device_settings.shopping_selected_supermarket = $event.val; user_preference_store.updateDeviceSettings()" :multiple="false"></generic-multiselect>
                 </b-form-group>
-                <!-- TODO: shade filters red when they are actually filtering content -->
                 <b-form-group v-bind:label="$t('ShowDelayed')" label-for="popover-input-3" content-cols="1"
                               class="mb-1">
-                    <b-form-checkbox v-model="show_delay"></b-form-checkbox>
+                    <b-form-checkbox v-model="user_preference_store.device_settings.shopping_show_delayed_entries" @change="user_preference_store.updateDeviceSettings()"></b-form-checkbox>
                 </b-form-group>
-                <b-form-group v-bind:label="$t('ShowUncategorizedFood')" label-for="popover-input-4" content-cols="1"
-                              class="mb-1" v-if="!ui.selected_supermarket">
-                    <b-form-checkbox v-model="show_undefined_categories"></b-form-checkbox>
+                <b-form-group v-bind:label="$t('ShowCompleted')" label-for="popover-input-3" content-cols="1"
+                              class="mb-1">
+                    <b-form-checkbox v-model="user_preference_store.device_settings.shopping_show_checked_entries" @change="user_preference_store.updateDeviceSettings()"></b-form-checkbox>
                 </b-form-group>
                 <b-form-group v-bind:label="$t('SupermarketCategoriesOnly')" label-for="popover-input-5"
-                              content-cols="1" class="mb-1" v-if="ui.selected_supermarket">
-                    <b-form-checkbox v-model="supermarket_categories_only"></b-form-checkbox>
+                              content-cols="1" class="mb-1" >
+                    <b-form-checkbox v-model="user_preference_store.device_settings.shopping_show_selected_supermarket_only" @change="user_preference_store.updateDeviceSettings()"></b-form-checkbox>
                 </b-form-group>
             </div>
             <div class="row" style="margin-top: 1vh; min-width: 300px">
@@ -524,6 +524,7 @@ let SETTINGS_COOKIE_NAME = "shopping_settings"
 import {Workbox} from 'workbox-window';
 import BottomNavigationBar from "@/components/BottomNavigationBar.vue";
 import {useShoppingListStore} from "@/stores/ShoppingListStore";
+import {useUserPreferenceStore} from "@/stores/UserPreferenceStore";
 
 export default {
     name: "ShoppingListView",
@@ -596,7 +597,8 @@ export default {
             add_recipe_servings: 1,
             shopping_list_height: '60vh',
 
-            shopping_list_store: useShoppingListStore()
+            shopping_list_store: useShoppingListStore(),
+            user_preference_store: useUserPreferenceStore(),
         }
     },
     computed: {
@@ -676,9 +678,10 @@ export default {
             return groups
         },
         csvData() {
-            return this.items.map((x) => {
-                return {amount: x.amount, unit: x.unit?.name ?? "", food: x.food?.name ?? ""}
-            })
+            // return this.items.map((x) => {
+            //     return {amount: x.amount, unit: x.unit?.name ?? "", food: x.food?.name ?? ""}
+            // })
+            return []
         },
         defaultDelay() {
             return Number(getUserPreference("default_delay")) || 2
@@ -718,54 +721,17 @@ export default {
         supermarket_categories() {
             return this.shopping_categories
         },
-        notsupermarket_categories() {
-            let supercats = this.new_supermarket.value.category_to_supermarket
-                .map((x) => x.category)
-                .flat()
-                .map((x) => x.id)
 
-            return this.shopping_categories
-                .filter((x) => !supercats.includes(x.id))
-                .map((x) => {
-                    return {
-                        id: Math.random(),
-                        category: x,
-                    }
-                })
-        },
     },
     watch: {
-        ui: {
-            handler() {
-                this.$cookies.set(SETTINGS_COOKIE_NAME, {ui: this.ui, settings: {entrymode: this.entrymode}}, "100y")
-                if (this.entrymode) {
-                    this.$nextTick(function () {
-                        this.setFocus()
-                    })
-                }
-            },
-            deep: true,
-        },
-        entrymode: {
-            handler() {
-                this.$cookies.set(SETTINGS_COOKIE_NAME, {ui: this.ui, settings: {entrymode: this.entrymode}}, "100y")
-                if (this.entrymode) {
-                    //document.getElementById('shoppinglist').scrollTop = 0
-                    this.$nextTick(function () {
-                        this.setFocus()
-                    })
-                }
-            }
-        },
+
         new_recipe: {
             handler() {
                 this.add_recipe_servings = this.new_recipe.servings
             },
             deep: true,
         },
-        "settings.filter_to_supermarket": function (newVal, oldVal) {
-            this.supermarket_categories_only = this.settings.filter_to_supermarket
-        },
+
         "settings.shopping_auto_sync": function (newVal, oldVal) {
             clearInterval(this.autosync_id)
             this.autosync_id = undefined
@@ -787,31 +753,18 @@ export default {
             }
 
         },
-        "settings.default_delay": function (newVal, oldVal) {
-            this.delay = Number(newVal)
-        },
-        "ui.selected_supermarket": function (newVal, oldVal) {
-            this.supermarket_categories_only = this.settings.filter_to_supermarket
-        },
+
     },
     mounted() {
-        this.getShoppingList()
+        //this.getShoppingList()
         this.getSupermarkets()
         this.getShoppingCategories()
 
-        this.settings = getUserPreference()
-        this.delay = Number(this.settings.default_delay || 4)
-        this.supermarket_categories_only = this.settings.filter_to_supermarket
         if (this.settings.shopping_auto_sync) {
             window.addEventListener("online", this.updateOnlineStatus)
             window.addEventListener("offline", this.updateOnlineStatus)
         }
-        this.$nextTick(function () {
-            if (this.$cookies.isKey(SETTINGS_COOKIE_NAME)) {
-                this.ui = Object.assign({}, this.ui, this.$cookies.get(SETTINGS_COOKIE_NAME).ui)
-                this.entrymode = this.$cookies.get(SETTINGS_COOKIE_NAME).settings.entrymode
-            }
-        })
+
         this.$i18n.locale = window.CUSTOM_LOCALE
 
         this.shopping_list_store.refreshFromAPI()
diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index ffddc206..4583d7c2 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -1,7 +1,7 @@
 <template>
     <div id="shopping_line_item">
 
-        <b-button-group class="w-100" v-if="(useShoppingListStore().show_checked_entries || !is_checked) && !is_delayed">
+        <b-button-group class="w-100" v-if="(useUserPreferenceStore().device_settings.shopping_show_checked_entries || !is_checked) && (useUserPreferenceStore().device_settings.shopping_show_delayed_entries || !is_delayed)">
             <b-button :class="{'btn-dark': (!is_checked && !is_delayed), 'btn-success': is_checked, 'btn-warning': is_delayed}" block class="btn btn-block text-left" @click="detail_modal_visible = true">
                 <div class="d-flex ">
                     <div class="d-flex flex-column pr-2" v-if="Object.keys(amounts).length> 0">
@@ -95,6 +95,7 @@ import {ApiMixin, resolveDjangoUrl, StandardToasts} from "@/utils/utils"
 import {useMealPlanStore} from "@/stores/MealPlanStore";
 import {useShoppingListStore} from "@/stores/ShoppingListStore";
 import {ApiApiFactory} from "@/utils/openapi/api";
+import {useUserPreferenceStore} from "@/stores/UserPreferenceStore";
 
 
 Vue.use(BootstrapVue)
@@ -224,6 +225,7 @@ export default {
 
     },
     methods: {
+        useUserPreferenceStore,
         useShoppingListStore,
         resolveDjangoUrl,
 
diff --git a/vue/src/locales/en.json b/vue/src/locales/en.json
index ada615ec..2cc0af10 100644
--- a/vue/src/locales/en.json
+++ b/vue/src/locales/en.json
@@ -291,7 +291,8 @@
     "Warning": "Warning",
     "NoCategory": "No category selected.",
     "InheritWarning": "{food} is set to inherit, changes may not persist.",
-    "ShowDelayed": "Show Delayed Items",
+    "ShowDelayed": "Show delayed items",
+    "ShowCompleted": "Show completed items",
     "Completed": "Completed",
     "OfflineAlert": "You are offline, shopping list may not syncronize.",
     "shopping_share": "Share Shopping List",
@@ -448,8 +449,9 @@
     "show_ingredient_overview": "Display a list of all ingredients at the start of the recipe.",
     "Ingredient Overview": "Ingredient Overview",
     "last_viewed": "Last Viewed",
-    "created_on": "Created On",
-    "updatedon": "Updated On",
+    "created_on": "Created on",
+    "created_by": "Created by",
+    "updatedon": "Updated on",
     "Imported_From": "Imported from",
     "advanced_search_settings": "Advanced Search Settings",
     "nothing_planned_today": "You have nothing planned for today!",
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index a0be612e..5d4fa6ba 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -3,9 +3,9 @@ import {StandardToasts} from "@/utils/utils"
 import {defineStore} from "pinia"
 import Vue from "vue"
 import _ from 'lodash';
+import {useUserPreferenceStore} from "@/stores/UserPreferenceStore";
 
 const _STORE_ID = "shopping_list_store"
-const _LOCAL_STORAGE_KEY = "SHOPPING_LIST_CLIENT_SETTINGS"
 /*
  * test store to play around with pinia and see if it can work for my use cases
  * don't trust that all shopping list entries are in store as there is no cache validation logic, its just a shared data holder
@@ -17,22 +17,15 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
         supermarket_categories: [],
         supermarkets: [],
 
-        //settings
-        show_checked_entries: false, // TODO move to settings
-        show_delayed_entries: false,
-        show_selected_supermarket_only: false,
-        selected_supermarket: null,
-        selected_group: 'food.supermarket_category.name',
-
         // internal
         currently_updating: false,
-        settings: null,
 
         // constants
         GROUP_CATEGORY: 'food.supermarket_category.name',
         GROUP_CREATED_BY: 'created_by.display_name',
         GROUP_RECIPE: 'recipe_mealplan.recipe_name',
         GROUP_MEALPLAN: 'recipe_mealplan.mealplan', //TODO give this some name from the API
+
         UNDEFINED_CATEGORY: 'shopping_undefined_category'
     }),
     getters: {
@@ -44,23 +37,24 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
         get_entries_by_group: function () {
             let structure = {}
             let ordered_structure = []
+
             for (let i in this.entries) {
-                structure = this.updateEntryInStructure(structure, this.entries[i], this.selected_group)
+                structure = this.updateEntryInStructure(structure, this.entries[i], useUserPreferenceStore().device_settings.shopping_selected_grouping)
             }
 
-            if (this.selected_group === this.GROUP_CATEGORY && this.selected_supermarket !== null) {
+            if (useUserPreferenceStore().device_settings.shopping_selected_grouping === this.GROUP_CATEGORY && useUserPreferenceStore().device_settings.shopping_selected_supermarket !== null) {
                 if (this.UNDEFINED_CATEGORY in structure) {
                     ordered_structure.push(structure[this.UNDEFINED_CATEGORY])
                     Vue.delete(structure, this.UNDEFINED_CATEGORY)
                 }
 
-                for (let c of this.selected_supermarket.category_to_supermarket) {
+                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])
                         Vue.delete(structure, c.category.name)
                     }
                 }
-                if (!this.show_selected_supermarket_only) {
+                if (!useUserPreferenceStore().device_settings.shopping_show_selected_supermarket_only) {
                     for (let i in structure) {
                         ordered_structure.push(structure[i])
                     }
@@ -74,19 +68,17 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
             return ordered_structure
         },
 
-        client_settings: function () {
-            if (this.settings === null) {
-                this.settings = this.loadClientSettings()
-            }
-            return this.settings
-        },
+        grouping_options: function () {
+            return [{'id': this.GROUP_CATEGORY, 'translatable_label': 'Category'}, {'id': this.GROUP_CREATED_BY, 'translatable_label': 'created_by'}, {'id': this.GROUP_RECIPE, 'translatable_label': 'Recipe'}]
+        }
+
     },
     actions: {
+        // TODO implement shopping list recipes
+        /**
+         * Retrieves all shopping related data (shopping list entries, supermarkets, supermarket categories and shopping list recipes) from API
+         */
         refreshFromAPI() {
-            /**
-             * Retrieves all shopping list entries from the API and parses them into a structured object category > food > entry
-             */
-
             if (!this.currently_updating) {
                 this.currently_updating = true
                 let apiClient = new ApiApiFactory()
@@ -112,6 +104,12 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                 })
             }
         },
+        /**
+         * Create a new shopping list entry
+         * adds new entry to store
+         * @param object entry object to create
+         * @return {Promise<T | void>} promise of creation call to subscribe to
+         */
         createObject(object) {
             let apiClient = new ApiApiFactory()
 
@@ -123,6 +121,12 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                 StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
             })
         },
+        /**
+         * update existing entry object
+         * updates data in store
+         * @param object entry object to update
+         * @return {Promise<T | void>} promise of updating call to subscribe to
+         */
         updateObject(object) {
             let apiClient = new ApiApiFactory()
             return apiClient.updateShoppingListEntry(object.id, object).then((r) => {
@@ -131,6 +135,11 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                 StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
             })
         },
+        /**
+         * delete shopping list entry object from DB and store
+         * @param object entry object to delete
+         * @return {Promise<T | void>} promise of delete call to subscribe to
+         */
         deleteObject(object) {
             let apiClient = new ApiApiFactory()
             return apiClient.destroyShoppingListEntry(object.id).then((r) => {
@@ -139,25 +148,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                 StandardToasts.makeStandardToast(this, StandardToasts.FAIL_DELETE, err)
             })
         },
-        updateClientSettings(settings) {
-            // this.settings = settings
-            // localStorage.setItem(_LOCAL_STORAGE_KEY, JSON.stringify(this.settings))
-        },
-        loadClientSettings() {
-            // let s = localStorage.getItem(_LOCAL_STORAGE_KEY)
-            // if (s === null || s === {}) {
-            //     return {
-            //         displayPeriodUom: "week",
-            //         displayPeriodCount: 3,
-            //         startingDayOfWeek: 1,
-            //         displayWeekNumbers: true,
-            //     }
-            // } else {
-            //     return JSON.parse(s)
-            // }
-        },
-
-        // concenience methods
+        // convenience methods
         /**
          * function to set entry to its proper place in the data structure to perform grouping
          * @param {{}} structure datastructure
diff --git a/vue/src/stores/UserPreferenceStore.js b/vue/src/stores/UserPreferenceStore.js
index dbb3939e..5972a33d 100644
--- a/vue/src/stores/UserPreferenceStore.js
+++ b/vue/src/stores/UserPreferenceStore.js
@@ -2,19 +2,61 @@ import {defineStore} from 'pinia'
 
 
 import {ApiApiFactory} from "@/utils/openapi/api";
+import Vue from "vue";
 
 const _STALE_TIME_IN_MS = 1000 * 30
 const _STORE_ID = 'user_preference_store'
+
+const _LOCAL_STORAGE_KEY = 'TANDOOR_LOCAL_SETTINGS'
+
+
 export const useUserPreferenceStore = defineStore(_STORE_ID, {
     state: () => ({
         data: null,
         updated_at: null,
         currently_updating: false,
+
+        device_settings_initialized: false,
+        device_settings: {
+            // shopping
+            shopping_show_checked_entries: false,
+            shopping_show_delayed_entries: false,
+            shopping_show_selected_supermarket_only: false,
+            shopping_selected_grouping: 'food.supermarket_category.name',
+            shopping_selected_supermarket: null,
+        },
     }),
     getters: {
-
+        get_device_settings: function () {
+            if (!this.device_settings_initialized) {
+                // stupid hack to initialize device settings variable when store loads
+                this.loadDeviceSettings()
+                this.device_settings_initialized = true
+            }
+            return this.device_settings
+        }
     },
     actions: {
+        // Device settings (on device settings stored in local storage)
+        /**
+         * Load device settings from local storage and update state device_settings
+         */
+        loadDeviceSettings() {
+            let s = localStorage.getItem(_LOCAL_STORAGE_KEY)
+            if (!(s === null || s === {})) {
+                let settings = JSON.parse(s)
+                for (s in settings) {
+                    Vue.set(this.device_settings, s, settings[s])
+                }
+            }
+        },
+        /**
+         * persist changes to device settings into local storage
+         */
+        updateDeviceSettings: function () {
+            localStorage.setItem(_LOCAL_STORAGE_KEY, JSON.stringify(this.device_settings))
+        },
+        // User Preferences (database settings stored in user preference model)
         /**
          * gets data from the store either directly or refreshes from API if data is considered stale
          * @returns {UserPreference|*|Promise<axios.AxiosResponse<UserPreference>>}
@@ -69,7 +111,7 @@ export const useUserPreferenceStore = defineStore(_STORE_ID, {
          */
         refreshFromAPI() {
             let apiClient = new ApiApiFactory()
-            if(!this.currently_updating){
+            if (!this.currently_updating) {
                 this.currently_updating = true
                 return apiClient.retrieveUserPreference(localStorage.getItem('USER_ID')).then(r => {
                     this.data = r.data

From 999e3794f5624784245c5a1864ab9a2e6bbbf4db Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Wed, 27 Dec 2023 23:04:01 +0100
Subject: [PATCH 16/95] info row settings

---
 .../ShoppingListView/ShoppingListView.vue     | 19 ++++++++++--
 vue/src/components/ShoppingLineItem.vue       | 31 +++++++------------
 vue/src/locales/en.json                       |  7 +++--
 vue/src/stores/UserPreferenceStore.js         |  3 ++
 4 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 43e74a25..5afe9f31 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -44,7 +44,7 @@
                                           ref="amount_input_simple"></b-form-input>
                             <b-input-group-append>
                                 <b-button variant="success">
-                                    <i class="fas fa-cart-plus" @click="addItem"/>
+                                    <i class="fas fa-cart-plus fa-fw" @click="addItem"/>
                                 </b-button>
                             </b-input-group-append>
                         </b-input-group>
@@ -59,7 +59,7 @@
                                 <span v-if="c.name === shopping_list_store.UNDEFINED_CATEGORY">{{ $t('Undefined') }}</span>
                                 <span v-else>{{ c.name }}</span>
                             </b-button>
-                            <b-button variant="success"><i class="fas fa-check"></i></b-button> <!-- todo implement -->
+                            <b-button variant="success"><i class="fas fa-check fa-fw"></i></b-button> <!-- todo implement -->
                         </b-button-group>
 
                         <span v-for="f in c.foods" v-bind:key="f.id">
@@ -379,7 +379,7 @@
                               class="mb-1">
                     <b-form-checkbox v-model="user_preference_store.device_settings.shopping_show_delayed_entries" @change="user_preference_store.updateDeviceSettings()"></b-form-checkbox>
                 </b-form-group>
-                <b-form-group v-bind:label="$t('ShowCompleted')" label-for="popover-input-3" content-cols="1"
+                <b-form-group v-bind:label="$t('ShowRecentlyCompleted')" label-for="popover-input-3" content-cols="1"
                               class="mb-1">
                     <b-form-checkbox v-model="user_preference_store.device_settings.shopping_show_checked_entries" @change="user_preference_store.updateDeviceSettings()"></b-form-checkbox>
                 </b-form-group>
@@ -387,6 +387,19 @@
                               content-cols="1" class="mb-1" >
                     <b-form-checkbox v-model="user_preference_store.device_settings.shopping_show_selected_supermarket_only" @change="user_preference_store.updateDeviceSettings()"></b-form-checkbox>
                 </b-form-group>
+                <span>{{ $t('Information')}}</span>
+                <b-form-group v-bind:label="$t('Recipe')" label-for="popover-input-5"
+                              content-cols="1" class="mb-1" >
+                    <b-form-checkbox v-model="user_preference_store.device_settings.shopping_item_info_recipe" @change="user_preference_store.updateDeviceSettings()"></b-form-checkbox>
+                </b-form-group>
+                <b-form-group v-bind:label="$t('Meal_Plan')" label-for="popover-input-5"
+                              content-cols="1" class="mb-1" >
+                    <b-form-checkbox v-model="user_preference_store.device_settings.shopping_item_info_mealplan" @change="user_preference_store.updateDeviceSettings()"></b-form-checkbox>
+                </b-form-group>
+                <b-form-group v-bind:label="$t('created_by')" label-for="popover-input-5"
+                              content-cols="1" class="mb-1" >
+                    <b-form-checkbox v-model="user_preference_store.device_settings.shopping_item_info_created_by" @change="user_preference_store.updateDeviceSettings()"></b-form-checkbox>
+                </b-form-group>
             </div>
             <div class="row" style="margin-top: 1vh; min-width: 300px">
                 <div class="col-12" style="text-align: right">
diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index 4583d7c2..3c21da14 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -2,7 +2,11 @@
     <div id="shopping_line_item">
 
         <b-button-group class="w-100" v-if="(useUserPreferenceStore().device_settings.shopping_show_checked_entries || !is_checked) && (useUserPreferenceStore().device_settings.shopping_show_delayed_entries || !is_delayed)">
-            <b-button :class="{'btn-dark': (!is_checked && !is_delayed), 'btn-success': is_checked, 'btn-warning': is_delayed}" block class="btn btn-block text-left" @click="detail_modal_visible = true">
+            <b-button variant="primary" v-if="is_delayed">
+                <i class="fa-fw fas fa-hourglass-half"></i>
+            </b-button>
+
+            <b-button variant="dark" block class="btn btn-block text-left" @click="detail_modal_visible = true">
                 <div class="d-flex ">
                     <div class="d-flex flex-column pr-2" v-if="Object.keys(amounts).length> 0">
                         <span v-for="a in amounts" v-bind:key="a.id">{{ a.amount }} {{ a.unit }}<br/></span>
@@ -12,13 +16,10 @@
                     </div>
                 </div>
 
-
                 <span v-if="info_row"><small class="text-muted">{{ info_row }}</small></span>
-
-
             </b-button>
             <b-button variant="success" @click="useShoppingListStore().setEntriesCheckedState(entries, !is_checked)" :class="{'btn-success': !is_checked, 'btn-warning': is_checked}">
-                <i class="fas" :class="{'fa-check': !is_checked, 'fa-times': is_checked}"></i>
+                <i class="fa-fw fas" :class="{'fa-check': !is_checked , 'fa-cart-plus': is_checked }"></i>
             </b-button>
         </b-button-group>
 
@@ -32,7 +33,7 @@
 
             <template #default>
                 <h5 class="mt-2">{{ $t('Quick actions') }}</h5>
-                {{ $t('Category')}}
+                {{ $t('Category') }}
                 <b-form-select
                     class="form-control mb-2"
                     :options="useShoppingListStore().supermarket_categories"
@@ -43,9 +44,9 @@
                 ></b-form-select>
 
                 <!-- TODO implement -->
-<!--                <b-button variant="success" block @click="detail_modal_visible = false;"> {{ $t("Edit_Food") }}</b-button>  -->
+                <!--                <b-button variant="success" block @click="detail_modal_visible = false;"> {{ $t("Edit_Food") }}</b-button>  -->
 
-                <b-button variant="info" block @click="detail_modal_visible = false;useShoppingListStore().delayEntries(entries)">{{ $t('Shop_later') }}</b-button>
+                <b-button variant="info" block @click="detail_modal_visible = false;useShoppingListStore().delayEntries(entries)">{{ $t('Postpone') }}</b-button>
 
 
                 <h6 class="mt-2">{{ $t('Entries') }}</h6>
@@ -162,14 +163,8 @@ export default {
             return this.food.name
         },
         info_row: function () {
-            // TODO add setting
             let info_row = []
 
-
-            let display_authors = false
-            let display_recipes = true
-            let display_mealplans = true
-
             let authors = []
             let recipes = []
             let meal_pans = []
@@ -205,18 +200,16 @@ export default {
                 }
             }
 
-
-            if (display_authors && authors.length > 0) {
+            if (useUserPreferenceStore().device_settings.shopping_item_info_created_by && authors.length > 0) {
                 info_row.push(authors.join(', '))
             }
-            if (display_recipes && recipes.length > 0) {
+            if (useUserPreferenceStore().device_settings.shopping_item_info_recipe && recipes.length > 0) {
                 info_row.push(recipes.join(', '))
             }
-            if (display_mealplans && meal_pans.length > 0) {
+            if (useUserPreferenceStore().device_settings.shopping_item_info_mealplan && meal_pans.length > 0) {
                 info_row.push(meal_pans.join(', '))
             }
 
-
             return info_row.join(' - ')
         }
     },
diff --git a/vue/src/locales/en.json b/vue/src/locales/en.json
index 2cc0af10..39cb6b64 100644
--- a/vue/src/locales/en.json
+++ b/vue/src/locales/en.json
@@ -67,7 +67,6 @@
     "Step_Type": "Step Type",
     "Make_Header": "Make Header",
     "Make_Ingredient": "Make Ingredient",
-    "Shop_later": "Shop later",
     "Amount": "Amount",
     "Enable_Amount": "Enable Amount",
     "Disable_Amount": "Disable Amount",
@@ -291,8 +290,10 @@
     "Warning": "Warning",
     "NoCategory": "No category selected.",
     "InheritWarning": "{food} is set to inherit, changes may not persist.",
-    "ShowDelayed": "Show delayed items",
-    "ShowCompleted": "Show completed items",
+    "ShowDelayed": "Show postponed items",
+    "PostponedUntil": "Postponed until",
+    "Postpone": "Postponed until",
+    "ShowRecentlyCompleted": "Show recently completed items",
     "Completed": "Completed",
     "OfflineAlert": "You are offline, shopping list may not syncronize.",
     "shopping_share": "Share Shopping List",
diff --git a/vue/src/stores/UserPreferenceStore.js b/vue/src/stores/UserPreferenceStore.js
index 5972a33d..b378eeb3 100644
--- a/vue/src/stores/UserPreferenceStore.js
+++ b/vue/src/stores/UserPreferenceStore.js
@@ -24,6 +24,9 @@ export const useUserPreferenceStore = defineStore(_STORE_ID, {
             shopping_show_selected_supermarket_only: false,
             shopping_selected_grouping: 'food.supermarket_category.name',
             shopping_selected_supermarket: null,
+            shopping_item_info_created_by: false,
+            shopping_item_info_mealplan: true,
+            shopping_item_info_recipe: true,
         },
     }),
     getters: {

From 2c3e0b547b76f069e9337c4cd141554c7bec4dab Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Wed, 27 Dec 2023 23:20:31 +0100
Subject: [PATCH 17/95] stuff and things

---
 .../ShoppingListView/ShoppingListView.vue     | 154 +++---------------
 vue/src/stores/ShoppingListStore.js           |   2 +-
 2 files changed, 20 insertions(+), 136 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 5afe9f31..1e31282d 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -21,7 +21,7 @@
                     </div>
                 </b-button>
                 <i id="id_filters_button" class="fas fa-filter fa-fw mt-1" style="font-size: 16px; cursor: pointer"
-                   :class="filterApplied ? 'text-danger' : 'text-primary'"/>
+                   />
             </div>
         </div>
 
@@ -29,10 +29,9 @@
             <!-- shopping list tab -->
             <b-tab active>
                 <template #title>
-                    <b-spinner v-if="loading" type="border" small class="d-inline-block"></b-spinner>
-                    <i v-if="!loading" class="fas fa-shopping-cart fa-fw d-inline-block d-md-none"></i>
-                    <span
-                        class="d-none d-md-inline-block">{{ $t('Shopping_list') + ` (${items.filter(x => x.checked === false).length})` }}</span>
+                    <b-spinner v-if="shopping_list_store.currently_updating" type="border" small class="d-inline-block"></b-spinner>
+                    <i v-if="!shopping_list_store.currently_updating" class="fas fa-shopping-cart fa-fw d-inline-block d-md-none"></i>
+                    <span class="d-none d-md-inline-block">{{ $t('Shopping_list') + ` (${Object.keys(shopping_list_store.entries).length})` }}</span> <!-- TODO properly count only checked -->
                 </template>
 
                 <b-row class="d-lg-block d-print-none d-none pr-1 pl-1 mb-3 mt-3">
@@ -368,7 +367,7 @@
             <div>
                 <b-form-group v-bind:label="$t('GroupBy')" label-for="popover-input-1" label-cols="6" class="mb-1">
                     <b-form-select v-model="user_preference_store.device_settings.shopping_selected_grouping" size="sm">
-                        <b-form-select-option v-for="go in shopping_list_store.grouping_options" :value="go.id" v-bind:key="go.id">{{ $t(go.translatable_label)}}</b-form-select-option>
+                        <b-form-select-option v-for="go in shopping_list_store.grouping_options" :value="go.id" v-bind:key="go.id">{{ $t(go.translatable_label) }}</b-form-select-option>
                     </b-form-select>
                 </b-form-group>
                 <b-form-group v-bind:label="$t('Supermarket')" label-for="popover-input-2" label-cols="6" class="mb-1">
@@ -384,93 +383,32 @@
                     <b-form-checkbox v-model="user_preference_store.device_settings.shopping_show_checked_entries" @change="user_preference_store.updateDeviceSettings()"></b-form-checkbox>
                 </b-form-group>
                 <b-form-group v-bind:label="$t('SupermarketCategoriesOnly')" label-for="popover-input-5"
-                              content-cols="1" class="mb-1" >
+                              content-cols="1" class="mb-1">
                     <b-form-checkbox v-model="user_preference_store.device_settings.shopping_show_selected_supermarket_only" @change="user_preference_store.updateDeviceSettings()"></b-form-checkbox>
                 </b-form-group>
-                <span>{{ $t('Information')}}</span>
+                <span>{{ $t('Information') }}</span>
                 <b-form-group v-bind:label="$t('Recipe')" label-for="popover-input-5"
-                              content-cols="1" class="mb-1" >
+                              content-cols="1" class="mb-1">
                     <b-form-checkbox v-model="user_preference_store.device_settings.shopping_item_info_recipe" @change="user_preference_store.updateDeviceSettings()"></b-form-checkbox>
                 </b-form-group>
                 <b-form-group v-bind:label="$t('Meal_Plan')" label-for="popover-input-5"
-                              content-cols="1" class="mb-1" >
+                              content-cols="1" class="mb-1">
                     <b-form-checkbox v-model="user_preference_store.device_settings.shopping_item_info_mealplan" @change="user_preference_store.updateDeviceSettings()"></b-form-checkbox>
                 </b-form-group>
                 <b-form-group v-bind:label="$t('created_by')" label-for="popover-input-5"
-                              content-cols="1" class="mb-1" >
+                              content-cols="1" class="mb-1">
                     <b-form-checkbox v-model="user_preference_store.device_settings.shopping_item_info_created_by" @change="user_preference_store.updateDeviceSettings()"></b-form-checkbox>
                 </b-form-group>
             </div>
             <div class="row" style="margin-top: 1vh; min-width: 300px">
                 <div class="col-12" style="text-align: right">
-                    <b-button size="sm" variant="primary" class="mx-1" @click="resetFilters">{{
-                            $t("Reset")
-                        }}
-                    </b-button>
                     <b-button size="sm" variant="secondary" class="mr-3" @click="$root.$emit('bv::hide::popover')">
                         {{ $t("Close") }}
                     </b-button>
                 </div>
             </div>
         </b-popover>
-        <ContextMenu ref="menu">
-            <template #menu="{ contextData }">
-                <ContextMenuItem>
-                    <b-input-group>
-                        <template #prepend>
-                            <span class="dropdown-item p-2 text-decoration-none" style="user-select: none !important"><i
-                                class="fas fa-cubes"></i> {{ $t("MoveCategory") }}</span>
-                        </template>
-                        <b-form-select
-                            class="form-control mt-1 mr-1"
-                            :options="shopping_categories"
-                            text-field="name"
-                            value-field="id"
-                            v-model="shopcat"
-                            @change="
-                                moveEntry($event, contextData)
-                                $refs.menu.close()
-                            "
-                        ></b-form-select>
-                    </b-input-group>
-                </ContextMenuItem>
-                <ContextMenuItem
-                    @click="
-                        $refs.menu.close()
-                        onHand(contextData)
-                    "
-                >
-                    <a class="dropdown-item p-2" href="#"><i class="fas fa-clipboard-check"></i> {{ $t("OnHand") }}</a>
-                </ContextMenuItem>
-                <ContextMenuItem
-                    @click="
-                        $refs.menu.close()
-                        delayThis(contextData)
-                    "
-                >
-                    <a class="dropdown-item p-2" href="#"><i class="fas fa-hourglass"></i>
-                        {{ $t("DelayFor", {hours: delay}) }}</a>
-                </ContextMenuItem>
-                <ContextMenuItem
-                    @click="
-                        $refs.menu.close()
-                        updateChecked({ entries: contextData, checked: true })
-                    "
-                >
-                    <a class="dropdown-item p-2" href="#"><i class="fas fa-check-square"></i> {{ $t("mark_complete") }}</a>
-                </ContextMenuItem>
-                <ContextMenuItem
-                    @click="
-                        $refs.menu.close()
-                        deleteThis(contextData)
-                    "
-                >
-                    <a class="dropdown-item p-2 text-danger" href="#"><i class="fas fa-trash"></i> {{
-                            $t("Delete")
-                        }}</a>
-                </ContextMenuItem>
-            </template>
-        </ContextMenu>
+
         <shopping-modal v-if="new_recipe.id" :recipe="new_recipe" :servings="parseInt(add_recipe_servings)"
                         :modal_id="new_recipe.id" @finish="finishShopping" :list_recipe="new_recipe.list_recipe"/>
 
@@ -517,14 +455,12 @@ import "bootstrap-vue/dist/bootstrap-vue.css"
 import VueCookies from "vue-cookies"
 import draggable from "vuedraggable"
 
-import ContextMenu from "@/components/ContextMenu/ContextMenu"
-import ContextMenuItem from "@/components/ContextMenu/ContextMenuItem"
+
 import ShoppingLineItem from "@/components/ShoppingLineItem"
 import DownloadPDF from "@/components/Buttons/DownloadPDF"
 import DownloadCSV from "@/components/Buttons/DownloadCSV"
 import CopyToClipboard from "@/components/Buttons/CopyToClipboard"
 import GenericMultiselect from "@/components/GenericMultiselect"
-import LookupInput from "@/components/Modals/LookupInput"
 import ShoppingModal from "@/components/Modals/ShoppingModal"
 
 import {ApiMixin, getUserPreference, StandardToasts, makeToast, ResolveUrlMixin} from "@/utils/utils"
@@ -533,7 +469,7 @@ import ShoppingSettingsComponent from "@/components/Settings/ShoppingSettingsCom
 
 Vue.use(BootstrapVue)
 Vue.use(VueCookies)
-let SETTINGS_COOKIE_NAME = "shopping_settings"
+
 import {Workbox} from 'workbox-window';
 import BottomNavigationBar from "@/components/BottomNavigationBar.vue";
 import {useShoppingListStore} from "@/stores/ShoppingListStore";
@@ -543,8 +479,7 @@ export default {
     name: "ShoppingListView",
     mixins: [ApiMixin, ResolveUrlMixin],
     components: {
-        ContextMenu,
-        ContextMenuItem,
+
         ShoppingLineItem,
         GenericMultiselect,
         DownloadPDF,
@@ -561,8 +496,7 @@ export default {
             // this.Models and this.Actions inherited from ApiMixin
             items: [],
             current_tab: 0,
-            group_by: "category",
-            group_by_choices: ["created_by", "category", "recipe"],
+
             supermarkets: [],
             shopping_categories: [],
             show_undefined_categories: true,
@@ -696,9 +630,6 @@ export default {
             // })
             return []
         },
-        defaultDelay() {
-            return Number(getUserPreference("default_delay")) || 2
-        },
         editingSupermarket() {
             return this.supermarkets.filter((el) => {
                 return el.editing
@@ -711,22 +642,6 @@ export default {
                 return []
             }
         },
-        formUnit() {
-            let unit = this.Models.SHOPPING_LIST.create.form.unit
-            unit.value = this.new_item.unit
-            return unit
-        },
-        formFood() {
-            let food = this.Models.SHOPPING_LIST.create.form.food
-            food.value = this.new_item.food
-            return food
-        },
-        itemsDelayed() {
-            return this.items.filter((x) => !x.delay_until || !Date.parse(x?.delay_until) > new Date(Date.now())).length < this.items.length
-        },
-        filterApplied() {
-            return (this.itemsDelayed && !this.show_delay) || !this.show_undefined_categories || (this.supermarket_categories_only && this.ui.selected_supermarket)
-        },
         Recipes() {
             // hiding recipes associated with shopping list items that are complete
             return [...new Map(this.items.filter((x) => x.list_recipe && !x.checked).map((item) => [item["list_recipe"], item])).values()]
@@ -734,7 +649,6 @@ export default {
         supermarket_categories() {
             return this.shopping_categories
         },
-
     },
     watch: {
 
@@ -809,9 +723,11 @@ export default {
         setFocus() {
             this.$refs['amount_input_simple'].focus()
         },
-        // this.genericAPI inherited from ApiMixin
+        /**
+         * get ingredient from input string and create new shopping list entry using it
+         */
         addItem: function () {
-
+            // this.genericAPI inherited from ApiMixin
             if (this.new_item.ingredient !== "" && this.new_item.ingredient !== undefined) {
                 this.genericPostAPI("api_ingredient_from_string", {text: this.new_item.ingredient}).then((result) => {
                     let unit = null
@@ -828,38 +744,6 @@ export default {
                 })
             }
         },
-        resetFilters: function () {
-            this.ui.selected_supermarket = undefined
-            this.supermarket_categories_only = this.settings.filter_to_supermarket
-            this.show_undefined_categories = true
-            this.group_by = "category"
-            this.show_delay = false
-        },
-        delayThis: function (item) {
-            let entries = []
-            let promises = []
-            let delay_date = new Date(Date.now() + this.delay * (60 * 60 * 1000))
-
-            if (Array.isArray(item)) {
-                item = item.map((x) => {
-                    return {...x, delay_until: delay_date}
-                })
-                entries = item.map((x) => x.id)
-            } else {
-                item.delay_until = delay_date
-                entries = [item.id]
-            }
-
-            entries.forEach((entry) => {
-                promises.push(this.saveThis({id: entry, delay_until: delay_date}, false))
-            })
-            Promise.all(promises).then(() => {
-                this.items = this.items.filter((x) => !entries.includes(x.id))
-                this.delay = this.defaultDelay
-            }).catch(err => {
-                StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
-            })
-        },
         deleteRecipe: function (e, recipe) {
             let api = new ApiApiFactory()
             api.destroyShoppingListRecipe(recipe)
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index 5d4fa6ba..13750f90 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -188,7 +188,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
          * @param {{}} entries set of entries
          */
         delayEntries(entries) {
-            let delay = 4 //TODO get delay from settings
+            let delay = 4 //TODO get delay from settings in an offline friendly way
             let delay_date = new Date(Date.now() + delay * (60 * 60 * 1000))
 
             for (let i in entries) {

From 063c64d078ef1896c188ca8dfbd966286b6d8a54 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Thu, 28 Dec 2023 00:19:12 +0100
Subject: [PATCH 18/95] improvements to recipe tab

---
 .../ShoppingListView/ShoppingListView.vue     | 257 +++++-------------
 vue/src/stores/ShoppingListStore.js           |  23 +-
 2 files changed, 82 insertions(+), 198 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 1e31282d..09b5e4e1 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -21,7 +21,7 @@
                     </div>
                 </b-button>
                 <i id="id_filters_button" class="fas fa-filter fa-fw mt-1" style="font-size: 16px; cursor: pointer"
-                   />
+                />
             </div>
         </div>
 
@@ -72,84 +72,33 @@
             <b-tab :title="$t('Recipes')">
                 <template #title>
                     <i class="fas fa-book fa-fw d-block d-md-none"></i>
-                    <span class="d-none d-md-block">{{ $t('Recipes') + ` (${Recipes.length})` }}</span>
+                    <span class="d-none d-md-block">{{ $t('Recipes') + ` (${Object.keys(shopping_list_store.getAssociatedRecipes()).length})` }}</span>
                 </template>
-                <div class="container p-0">
-                    <div class="row">
-                        <div class="col col-md-12 p-0 p-lg-3">
-                            <div role="tablist">
-                                <!-- add to shopping form -->
-                                <div class="container">
-                                    <b-row class="justify-content-md-center align-items-center pl-1 pr-1">
-                                        <b-col cols="10" md="3" class="mt-1">
-                                            <b-form-input
-                                                size="lg"
-                                                min="1"
-                                                type="number"
-                                                :description="$t('Servings')"
-                                                v-model="add_recipe_servings"
-                                                style="font-size: 16px; border-radius: 5px !important; border: 1px solid #e8e8e8 !important"
-                                            ></b-form-input>
-                                        </b-col>
-                                        <b-col cols="2" md="1" class="d-block d-md-none mt-1">
-                                            <b-button variant="link" class="px-0">
-                                                <i class="btn fas fa-cart-plus fa-lg px-0 text-success"
-                                                   @click="addRecipeToShopping"
-                                                   :disabled="!new_recipe.id"/>
-                                            </b-button>
-                                        </b-col>
-                                        <b-col cols="12" md="8" class="mt-1">
-                                            <generic-multiselect
-                                                class="input-group-text m-0 p-0"
-                                                @change="new_recipe = $event.val"
-                                                :label="'name'"
-                                                :model="Models.RECIPE"
-                                                style="flex-grow: 1; flex-shrink: 1; flex-basis: 0"
-                                                v-bind:placeholder="$t('Recipe')"
-                                                :limit="20"
-                                                :multiple="false"
-                                            />
-                                        </b-col>
-                                        <b-col cols="12" md="1" class="d-none d-md-block mt-1">
-                                            <b-button variant="link" class="px-0">
-                                                <i class="btn fas fa-cart-plus fa-lg px-0 text-success"
-                                                   @click="addRecipeToShopping"
-                                                   :disabled="!new_recipe.id"/>
-                                            </b-button>
-                                        </b-col>
-                                    </b-row>
-                                    <table class="table w-100 mt-3 recipe-table">
-                                        <thead>
-                                        <tr>
-                                            <th scope="col">{{ $t("Meal_Plan") }}</th>
-                                            <th scope="col">{{ $t("Recipe") }}</th>
-                                            <th scope="col">{{ $t("Servings") }}</th>
-                                            <th scope="col"></th>
-                                        </tr>
-                                        </thead>
-                                        <tr v-for="r in Recipes" :key="r.list_recipe">
-                                            <td>{{ r.recipe_mealplan.name }}</td>
-                                            <td><a :href="resolveDjangoUrl('view_recipe', r.recipe_mealplan.recipe)">{{
-                                                    r.recipe_mealplan.recipe_name
-                                                }}</a></td>
-                                            <td class="block-inline">
-                                                <b-form-input min="1" type="number" :debounce="300"
-                                                              :value="r.recipe_mealplan.servings"
-                                                              @input="updateServings($event, r.list_recipe)"></b-form-input>
-                                            </td>
-                                            <td>
-                                                <i class="text-primary far fa-eye fa-fw fa-lg"
-                                                   :title="$t('view_recipe')" @click="editRecipeList($event, r)"/>
-                                                <i class="text-danger fas fa-trash fa-fw fa-lg mt-3"
-                                                   :title="$t('Delete')" @click="deleteRecipe($event, r.list_recipe)"/>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
+
+                <b-row class="d-lg-block d-print-none d-none pr-1 pl-1 mb-3 mt-3">
+                    <b-col cols="12">
+                        <generic-multiselect
+                            :model="Models.RECIPE"
+                            :multiple="false"
+                            @change="addRecipeToShopping($event.val)"
+                        ></generic-multiselect>
+                    </b-col>
+                </b-row>
+
+                <b-row v-for="r in shopping_list_store.getAssociatedRecipes()" :key="r.shopping_list_recipe_id" class="pr-1 pl-1">
+                    <b-col cols="12">
+                        <b-button-group class="w-100 mt-1">
+                            <b-button variant="dark" block class="btn btn-block text-left">
+                                <span>{{ r.recipe_name }}</span> <br/>
+                                <span><small class="text-muted">{{ r.recipe_name }}</small></span> <!-- TODO show meal plan date/type -->
+                            </b-button>
+                            <b-form-input min="1" type="number" :debounce="300" v-model="r.servings" @update="updateServings(r.shopping_list_recipe_id, r.servings)"></b-form-input>
+                            <b-button variant="danger" @click="deleteRecipe(r.shopping_list_recipe_id)"><i class="fas fa-trash fa-fw"></i></b-button>
+                        </b-button-group>
+
+
+                    </b-col>
+                </b-row>
             </b-tab>
             <!-- supermarkets tab -->
             <b-tab>
@@ -409,8 +358,7 @@
             </div>
         </b-popover>
 
-        <shopping-modal v-if="new_recipe.id" :recipe="new_recipe" :servings="parseInt(add_recipe_servings)"
-                        :modal_id="new_recipe.id" @finish="finishShopping" :list_recipe="new_recipe.list_recipe"/>
+        <shopping-modal v-if="new_recipe.id" :recipe="new_recipe" :modal_id="new_recipe.id" :servings="new_recipe.servings" :mealplan="undefined" @finish="finishShopping"/>
 
         <bottom-navigation-bar active-view="view_shopping">
             <template #custom_nav_content>
@@ -652,13 +600,6 @@ export default {
     },
     watch: {
 
-        new_recipe: {
-            handler() {
-                this.add_recipe_servings = this.new_recipe.servings
-            },
-            deep: true,
-        },
-
         "settings.shopping_auto_sync": function (newVal, oldVal) {
             clearInterval(this.autosync_id)
             this.autosync_id = undefined
@@ -744,42 +685,18 @@ export default {
                 })
             }
         },
-        deleteRecipe: function (e, recipe) {
+        /**
+         * delete shopping list recipe, associated entries are deleted automatically by database
+         * @param shopping_list_recipe_id id of shopping list recipe to delete
+         */
+        deleteRecipe: function (shopping_list_recipe_id) {
             let api = new ApiApiFactory()
-            api.destroyShoppingListRecipe(recipe)
-                .then((x) => {
-                    this.items = this.items.filter((x) => x.list_recipe !== recipe)
-                    StandardToasts.makeStandardToast(this, StandardToasts.SUCCESS_DELETE)
-                })
-                .catch((err) => {
-                    StandardToasts.makeStandardToast(this, StandardToasts.FAIL_DELETE, err)
-                })
-        },
-        deleteThis: function (item) {
-            let api = new ApiApiFactory()
-            let entries = []
-            let promises = []
-            if (Array.isArray(item)) {
-                entries = item.map((x) => x.id)
-            } else {
-                entries = [item.id]
-            }
-
-            entries.forEach((x) => {
-                promises.push(
-                    api.destroyShoppingListEntry(x).catch((err) => {
-                        StandardToasts.makeStandardToast(this, StandardToasts.FAIL_DELETE, err)
-                    })
-                )
+            //TODO properly integrate into store logic
+            api.destroyShoppingListRecipe(shopping_list_recipe_id).then((x) => {
+                useShoppingListStore().refreshFromAPI()
+            }).catch((err) => {
+                StandardToasts.makeStandardToast(this, StandardToasts.FAIL_DELETE, err)
             })
-
-            Promise.all(promises).then((result) => {
-                this.items = this.items.filter((x) => !entries.includes(x.id))
-                StandardToasts.makeStandardToast(this, StandardToasts.SUCCESS_DELETE)
-            })
-        },
-        foodName: function (value) {
-            return value?.food?.name ?? value?.[0]?.food?.name ?? ""
         },
         getShoppingCategories: function () {
             let api = new ApiApiFactory()
@@ -836,9 +753,7 @@ export default {
                 this.supermarkets = result.data
             })
         },
-        getThis: function (id) {
-            return this.genericAPI(this.Models.SHOPPING_CATEGORY, this.Actions.FETCH, {id: id})
-        },
+
         mergeShoppingList: function (data) {
             this.items.map((x) =>
                 data.map((y) => {
@@ -899,71 +814,11 @@ export default {
                     })
                 })
         },
-        openContextMenu(e, value, section = false) {
-            if (section) {
-                value = Object.values(value).flat()
-            } else {
-                this.shopcat = value?.food?.supermarket_category?.id ?? value?.[0]?.food?.supermarket_category?.id ?? undefined
-            }
 
-            this.$refs.menu.open(e, value)
-        },
-        saveThis: function (thisItem, toast = true) {
-            let api = new ApiApiFactory()
-            if (!thisItem?.id) {
-                // if there is no item id assume it's a new item
-                return api
-                    .createShoppingListEntry(thisItem)
-                    .then((result) => {
-                        if (toast) {
-                            StandardToasts.makeStandardToast(this, StandardToasts.SUCCESS_CREATE)
-                        }
-                    })
-                    .catch((err) => {
-                        StandardToasts.makeStandardToast(this, StandardToasts.FAIL_CREATE, err)
-                    })
-            } else {
-                return api
-                    .partialUpdateShoppingListEntry(thisItem.id, thisItem)
-                    .then((result) => {
-                        if (toast) {
-                            StandardToasts.makeStandardToast(this, StandardToasts.SUCCESS_UPDATE)
-                        }
-                    })
-                    .catch((err) => {
-                        StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
-                    })
-            }
-        },
         sectionID: function (a, b) {
             return (a + b).replace(/\W/g, "")
         },
-        updateChecked: function (update) {
-            // when checking a sub item don't refresh the screen until all entries complete but change class to cross out
-            this.auto_sync_blocked = true
-            let promises = []
-            update.entries.forEach((x) => {
-                const id = x?.id ?? x
-                let completed_at = undefined
-                if (update.checked) {
-                    completed_at = new Date().toISOString()
-                }
-                promises.push(this.saveThis({id: id, checked: update.checked}, false))
 
-                let item = this.items.filter((entry) => entry.id == id)[0]
-                Vue.set(item, "checked", update.checked)
-                Vue.set(item, "completed_at", completed_at)
-            })
-
-            Promise.all(promises)
-                .then(() => {
-                    this.auto_sync_blocked = false
-                })
-                .catch((err) => {
-                    this.auto_sync_blocked = false
-                    StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
-                })
-        },
         updateFood: function (food, field) {
             let api = new ApiApiFactory()
             if (field) {
@@ -983,12 +838,20 @@ export default {
                     StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
                 })
         },
-        updateServings(e, plan) {
-            // maybe this needs debounced?
-            let api = new ApiApiFactory()
-            api.partialUpdateShoppingListRecipe(plan, {id: plan, servings: e}).then(() => {
-                this.getShoppingList()
-            })
+        /**
+         * change number of servings of a shopping list recipe
+         * backend handles scaling of associated entries
+         * @param shopping_list_recipe_id shopping list recipe to update
+         * @param servings number of servings to set shopping list recipe to
+         */
+        updateServings(shopping_list_recipe_id, servings) {
+            if (servings !== 0 && servings !== "") {
+                console.log('NEW SERVINGS', servings)
+                let api = new ApiApiFactory()
+                api.partialUpdateShoppingListRecipe(shopping_list_recipe_id, {id: shopping_list_recipe_id, servings: servings}).then(() => {
+                    useShoppingListStore().refreshFromAPI()
+                })
+            }
         },
         deleteSupermarket(index) {
             this.$bvModal.msgBoxConfirm(this.$t('Are_You_Sure'), {
@@ -1218,9 +1081,6 @@ export default {
                 })
             }
         },
-        categoryName(item) {
-            return item?.category?.name ?? item.name
-        },
         updateOnlineStatus(e) {
             const {type} = e
             this.online = type === "online"
@@ -1229,8 +1089,15 @@ export default {
             window.removeEventListener("online", this.updateOnlineStatus)
             window.removeEventListener("offline", this.updateOnlineStatus)
         },
-        addRecipeToShopping() {
-            this.$bvModal.show(`shopping_${this.new_recipe.id}`)
+        /**
+         * open standard shopping modal to add selected recipe to shopping list
+         * @param recipe recipe object to add to shopping
+         */
+        addRecipeToShopping(recipe) {
+            this.new_recipe = recipe
+            this.$nextTick(() => {
+                this.$bvModal.show(`shopping_${this.new_recipe.id}`)
+            })
         },
         finishShopping() {
             this.add_recipe_servings = 1
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index 13750f90..d5a3f47d 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -67,11 +67,13 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
 
             return ordered_structure
         },
-
+        /**
+         * list of options available for grouping entry display
+         * @return {[{id: *, translatable_label: string},{id: *, translatable_label: string},{id: *, translatable_label: string}]}
+         */
         grouping_options: function () {
             return [{'id': this.GROUP_CATEGORY, 'translatable_label': 'Category'}, {'id': this.GROUP_CREATED_BY, 'translatable_label': 'created_by'}, {'id': this.GROUP_RECIPE, 'translatable_label': 'Recipe'}]
-        }
-
+        },
     },
     actions: {
         // TODO implement shopping list recipes
@@ -148,6 +150,21 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                 StandardToasts.makeStandardToast(this, StandardToasts.FAIL_DELETE, err)
             })
         },
+        /**
+         * returns a distinct list of recipes associated with unchecked shopping list entries
+         */
+        getAssociatedRecipes: function () {
+            let recipes = {}
+
+            for (let i in this.entries) {
+                let e = this.entries[i]
+                if (e.recipe_mealplan !== null) {
+                    Vue.set(recipes, e.recipe_mealplan.recipe, {'shopping_list_recipe_id': e.list_recipe, 'recipe_id': e.recipe_mealplan.recipe, 'recipe_name': e.recipe_mealplan.recipe_name, 'servings': e.recipe_mealplan.servings})
+                }
+            }
+
+            return recipes
+        },
         // convenience methods
         /**
          * function to set entry to its proper place in the data structure to perform grouping

From df03818f4508e49ba2b0b07cb69a22e51fd779d7 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Thu, 28 Dec 2023 14:03:50 +0100
Subject: [PATCH 19/95] fixed button hover effect

---
 cookbook/static/themes/tandoor_dark.min.css | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/cookbook/static/themes/tandoor_dark.min.css b/cookbook/static/themes/tandoor_dark.min.css
index c21d8703..73de7900 100644
--- a/cookbook/static/themes/tandoor_dark.min.css
+++ b/cookbook/static/themes/tandoor_dark.min.css
@@ -2927,12 +2927,6 @@ input[type=button].btn-block, input[type=reset].btn-block, input[type=submit].bt
     color: #fff
 }
 
-.btn-dark:hover {
-    background: transparent;
-    color: #221e1e;
-    border: 1px solid #221e1e
-}
-
 .btn-opacity-primary {
     color: #b98766;
     background-color: #0012a7;

From e37f8b3a51583ff132572b1ed9fa46b349f71274 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Thu, 28 Dec 2023 14:25:48 +0100
Subject: [PATCH 20/95] shoppig list structure statistics

---
 vue/src/stores/ShoppingListStore.js | 46 +++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index d5a3f47d..90760cf9 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -38,10 +38,42 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
             let structure = {}
             let ordered_structure = []
 
+            // build structure
             for (let i in this.entries) {
                 structure = this.updateEntryInStructure(structure, this.entries[i], useUserPreferenceStore().device_settings.shopping_selected_grouping)
             }
 
+            // statistics for UI conditions and display
+            for (let i in structure) {
+                let count_unchecked = 0
+                let count_checked = 0
+                let count_unchecked_food = 0
+                let count_checked_food = 0
+
+                for (let fi in structure[i]['foods']) {
+                    let food_checked = true
+                    for (let ei in structure[i]['foods'][fi]['entries']) {
+                        if (structure[i]['foods'][fi]['entries'][ei].checked) {
+                            count_checked++
+                        } else {
+                            food_checked = false
+                            count_unchecked++
+                        }
+                    }
+                    if (food_checked) {
+                        count_checked_food++
+                    } else {
+                        count_unchecked_food++
+                    }
+                }
+
+                Vue.set(structure[i], 'count_unchecked', count_unchecked)
+                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)
+            }
+
+            // ordering
             if (useUserPreferenceStore().device_settings.shopping_selected_grouping === this.GROUP_CATEGORY && useUserPreferenceStore().device_settings.shopping_selected_supermarket !== null) {
                 if (this.UNDEFINED_CATEGORY in structure) {
                     ordered_structure.push(structure[this.UNDEFINED_CATEGORY])
@@ -72,7 +104,10 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
          * @return {[{id: *, translatable_label: string},{id: *, translatable_label: string},{id: *, translatable_label: string}]}
          */
         grouping_options: function () {
-            return [{'id': this.GROUP_CATEGORY, 'translatable_label': 'Category'}, {'id': this.GROUP_CREATED_BY, 'translatable_label': 'created_by'}, {'id': this.GROUP_RECIPE, 'translatable_label': 'Recipe'}]
+            return [{'id': this.GROUP_CATEGORY, 'translatable_label': 'Category'}, {'id': this.GROUP_CREATED_BY, 'translatable_label': 'created_by'}, {
+                'id': this.GROUP_RECIPE,
+                'translatable_label': 'Recipe'
+            }]
         },
     },
     actions: {
@@ -159,7 +194,12 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
             for (let i in this.entries) {
                 let e = this.entries[i]
                 if (e.recipe_mealplan !== null) {
-                    Vue.set(recipes, e.recipe_mealplan.recipe, {'shopping_list_recipe_id': e.list_recipe, 'recipe_id': e.recipe_mealplan.recipe, 'recipe_name': e.recipe_mealplan.recipe_name, 'servings': e.recipe_mealplan.servings})
+                    Vue.set(recipes, e.recipe_mealplan.recipe, {
+                        'shopping_list_recipe_id': e.list_recipe,
+                        'recipe_id': e.recipe_mealplan.recipe,
+                        'recipe_name': e.recipe_mealplan.recipe_name,
+                        'servings': e.recipe_mealplan.servings
+                    })
                 }
             }
 
@@ -171,7 +211,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
          * @param {{}} structure datastructure
          * @param {*} entry entry to place
          * @param {*} group group to place entry into (must be of ShoppingListStore.GROUP_XXX/dot notation of entry property)
-         * @returns updated datastructure including entry
+         * @returns {{}} datastructure including entry
          */
         updateEntryInStructure(structure, entry, group) {
             let grouping_key = _.get(entry, group, this.UNDEFINED_CATEGORY)

From 57d87c899cbff41432efd8f0f90c7064a3b55af2 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Thu, 28 Dec 2023 14:27:55 +0100
Subject: [PATCH 21/95] total stats

---
 vue/src/stores/ShoppingListStore.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index 90760cf9..c4142546 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -44,6 +44,10 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
             }
 
             // statistics for UI conditions and display
+            let total_unchecked = 0
+            let total_checked = 0
+            let total_unchecked_food = 0
+            let total_checked_food = 0
             for (let i in structure) {
                 let count_unchecked = 0
                 let count_checked = 0
@@ -71,7 +75,16 @@ 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)
+
+                total_unchecked += count_unchecked
+                total_checked += count_checked
+                total_unchecked_food += count_unchecked_food
+                total_checked_food += count_checked_food
             }
+            // Vue.set(structure, 'count_unchecked', total_unchecked)
+            // Vue.set(structure, 'count_checked', total_checked)
+            // Vue.set(structure, 'count_unchecked_food', total_unchecked_food)
+            // Vue.set(structure, 'count_checked_food', total_checked_food)
 
             // ordering
             if (useUserPreferenceStore().device_settings.shopping_selected_grouping === this.GROUP_CATEGORY && useUserPreferenceStore().device_settings.shopping_selected_supermarket !== null) {

From c695f0dacbd204cf948f616facb4518c5f8b8df9 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sat, 30 Dec 2023 07:59:27 +0100
Subject: [PATCH 22/95] update SLR servings UI

---
 cookbook/static/themes/tandoor_dark.min.css   | 42 ----------
 .../ShoppingListView/ShoppingListView.vue     | 82 ++++++++++++++-----
 vue/src/stores/ShoppingListStore.js           |  3 +-
 3 files changed, 62 insertions(+), 65 deletions(-)

diff --git a/cookbook/static/themes/tandoor_dark.min.css b/cookbook/static/themes/tandoor_dark.min.css
index 73de7900..d22f5783 100644
--- a/cookbook/static/themes/tandoor_dark.min.css
+++ b/cookbook/static/themes/tandoor_dark.min.css
@@ -2850,78 +2850,36 @@ input[type=button].btn-block, input[type=reset].btn-block, input[type=submit].bt
     color: #fff
 }
 
-.btn-primary:hover {
-    background: transparent;
-    color: #b98766;
-    border: 1px solid #b98766
-}
-
 .btn-secondary {
     transition: all .5s ease-in-out;
     color: #fff
 }
 
-.btn-secondary:hover {
-    background: transparent;
-    color: #b55e4f;
-    border: 1px solid #b55e4f
-}
-
 .btn-success {
     transition: all .5s ease-in-out;
     color: #fff
 }
 
-.btn-success:hover {
-    background: transparent;
-    color: #82aa8b;
-    border: 1px solid #82aa8b
-}
-
 .btn-info {
     transition: all .5s ease-in-out;
     color: #fff
 }
 
-.btn-info:hover {
-    background: transparent;
-    color: #385f84;
-    border: 1px solid #385f84
-}
-
 .btn-warning {
     transition: all .5s ease-in-out;
     color: #fff
 }
 
-.btn-warning:hover {
-    background: transparent;
-    color: #eaaa21;
-    border: 1px solid #eaaa21
-}
-
 .btn-danger {
     transition: all .5s ease-in-out;
     color: #fff
 }
 
-.btn-danger:hover {
-    background: transparent;
-    color: #a7240e;
-    border: 1px solid #a7240e
-}
-
 .btn-light {
     transition: all .5s ease-in-out;
     color: #fff
 }
 
-.btn-light:hover {
-    background-color: hsla(0, 0%, 18%, .5);
-    color: #cfd5cd;
-    border: 1px solid hsla(0, 0%, 18%, .5)
-}
-
 .btn-dark {
     transition: all .5s ease-in-out;
     color: #fff
diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 09b5e4e1..54aa2126 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -75,6 +75,7 @@
                     <span class="d-none d-md-block">{{ $t('Recipes') + ` (${Object.keys(shopping_list_store.getAssociatedRecipes()).length})` }}</span>
                 </template>
 
+
                 <b-row class="d-lg-block d-print-none d-none pr-1 pl-1 mb-3 mt-3">
                     <b-col cols="12">
                         <generic-multiselect
@@ -85,17 +86,25 @@
                     </b-col>
                 </b-row>
 
+
                 <b-row v-for="r in shopping_list_store.getAssociatedRecipes()" :key="r.shopping_list_recipe_id" class="pr-1 pl-1">
                     <b-col cols="12">
-                        <b-button-group class="w-100 mt-1">
+                        <b-button-group class="w-100 mt-2">
                             <b-button variant="dark" block class="btn btn-block text-left">
                                 <span>{{ r.recipe_name }}</span> <br/>
                                 <span><small class="text-muted">{{ r.recipe_name }}</small></span> <!-- TODO show meal plan date/type -->
                             </b-button>
-                            <b-form-input min="1" type="number" :debounce="300" v-model="r.servings" @update="updateServings(r.shopping_list_recipe_id, r.servings)"></b-form-input>
+                            <!--                            <b-form-input min="1" type="number" :debounce="300" v-model="r.servings" @update="updateServings(r.shopping_list_recipe_id, r.servings)"></b-form-input>-->
                             <b-button variant="danger" @click="deleteRecipe(r.shopping_list_recipe_id)"><i class="fas fa-trash fa-fw"></i></b-button>
                         </b-button-group>
 
+                        <b-button-group class="w-100 mt-1">
+                            <b-button @click="r.servings = updateServings(r, 'half')" :disabled="shopping_list_store.currently_updating"><i class="fas fa-divide"></i> 2</b-button>
+                            <b-button variant="info" @click="r.servings = updateServings(r, 'sub')" :disabled="shopping_list_store.currently_updating"><i class="fas fa-minus"></i></b-button>
+                            <b-button variant="info" @click="r.servings = updateServings(r, 'prompt')">{{ r.servings }}</b-button>
+                            <b-button variant="info" @click="r.servings = updateServings(r, 'add')" :disabled="shopping_list_store.currently_updating"><i class="fas fa-plus"></i></b-button>
+                            <b-button @click="r.servings = updateServings(r, 'multiply')" :disabled="shopping_list_store.currently_updating"><i class="fas fa-times"></i> 2</b-button>
+                        </b-button-group>
 
                     </b-col>
                 </b-row>
@@ -361,17 +370,28 @@
         <shopping-modal v-if="new_recipe.id" :recipe="new_recipe" :modal_id="new_recipe.id" :servings="new_recipe.servings" :mealplan="undefined" @finish="finishShopping"/>
 
         <bottom-navigation-bar active-view="view_shopping">
-            <template #custom_nav_content>
+            <template #custom_nav_content v-if="current_tab <= 1">
                 <div class="d-flex flex-row justify-content-around mb-3">
 
-                    <b-input-group>
-                        <b-form-input v-model="new_item.ingredient" :placeholder="$t('Food')" @keyup.enter="addItem"></b-form-input>
-                        <b-input-group-append>
-                            <b-button @click="addItem" variant="success">
-                                <i class="fas fa-cart-plus "/>
-                            </b-button>
-                        </b-input-group-append>
-                    </b-input-group>
+
+                    <template v-if="current_tab===0">
+                        <b-input-group>
+                            <b-form-input v-model="new_item.ingredient" :placeholder="$t('Food')" @keyup.enter="addItem"></b-form-input>
+                            <b-input-group-append>
+                                <b-button @click="addItem" variant="success">
+                                    <i class="fas fa-cart-plus "/>
+                                </b-button>
+                            </b-input-group-append>
+                        </b-input-group>
+                    </template>
+                    <template v-if="current_tab===1">
+                        <generic-multiselect
+                            :model="Models.RECIPE"
+                            :multiple="false"
+                            @change="addRecipeToShopping($event.val)"
+                        ></generic-multiselect>
+                    </template>
+
 
                 </div>
             </template>
@@ -691,9 +711,8 @@ export default {
          */
         deleteRecipe: function (shopping_list_recipe_id) {
             let api = new ApiApiFactory()
-            //TODO properly integrate into store logic
             api.destroyShoppingListRecipe(shopping_list_recipe_id).then((x) => {
-                useShoppingListStore().refreshFromAPI()
+                useShoppingListStore().refreshFromAPI() //TODO only do partial refresh
             }).catch((err) => {
                 StandardToasts.makeStandardToast(this, StandardToasts.FAIL_DELETE, err)
             })
@@ -841,16 +860,37 @@ export default {
         /**
          * change number of servings of a shopping list recipe
          * backend handles scaling of associated entries
-         * @param shopping_list_recipe_id shopping list recipe to update
-         * @param servings number of servings to set shopping list recipe to
+         * @param recipe recipe to update
+         * @param mode mode to change servings
          */
-        updateServings(shopping_list_recipe_id, servings) {
-            if (servings !== 0 && servings !== "") {
-                console.log('NEW SERVINGS', servings)
+        updateServings(recipe, mode) {
+            if (mode === 'half') {
+                recipe.servings = recipe.servings / 2
+            }
+            if (mode === 'multiply') {
+                recipe.servings = recipe.servings * 2
+            }
+            if (mode === 'add') {
+                recipe.servings++
+            }
+            if (mode === 'sub') {
+                recipe.servings--
+            }
+            if (mode === 'prompt') {
+                let servings = prompt(this.$t('Servings'), recipe.servings);
+                if (servings !== null && servings !== "" && !isNaN(servings) && !isNaN(parseFloat(servings))) {
+                    recipe.servings = parseFloat(servings)
+                } else {
+                    console.log('Invalid input in servings prompt', servings)
+                }
+            }
+
+            if (recipe.servings > 0 && recipe.servings !== "") {
                 let api = new ApiApiFactory()
-                api.partialUpdateShoppingListRecipe(shopping_list_recipe_id, {id: shopping_list_recipe_id, servings: servings}).then(() => {
+                api.partialUpdateShoppingListRecipe(recipe.shopping_list_recipe_id, {id: recipe.shopping_list_recipe_id, servings: recipe.servings}).then(() => {
                     useShoppingListStore().refreshFromAPI()
                 })
+                return recipe.servings
             }
         },
         deleteSupermarket(index) {
@@ -1100,10 +1140,8 @@ export default {
             })
         },
         finishShopping() {
-            this.add_recipe_servings = 1
             this.new_recipe = {id: undefined}
-            this.edit_recipe_list = undefined
-            this.getShoppingList()
+            useShoppingListStore().refreshFromAPI() //TODO only do partial fetch
         },
         editRecipeList(e, r) {
             this.new_recipe = {
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index c4142546..e8739742 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -124,7 +124,6 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
         },
     },
     actions: {
-        // TODO implement shopping list recipes
         /**
          * Retrieves all shopping related data (shopping list entries, supermarkets, supermarket categories and shopping list recipes) from API
          */
@@ -133,6 +132,8 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                 this.currently_updating = true
                 let apiClient = new ApiApiFactory()
                 apiClient.listShoppingListEntrys().then((r) => {
+                    this.entries = {}
+
                     r.data.forEach((e) => {
                         Vue.set(this.entries, e.id, e)
                     })

From 492d266fbe846ff6a51ce7228d3d772a7aaff763 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sat, 30 Dec 2023 08:13:13 +0100
Subject: [PATCH 23/95] dont show categories without entries

---
 .../ShoppingListView/ShoppingListView.vue     | 127 +-----------------
 vue/src/components/Modals/ShoppingModal.vue   |   5 +-
 2 files changed, 3 insertions(+), 129 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 54aa2126..b5a62b0e 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -52,7 +52,7 @@
 
                 <!-- shopping list table -->
                 <b-row v-for="c in shopping_list_store.get_entries_by_group" v-bind:key="c.id" class="pr-1 pl-1">
-                    <b-col cols="12">
+                    <b-col cols="12" v-if="c.count_unchecked > 0 || user_preference_store.device_settings.shopping_show_checked_entries && (c.count_unchecked + c.count_ecked) > 0">
                         <b-button-group class="w-100 mt-1">
                             <b-button variant="light" block class="btn btn-block text-left">
                                 <span v-if="c.name === shopping_list_store.UNDEFINED_CATEGORY">{{ $t('Undefined') }}</span>
@@ -75,7 +75,6 @@
                     <span class="d-none d-md-block">{{ $t('Recipes') + ` (${Object.keys(shopping_list_store.getAssociatedRecipes()).length})` }}</span>
                 </template>
 
-
                 <b-row class="d-lg-block d-print-none d-none pr-1 pl-1 mb-3 mt-3">
                     <b-col cols="12">
                         <generic-multiselect
@@ -86,7 +85,6 @@
                     </b-col>
                 </b-row>
 
-
                 <b-row v-for="r in shopping_list_store.getAssociatedRecipes()" :key="r.shopping_list_recipe_id" class="pr-1 pl-1">
                     <b-col cols="12">
                         <b-button-group class="w-100 mt-2">
@@ -517,81 +515,6 @@ export default {
         }
     },
     computed: {
-        Sections() {
-            // Sections to display in list (checked/unchecked -> category -> food group -> entries)
-            // ordering/sorting is definied by the order in which categories are added to the sections array (even trough the dev console does not show it like this)
-            function getKey(item, group_by, x) {
-                switch (group_by) {
-                    case "category":
-                        return item?.food?.supermarket_category?.name ?? x
-                    case "created_by":
-                        return item?.created_by?.display_name ?? x
-                    case "recipe":
-                        return item?.recipe_mealplan?.recipe_name ?? x
-                }
-            }
-
-            let shopping_list = this.items
-
-            // filter out list items that are delayed
-
-            if (!this.show_delay && shopping_list) {
-                shopping_list = shopping_list.filter((x) => !x.delay_until || Date.parse(x?.delay_until) < new Date(Date.now()))
-            }
-
-            // if a supermarket is selected and filtered to only supermarket categories filter out everything else
-            if (this.ui.selected_supermarket && this.supermarket_categories_only) {
-                let shopping_categories = this.supermarkets // category IDs configured on supermarket
-                    .filter((x) => x.id === this.ui.selected_supermarket)
-                    .map((x) => x.category_to_supermarket)
-                    .flat()
-                    .map((x) => x.category.id)
-                shopping_list = shopping_list.filter((x) => shopping_categories.includes(x?.food?.supermarket_category?.id))
-                // if showing undefined is off, filter undefined
-            } else if (!this.show_undefined_categories) {
-                shopping_list = shopping_list.filter((x) => x?.food?.supermarket_category)
-            }
-
-            var groups = {false: {}, true: {}} // force unchecked to always be first
-            // TODO: make nulls_first a user setting
-            // add undefined group to both the checked and non checked
-            groups.false[this.$t("Undefined")] = {}
-            groups.true[this.$t("Undefined")] = {}
-            // category order is defined by order of insertion into groups variable
-            if (this.ui.selected_supermarket) {
-                let super_cats = this.supermarkets
-                    .filter((x) => x.id === this.ui.selected_supermarket)
-                    .map((x) => x.category_to_supermarket)
-                    .flat()
-                    .map((x) => x.category.name)
-                new Set([...super_cats, ...this.shopping_categories.map((x) => x.name)]).forEach((cat) => {
-                    groups["false"][cat] = {}
-                    groups["true"][cat] = {}
-                })
-            } else {
-                this.shopping_categories.forEach((cat) => {
-                    groups.false[cat.name] = {}
-                    groups.true[cat.name] = {}
-                })
-            }
-
-            shopping_list.forEach((item) => {
-                let key = getKey(item, this.group_by, this.$t("Undefined"))
-                // first level of dict is done/not done
-                if (!groups[item.checked]) groups[item.checked] = {}
-
-                // second level of dict is this.group_by selection
-                if (!groups[item.checked][key]) groups[item.checked][key] = {}
-
-                // third level of dict is the food
-                if (groups[item.checked][key][item.food.name]) {
-                    groups[item.checked][key][item.food.name].push(item)
-                } else {
-                    groups[item.checked][key][item.food.name] = [item]
-                }
-            })
-            return groups
-        },
         csvData() {
             // return this.items.map((x) => {
             //     return {amount: x.amount, unit: x.unit?.name ?? "", food: x.food?.name ?? ""}
@@ -610,10 +533,7 @@ export default {
                 return []
             }
         },
-        Recipes() {
-            // hiding recipes associated with shopping list items that are complete
-            return [...new Map(this.items.filter((x) => x.list_recipe && !x.checked).map((item) => [item["list_recipe"], item])).values()]
-        },
+
         supermarket_categories() {
             return this.shopping_categories
         },
@@ -793,26 +713,7 @@ export default {
                 })
             }
         },
-        moveEntry: function (e, item) {
-            if (!e) {
-                makeToast(this.$t("Warning"), this.$t("NoCategory"), "warning")
-            }
 
-            // TODO make decision - should inheritance always be set manually or give user a choice at front-end or make it a setting?
-            let food = this.items.filter((x) => x.food.id == item?.[0]?.food.id ?? item.food.id)[0].food
-            let supermarket_category = this.shopping_categories.filter((x) => x?.id === this.shopcat)?.[0]
-            food.supermarket_category = supermarket_category
-            this.updateFood(food, "supermarket_category").then((result) => {
-                this.items = this.items.map((x) => {
-                    if (x.food.id === food.id) {
-                        return {...x, food: {...x.food, supermarket_category: supermarket_category}}
-                    } else {
-                        return x
-                    }
-                })
-            })
-            this.shopcat = null
-        },
         onHand: function (item) {
             let api = new ApiApiFactory()
             let food = {
@@ -833,30 +734,6 @@ export default {
                     })
                 })
         },
-
-        sectionID: function (a, b) {
-            return (a + b).replace(/\W/g, "")
-        },
-
-        updateFood: function (food, field) {
-            let api = new ApiApiFactory()
-            if (field) {
-                // assume if field is changing it should no longer be inherited
-                food.inherit_fields = food.inherit_fields?.filter((x) => x.field !== field)
-            }
-
-            return api
-                .partialUpdateFood(food.id, food)
-                .then((result) => {
-                    StandardToasts.makeStandardToast(this, StandardToasts.SUCCESS_UPDATE)
-                    if (food?.numchild > 0) {
-                        this.getShoppingList() // if food has children, just get the whole list.  probably could be more efficient
-                    }
-                })
-                .catch((err) => {
-                    StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
-                })
-        },
         /**
          * change number of servings of a shopping list recipe
          * backend handles scaling of associated entries
diff --git a/vue/src/components/Modals/ShoppingModal.vue b/vue/src/components/Modals/ShoppingModal.vue
index 669d3da6..9fe68d0f 100644
--- a/vue/src/components/Modals/ShoppingModal.vue
+++ b/vue/src/components/Modals/ShoppingModal.vue
@@ -187,8 +187,5 @@ export default {
 }
 </script>
 <style>
-.b-form-spinbutton.form-control {
-    background-color: #e9ecef;
-    border: 1px solid #ced4da;
-}
+
 </style>

From 475ce44df98d58ab12fcde3fa524e795b501e337 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sat, 30 Dec 2023 08:52:43 +0100
Subject: [PATCH 24/95] move supermarket editing to store

---
 .../ShoppingListView/ShoppingListView.vue     | 216 +++++++-----------
 1 file changed, 87 insertions(+), 129 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index b5a62b0e..0f99cb22 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -111,7 +111,7 @@
             <b-tab>
                 <template #title>
                     <i class="fas fa-store-alt fa-fw d-block d-md-none"></i>
-                    <span class="d-none d-md-block">{{ $t('Supermarkets') + ` (${supermarkets.length})` }}</span>
+                    <span class="d-none d-md-block">{{ $t('Supermarkets') + ` (${shopping_list_store.supermarkets.length})` }}</span>
                 </template>
                 <div class="container p-0">
                     <div class="row">
@@ -129,7 +129,7 @@
                                                 ></span></h5>
                                             <b-list-group>
                                                 <b-card no-body class="mt-1 list-group-item p-2"
-                                                        v-for="(supermarket, index) in supermarkets" v-hover
+                                                        v-for="(supermarket, index) in shopping_list_store.supermarkets" v-hover
                                                         :key="supermarket.id">
                                                     <b-card-header class="p-2 border-0">
                                                         <b-row>
@@ -188,7 +188,7 @@
                                             <div v-if="editingSupermarket.length === 0">
                                                 <b-list-group>
                                                     <b-card no-body class="mt-1 list-group-item p-2"
-                                                            v-for="(category, index) in supermarket_categories" v-hover
+                                                            v-for="(category, index) in shopping_list_store.supermarket_categories" v-hover
                                                             :key="category.id">
                                                         <b-card-header class="p-2 border-0">
                                                             <b-row>
@@ -319,6 +319,7 @@
             </b-tab>
         </b-tabs>
 
+        <!-- TODO maybe change to a modal ? -->
         <b-popover target="id_filters_button" triggers="click" placement="bottomleft" :title="$t('Filters')">
             <div>
                 <b-form-group v-bind:label="$t('GroupBy')" label-for="popover-input-1" label-cols="6" class="mb-1">
@@ -522,21 +523,17 @@ export default {
             return []
         },
         editingSupermarket() {
-            return this.supermarkets.filter((el) => {
+            return this.shopping_list_store.supermarkets.filter((el) => {
                 return el.editing
             })
         },
         unusedSupermarketCategories() {
             if (this.editingSupermarket.length > 0) {
-                return this.supermarket_categories.filter(a => !this.editing_supermarket_categories.map(b => b.id).includes(a.id))
+                return this.shopping_list_store.supermarket_categories.filter(a => !this.editing_supermarket_categories.map(b => b.id).includes(a.id))
             } else {
                 return []
             }
         },
-
-        supermarket_categories() {
-            return this.shopping_categories
-        },
     },
     watch: {
 
@@ -565,8 +562,6 @@ export default {
     },
     mounted() {
         //this.getShoppingList()
-        this.getSupermarkets()
-        this.getShoppingCategories()
 
         if (this.settings.shopping_auto_sync) {
             window.addEventListener("online", this.updateOnlineStatus)
@@ -637,15 +632,6 @@ export default {
                 StandardToasts.makeStandardToast(this, StandardToasts.FAIL_DELETE, err)
             })
         },
-        getShoppingCategories: function () {
-            let api = new ApiApiFactory()
-            api.listSupermarketCategorys().then((result) => {
-                result.data.forEach((category) => {
-                    category.editing = false
-                })
-                this.shopping_categories = result.data
-            })
-        },
         getShoppingList: function (autosync = false) {
             let params = {}
             params.supermarket = this.ui.selected_supermarket
@@ -683,16 +669,6 @@ export default {
             //         }
             //     })
         },
-        getSupermarkets: function () {
-            let api = new ApiApiFactory()
-            api.listSupermarkets().then((result) => {
-                result.data.forEach((supermarket) => {
-                    supermarket.editing = false
-                })
-                this.supermarkets = result.data
-            })
-        },
-
         mergeShoppingList: function (data) {
             this.items.map((x) =>
                 data.map((y) => {
@@ -770,6 +746,8 @@ export default {
                 return recipe.servings
             }
         },
+
+         // TODO cleanup, review data structure, probably move to its own component --> FOR ALL SUPERMARKET FUNCTIONS
         deleteSupermarket(index) {
             this.$bvModal.msgBoxConfirm(this.$t('Are_You_Sure'), {
                 title: this.$t('Confirm'),
@@ -784,12 +762,9 @@ export default {
             }).then(value => {
                 if (value) {
                     let apiClient = new ApiApiFactory()
-                    apiClient.destroySupermarket(this.supermarkets[index].id)
+                    apiClient.destroySupermarket(this.shopping_list_store.supermarkets[index].id)
                         .then((e) => {
-                            this.getShoppingList()
-                            this.getSupermarkets()
-                            this.getShoppingCategories()
-                            StandardToasts.makeStandardToast(this, StandardToasts.SUCCESS_DELETE)
+                            this.shopping_list_store.refreshFromAPI()
                         })
                         .catch((err) => {
                             StandardToasts.makeStandardToast(this, StandardToasts.FAIL_DELETE, err)
@@ -797,48 +772,50 @@ export default {
                 }
             })
         },
+        /**
+         * add new supermarket to list of supermarkets
+         */
         addSupermarket: function () {
+            // TODO integrate into store
             let api = new ApiApiFactory()
-            api.createSupermarket({name: this.$t('Supermarket') + Math.floor(1000 + Math.random() * 9000)})
-                .then((result) => {
-                    StandardToasts.makeStandardToast(this, StandardToasts.SUCCESS_CREATE)
-                    this.supermarkets.push(result.data)
-                    this.new_supermarket.value = undefined
-                })
-                .catch((err) => {
-                    console.log(err, Object.keys(err))
-                    StandardToasts.makeStandardToast(this, StandardToasts.FAIL_CREATE)
-                })
+            api.createSupermarket({name: this.$t('Supermarket') + Math.floor(1000 + Math.random() * 9000)}).then((r) => {
+                this.shopping_list_store.supermarkets.push(r.data)
+                this.new_supermarket.value = undefined
+            }).catch((err) => {
+                StandardToasts.makeStandardToast(this, StandardToasts.FAIL_CREATE, err)
+            })
         },
+        /**
+         * handle updating a supermarket
+         * @param index
+         */
         editOrSaveSupermarket(index) {
-            let supermarket = this.supermarkets[index]
+            let supermarket = this.shopping_list_store.supermarkets[index]
 
             if (supermarket.editing) {
-                this.$set(this.supermarkets[index], "editing", false)
-                this.$set(this.supermarkets[index], "category_to_supermarket", this.editing_supermarket_categories)
+                this.$set(this.shopping_list_store.supermarkets[index], "editing", false)
+                this.$set(this.shopping_list_store.supermarkets[index], "category_to_supermarket", this.editing_supermarket_categories)
                 this.editing_supermarket_categories = []
 
                 let apiClient = new ApiApiFactory()
 
-                apiClient
-                    .updateSupermarket(this.supermarkets[index].id, this.supermarkets[index])
-                    .then((e) => {
-                        StandardToasts.makeStandardToast(this, StandardToasts.SUCCESS_UPDATE)
-                    })
-                    .catch((err) => {
-                        StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
-                    })
+                apiClient.updateSupermarket(this.shopping_list_store.supermarkets[index].id, this.shopping_list_store.supermarkets[index]).then((r) => {
+                    StandardToasts.makeStandardToast(this, StandardToasts.SUCCESS_UPDATE)
+                    this.shopping_list_store.refreshFromAPI()
+                }).catch((err) => {
+                    StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
+                })
             } else {
-                this.supermarkets.forEach((market, i) => {
+                this.shopping_list_store.supermarkets.forEach((market, i) => {
                     if (i !== index) {
-                        this.$set(this.supermarkets[i], "editing", false)
+                        this.$set(this.shopping_list_store.supermarkets[i], "editing", false)
                     }
                 })
 
-                this.$set(this.supermarkets[index], "editing", true)
+                this.$set(this.shopping_list_store.supermarkets[index], "editing", true)
 
                 this.editing_supermarket_categories = []
-                this.supermarkets[index].category_to_supermarket.forEach((cur, i) => {
+                this.shopping_list_store.supermarkets[index].category_to_supermarket.forEach((cur, i) => {
                     this.editing_supermarket_categories.push({
                         name: cur.category.name,
                         description: cur.category.description,
@@ -851,6 +828,10 @@ export default {
                 })
             }
         },
+        /**
+         * delete a supermarket category
+         * @param index
+         */
         deleteSupermarketCategory(index) {
             this.$bvModal.msgBoxConfirm(this.$t('Warning_Delete_Supermarket_Category'), {
                 title: this.$t('Confirm'),
@@ -865,48 +846,40 @@ export default {
             }).then(value => {
                 if (value) {
                     let apiClient = new ApiApiFactory()
-                    apiClient.destroySupermarketCategory(this.supermarket_categories[index].id)
-                        .then((e) => {
-                            this.getShoppingList()
-                            this.getSupermarkets()
-                            this.getShoppingCategories()
-                            StandardToasts.makeStandardToast(this, StandardToasts.SUCCESS_DELETE)
-                        })
-                        .catch((err) => {
-                            StandardToasts.makeStandardToast(this, StandardToasts.FAIL_DELETE, err)
-                        })
+                    apiClient.destroySupermarketCategory(this.shopping_list_store.supermarket_categories[index].id).then((e) => {
+                        this.shopping_list_store.refreshFromAPI()
+                    }).catch((err) => {
+                        StandardToasts.makeStandardToast(this, StandardToasts.FAIL_DELETE, err)
+                    })
                 }
             })
         },
         addSupermarketCategory() {
             let apiClient = new ApiApiFactory()
 
-            apiClient.createSupermarketCategory({name: this.$t("Shopping_Category") + Math.floor(1000 + Math.random() * 9000)})
-                .then((result) => {
-                    StandardToasts.makeStandardToast(this, StandardToasts.SUCCESS_CREATE)
-                    this.shopping_categories.push(result.data)
-                })
-                .catch((err) => {
-                    StandardToasts.makeStandardToast(this, StandardToasts.FAIL_CREATE, err)
-                })
+            apiClient.createSupermarketCategory({name: this.$t("Shopping_Category") + Math.floor(1000 + Math.random() * 9000)}).then((result) => {
+                this.shopping_list_store.supermarket_categories.push(result.data)
+            }).catch((err) => {
+                StandardToasts.makeStandardToast(this, StandardToasts.FAIL_CREATE, err)
+            })
         },
         editOrSaveSupermarketCategory(index) {
-            let category = this.supermarket_categories[index]
+            let category = this.shopping_list_store.supermarket_categories[index]
 
-            this.supermarkets.forEach((supermarket) => {
+            this.shopping_list_store.supermarkets.forEach((supermarket) => {
                 supermarket.category_to_supermarket.forEach((cat) => {
-                    if (cat.category.id === this.supermarket_categories[index].id) {
-                        cat.category = this.supermarket_categories[index]
+                    if (cat.category.id === this.shopping_list_store.supermarket_categories[index].id) {
+                        cat.category = this.shopping_list_store.supermarket_categories[index]
                     }
                 })
             })
             if (category.editing) {
-                this.$set(this.supermarket_categories[index], "editing", false)
+                this.$set(this.shopping_list_store.supermarket_categories[index], "editing", false)
 
                 let apiClient = new ApiApiFactory()
 
                 apiClient
-                    .updateSupermarketCategory(this.supermarket_categories[index].id, this.supermarket_categories[index])
+                    .updateSupermarketCategory(this.shopping_list_store.supermarket_categories[index].id, this.shopping_list_store.supermarket_categories[index])
                     .then((e) => {
                         StandardToasts.makeStandardToast(this, StandardToasts.SUCCESS_UPDATE)
                     })
@@ -914,13 +887,13 @@ export default {
                         StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
                     })
             } else {
-                this.supermarket_categories.forEach((market, i) => {
+                this.shopping_list_store.supermarket_categories.forEach((market, i) => {
                     if (i !== index) {
-                        this.$set(this.supermarket_categories[i], "editing", false)
+                        this.$set(this.shopping_list_store.supermarket_categories[i], "editing", false)
                     }
                 })
 
-                this.$set(this.supermarket_categories[index], "editing", true)
+                this.$set(this.shopping_list_store.supermarket_categories[index], "editing", true)
             }
         },
         addSupermarketCategoryRelation(category) {
@@ -945,41 +918,35 @@ export default {
             let apiClient = new ApiApiFactory()
 
             if ("removed" in e) {
-                apiClient
-                    .destroySupermarketCategoryRelation(e.removed.element.relation_id)
-                    .then((result) => {
+                apiClient.destroySupermarketCategoryRelation(e.removed.element.relation_id).then((result) => {
 
-                    })
-                    .catch((err) => {
-                        StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE)
-                        this.editing_supermarket_categories.splice(e.removed.oldIndex, 0, e.removed.element);
-                    })
+                }).catch((err) => {
+                    StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
+                    this.editing_supermarket_categories.splice(e.removed.oldIndex, 0, e.removed.element);
+                })
             }
 
             if ("added" in e) {
                 let apiClient = new ApiApiFactory()
 
-                apiClient
-                    .createSupermarketCategoryRelation({
-                        supermarket: this.editingSupermarket[0].id,
-                        category: e.added.element,
-                        order: e.added.newIndex,
-                    })
-                    .then((results) => {
-                        this.editing_supermarket_categories.splice(e.added.newIndex, 1, {
-                            name: results.data.category.name,
-                            description: results.data.category.description,
-                            id: results.data.category.id,
-                            relation_id: results.data.id,
-                            order: results.data.order,
-                            supermarket: results.data.supermarket,
-                            category: results.data.category
-                        });
-                    })
-                    .catch((err) => {
-                        StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE)
-                        this.editing_supermarket_categories.splice(e.added.newIndex, 1);
-                    })
+                apiClient.createSupermarketCategoryRelation({
+                    supermarket: this.editingSupermarket[0].id,
+                    category: e.added.element,
+                    order: e.added.newIndex,
+                }).then((results) => {
+                    this.editing_supermarket_categories.splice(e.added.newIndex, 1, {
+                        name: results.data.category.name,
+                        description: results.data.category.description,
+                        id: results.data.category.id,
+                        relation_id: results.data.id,
+                        order: results.data.order,
+                        supermarket: results.data.supermarket,
+                        category: results.data.category
+                    });
+                }).catch((err) => {
+                    StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE)
+                    this.editing_supermarket_categories.splice(e.added.newIndex, 1);
+                })
             }
 
             if ("moved" in e) {
@@ -1016,23 +983,14 @@ export default {
                 this.$bvModal.show(`shopping_${this.new_recipe.id}`)
             })
         },
+        /**
+         * called after adding a new recipe trough the shopping modal
+         * cleanup and data refresh
+         */
         finishShopping() {
             this.new_recipe = {id: undefined}
             useShoppingListStore().refreshFromAPI() //TODO only do partial fetch
         },
-        editRecipeList(e, r) {
-            this.new_recipe = {
-                id: r.recipe_mealplan.recipe,
-                name: r.recipe_mealplan.recipe_name,
-                servings: r.recipe_mealplan.servings,
-                list_recipe: r.list_recipe
-            }
-            this.$nextTick(function () {
-                this.$bvModal.show(`shopping_${this.new_recipe.id}`)
-            })
-
-            // this.$bvModal.show(`shopping_${this.new_recipe.id}`)
-        }
     },
     directives: {
         hover: {

From c76f5d9482cc59167e21cea7c4e5c7ad0dcea678 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Mon, 1 Jan 2024 12:01:39 +0100
Subject: [PATCH 25/95] starting work on new sync algorithm

---
 .../0206_shoppinglistentry_updated_at.py       | 18 ++++++++++++++++++
 cookbook/models.py                             |  2 ++
 cookbook/serializer.py                         |  6 +++---
 cookbook/views/api.py                          | 11 +++++++++--
 4 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 cookbook/migrations/0206_shoppinglistentry_updated_at.py

diff --git a/cookbook/migrations/0206_shoppinglistentry_updated_at.py b/cookbook/migrations/0206_shoppinglistentry_updated_at.py
new file mode 100644
index 00000000..9354e117
--- /dev/null
+++ b/cookbook/migrations/0206_shoppinglistentry_updated_at.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.7 on 2023-12-30 08:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0205_alter_food_fdc_id_alter_propertytype_fdc_id'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='shoppinglistentry',
+            name='updated_at',
+            field=models.DateTimeField(auto_now=True),
+        ),
+    ]
diff --git a/cookbook/models.py b/cookbook/models.py
index c40bb41f..1d5d3758 100644
--- a/cookbook/models.py
+++ b/cookbook/models.py
@@ -1050,6 +1050,8 @@ class ShoppingListEntry(ExportModelOperationsMixin('shopping_list_entry'), model
     checked = models.BooleanField(default=False)
     created_by = models.ForeignKey(User, on_delete=models.CASCADE)
     created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+
     completed_at = models.DateTimeField(null=True, blank=True)
     delay_until = models.DateTimeField(null=True, blank=True)
 
diff --git a/cookbook/serializer.py b/cookbook/serializer.py
index fd42bd96..78c14c33 100644
--- a/cookbook/serializer.py
+++ b/cookbook/serializer.py
@@ -1056,7 +1056,7 @@ class ShoppingListRecipeSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = ShoppingListRecipe
-        fields = ('id', 'recipe_name', 'name', 'recipe', 'mealplan', 'servings', 'mealplan_note','mealplan_from_date', 'mealplan_type')
+        fields = ('id', 'recipe_name', 'name', 'recipe', 'mealplan', 'servings', 'mealplan_note', 'mealplan_from_date', 'mealplan_type')
         read_only_fields = ('id',)
 
 
@@ -1074,7 +1074,7 @@ class ShoppingListEntrySerializer(WritableNestedModelSerializer):
 
         # autosync values are only needed for frequent 'checked' value updating
         if self.context['request'] and bool(int(self.context['request'].query_params.get('autosync', False))):
-            for f in list(set(fields) - set(['id', 'checked'])):
+            for f in list(set(fields) - set(['id', 'checked', 'updated_at', ])):
                 del fields[f]
         return fields
 
@@ -1118,7 +1118,7 @@ class ShoppingListEntrySerializer(WritableNestedModelSerializer):
         fields = (
             'id', 'list_recipe', 'food', 'unit', 'ingredient', 'ingredient_note', 'amount', 'order', 'checked',
             'recipe_mealplan',
-            'created_by', 'created_at', 'completed_at', 'delay_until'
+            'created_by', 'created_at', 'updated_at', 'completed_at', 'delay_until'
         )
         read_only_fields = ('id', 'created_by', 'created_at',)
 
diff --git a/cookbook/views/api.py b/cookbook/views/api.py
index 55261fff..0222fff8 100644
--- a/cookbook/views/api.py
+++ b/cookbook/views/api.py
@@ -1163,6 +1163,11 @@ class ShoppingListEntryViewSet(viewsets.ModelViewSet):
         if 'checked' in self.request.query_params or 'recent' in self.request.query_params:
             return shopping_helper(self.queryset, self.request)
 
+        last_autosync = self.request.query_params.get('last_autosync', None)
+        if last_autosync:
+            last_autosync = datetime.datetime.now() # TODO implement
+            self.queryset = self.queryset.filter(updated_at__gte=last_autosync)
+
         # TODO once old shopping list is removed this needs updated to sharing users in preferences
         return self.queryset
 
@@ -1174,11 +1179,13 @@ class ShoppingListViewSet(viewsets.ModelViewSet):
     permission_classes = [(CustomIsOwner | CustomIsShared) & CustomTokenHasReadWriteScope]
 
     def get_queryset(self):
-        return self.queryset.filter(
+        self.queryset = self.queryset.filter(
             Q(created_by=self.request.user)
             | Q(shared=self.request.user)
             | Q(created_by__in=list(self.request.user.get_shopping_share()))
-        ).filter(space=self.request.space).distinct()
+        ).filter(space=self.request.space)
+
+        return self.queryset.distinct()
 
     def get_serializer_class(self):
         try:

From 1fa2186dd02d3c9915d7fb39e26a3ea03e03b174 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Wed, 3 Jan 2024 15:13:24 +0100
Subject: [PATCH 26/95] fixed space theme defaults in model

---
 cookbook/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cookbook/models.py b/cookbook/models.py
index a0a538b7..cf67d13d 100644
--- a/cookbook/models.py
+++ b/cookbook/models.py
@@ -283,11 +283,11 @@ class Space(ExportModelOperationsMixin('space'), models.Model):
     name = models.CharField(max_length=128, default='Default')
 
     image = models.ForeignKey("UserFile", on_delete=models.SET_NULL, null=True, blank=True, related_name='space_image')
-    space_theme = models.CharField(choices=THEMES, max_length=128, default=TANDOOR)
+    space_theme = models.CharField(choices=THEMES, max_length=128, default=BLANK)
     custom_space_theme = models.ForeignKey("UserFile", on_delete=models.SET_NULL, null=True, blank=True, related_name='space_theme')
     nav_logo = models.ForeignKey("UserFile", on_delete=models.SET_NULL, null=True, blank=True, related_name='space_nav_logo')
     nav_bg_color = models.CharField(max_length=8, default='', blank=True, )
-    nav_text_color = models.CharField(max_length=16, choices=NAV_TEXT_COLORS, default=DARK)
+    nav_text_color = models.CharField(max_length=16, choices=NAV_TEXT_COLORS, default=BLANK)
 
     created_by = models.ForeignKey(User, on_delete=models.PROTECT, null=True)
     created_at = models.DateTimeField(auto_now_add=True)

From 964afd5f73264c0b182dffb9b582684c47602b7d Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Wed, 3 Jan 2024 15:13:31 +0100
Subject: [PATCH 27/95] fixed migration tree

---
 ...try_updated_at.py => 0207_shoppinglistentry_updated_at.py} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename cookbook/migrations/{0206_shoppinglistentry_updated_at.py => 0207_shoppinglistentry_updated_at.py} (69%)

diff --git a/cookbook/migrations/0206_shoppinglistentry_updated_at.py b/cookbook/migrations/0207_shoppinglistentry_updated_at.py
similarity index 69%
rename from cookbook/migrations/0206_shoppinglistentry_updated_at.py
rename to cookbook/migrations/0207_shoppinglistentry_updated_at.py
index 9354e117..72e609fa 100644
--- a/cookbook/migrations/0206_shoppinglistentry_updated_at.py
+++ b/cookbook/migrations/0207_shoppinglistentry_updated_at.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.7 on 2023-12-30 08:00
+# Generated by Django 4.2.7 on 2024-01-03 14:12
 
 from django.db import migrations, models
 
@@ -6,7 +6,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('cookbook', '0205_alter_food_fdc_id_alter_propertytype_fdc_id'),
+        ('cookbook', '0206_rename_sticky_navbar_userpreference_nav_sticky_and_more'),
     ]
 
     operations = [

From 3cab0ab52e51cb3a65acbba89fe3c300ce2c1087 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Thu, 4 Jan 2024 20:22:31 +0100
Subject: [PATCH 28/95] basic auto sync working

---
 cookbook/views/api.py                         |  12 +-
 .../ShoppingListView/ShoppingListView.vue     | 160 +++++++++++-------
 vue/src/stores/ShoppingListStore.js           |  44 ++++-
 3 files changed, 147 insertions(+), 69 deletions(-)

diff --git a/cookbook/views/api.py b/cookbook/views/api.py
index 8a6b19d8..ae673494 100644
--- a/cookbook/views/api.py
+++ b/cookbook/views/api.py
@@ -30,6 +30,7 @@ from django.http import FileResponse, HttpResponse, JsonResponse
 from django.shortcuts import get_object_or_404, redirect
 from django.urls import reverse
 from django.utils import timezone
+from django.utils.timezone import make_aware
 from django.utils.translation import gettext as _
 from django_scopes import scopes_disabled
 from icalendar import Calendar, Event
@@ -1163,10 +1164,13 @@ class ShoppingListEntryViewSet(viewsets.ModelViewSet):
         if 'checked' in self.request.query_params or 'recent' in self.request.query_params:
             return shopping_helper(self.queryset, self.request)
 
-        last_autosync = self.request.query_params.get('last_autosync', None)
-        if last_autosync:
-            last_autosync = datetime.datetime.now() # TODO implement
-            self.queryset = self.queryset.filter(updated_at__gte=last_autosync)
+        try:
+            last_autosync = self.request.query_params.get('last_autosync', None)
+            if last_autosync:
+                last_autosync = make_aware(datetime.datetime.fromtimestamp(int(last_autosync) / 1000))
+                self.queryset = self.queryset.filter(updated_at__gte=last_autosync)
+        except:
+            traceback.print_exc()
 
         # TODO once old shopping list is removed this needs updated to sharing users in preferences
         return self.queryset
diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 0f99cb22..893c06aa 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -29,9 +29,13 @@
             <!-- shopping list tab -->
             <b-tab active>
                 <template #title>
-                    <b-spinner v-if="shopping_list_store.currently_updating" type="border" small class="d-inline-block"></b-spinner>
-                    <i v-if="!shopping_list_store.currently_updating" class="fas fa-shopping-cart fa-fw d-inline-block d-md-none"></i>
-                    <span class="d-none d-md-inline-block">{{ $t('Shopping_list') + ` (${Object.keys(shopping_list_store.entries).length})` }}</span> <!-- TODO properly count only checked -->
+                    <b-spinner v-if="shopping_list_store.currently_updating" type="border" small
+                               class="d-inline-block"></b-spinner>
+                    <i v-if="!shopping_list_store.currently_updating"
+                       class="fas fa-shopping-cart fa-fw d-inline-block d-md-none"></i>
+                    <span class="d-none d-md-inline-block">{{
+                            $t('Shopping_list') + ` (${Object.keys(shopping_list_store.entries).length})`
+                        }}</span> <!-- TODO properly count only checked -->
                 </template>
 
                 <b-row class="d-lg-block d-print-none d-none pr-1 pl-1 mb-3 mt-3">
@@ -52,13 +56,17 @@
 
                 <!-- shopping list table -->
                 <b-row v-for="c in shopping_list_store.get_entries_by_group" v-bind:key="c.id" class="pr-1 pl-1">
-                    <b-col cols="12" v-if="c.count_unchecked > 0 || user_preference_store.device_settings.shopping_show_checked_entries && (c.count_unchecked + c.count_ecked) > 0">
+                    <b-col cols="12"
+                           v-if="c.count_unchecked > 0 || user_preference_store.device_settings.shopping_show_checked_entries && (c.count_unchecked + c.count_ecked) > 0">
                         <b-button-group class="w-100 mt-1">
                             <b-button variant="light" block class="btn btn-block text-left">
-                                <span v-if="c.name === shopping_list_store.UNDEFINED_CATEGORY">{{ $t('Undefined') }}</span>
+                                <span v-if="c.name === shopping_list_store.UNDEFINED_CATEGORY">{{
+                                        $t('Undefined')
+                                    }}</span>
                                 <span v-else>{{ c.name }}</span>
                             </b-button>
-                            <b-button variant="success"><i class="fas fa-check fa-fw"></i></b-button> <!-- todo implement -->
+                            <b-button variant="success"><i class="fas fa-check fa-fw"></i></b-button>
+                            <!-- todo implement -->
                         </b-button-group>
 
                         <span v-for="f in c.foods" v-bind:key="f.id">
@@ -72,7 +80,9 @@
             <b-tab :title="$t('Recipes')">
                 <template #title>
                     <i class="fas fa-book fa-fw d-block d-md-none"></i>
-                    <span class="d-none d-md-block">{{ $t('Recipes') + ` (${Object.keys(shopping_list_store.getAssociatedRecipes()).length})` }}</span>
+                    <span class="d-none d-md-block">{{
+                            $t('Recipes') + ` (${Object.keys(shopping_list_store.getAssociatedRecipes()).length})`
+                        }}</span>
                 </template>
 
                 <b-row class="d-lg-block d-print-none d-none pr-1 pl-1 mb-3 mt-3">
@@ -85,23 +95,37 @@
                     </b-col>
                 </b-row>
 
-                <b-row v-for="r in shopping_list_store.getAssociatedRecipes()" :key="r.shopping_list_recipe_id" class="pr-1 pl-1">
+                <b-row v-for="r in shopping_list_store.getAssociatedRecipes()" :key="r.shopping_list_recipe_id"
+                       class="pr-1 pl-1">
                     <b-col cols="12">
                         <b-button-group class="w-100 mt-2">
                             <b-button variant="dark" block class="btn btn-block text-left">
                                 <span>{{ r.recipe_name }}</span> <br/>
-                                <span><small class="text-muted">{{ r.recipe_name }}</small></span> <!-- TODO show meal plan date/type -->
+                                <span><small class="text-muted">{{ r.recipe_name }}</small></span>
+                                <!-- TODO show meal plan date/type -->
                             </b-button>
                             <!--                            <b-form-input min="1" type="number" :debounce="300" v-model="r.servings" @update="updateServings(r.shopping_list_recipe_id, r.servings)"></b-form-input>-->
-                            <b-button variant="danger" @click="deleteRecipe(r.shopping_list_recipe_id)"><i class="fas fa-trash fa-fw"></i></b-button>
+                            <b-button variant="danger" @click="deleteRecipe(r.shopping_list_recipe_id)"><i
+                                class="fas fa-trash fa-fw"></i></b-button>
                         </b-button-group>
 
                         <b-button-group class="w-100 mt-1">
-                            <b-button @click="r.servings = updateServings(r, 'half')" :disabled="shopping_list_store.currently_updating"><i class="fas fa-divide"></i> 2</b-button>
-                            <b-button variant="info" @click="r.servings = updateServings(r, 'sub')" :disabled="shopping_list_store.currently_updating"><i class="fas fa-minus"></i></b-button>
-                            <b-button variant="info" @click="r.servings = updateServings(r, 'prompt')">{{ r.servings }}</b-button>
-                            <b-button variant="info" @click="r.servings = updateServings(r, 'add')" :disabled="shopping_list_store.currently_updating"><i class="fas fa-plus"></i></b-button>
-                            <b-button @click="r.servings = updateServings(r, 'multiply')" :disabled="shopping_list_store.currently_updating"><i class="fas fa-times"></i> 2</b-button>
+                            <b-button @click="r.servings = updateServings(r, 'half')"
+                                      :disabled="shopping_list_store.currently_updating"><i class="fas fa-divide"></i> 2
+                            </b-button>
+                            <b-button variant="info" @click="r.servings = updateServings(r, 'sub')"
+                                      :disabled="shopping_list_store.currently_updating"><i class="fas fa-minus"></i>
+                            </b-button>
+                            <b-button variant="info" @click="r.servings = updateServings(r, 'prompt')">{{
+                                    r.servings
+                                }}
+                            </b-button>
+                            <b-button variant="info" @click="r.servings = updateServings(r, 'add')"
+                                      :disabled="shopping_list_store.currently_updating"><i class="fas fa-plus"></i>
+                            </b-button>
+                            <b-button @click="r.servings = updateServings(r, 'multiply')"
+                                      :disabled="shopping_list_store.currently_updating"><i class="fas fa-times"></i> 2
+                            </b-button>
                         </b-button-group>
 
                     </b-col>
@@ -111,7 +135,9 @@
             <b-tab>
                 <template #title>
                     <i class="fas fa-store-alt fa-fw d-block d-md-none"></i>
-                    <span class="d-none d-md-block">{{ $t('Supermarkets') + ` (${shopping_list_store.supermarkets.length})` }}</span>
+                    <span class="d-none d-md-block">{{
+                            $t('Supermarkets') + ` (${shopping_list_store.supermarkets.length})`
+                        }}</span>
                 </template>
                 <div class="container p-0">
                     <div class="row">
@@ -129,7 +155,8 @@
                                                 ></span></h5>
                                             <b-list-group>
                                                 <b-card no-body class="mt-1 list-group-item p-2"
-                                                        v-for="(supermarket, index) in shopping_list_store.supermarkets" v-hover
+                                                        v-for="(supermarket, index) in shopping_list_store.supermarkets"
+                                                        v-hover
                                                         :key="supermarket.id">
                                                     <b-card-header class="p-2 border-0">
                                                         <b-row>
@@ -188,7 +215,8 @@
                                             <div v-if="editingSupermarket.length === 0">
                                                 <b-list-group>
                                                     <b-card no-body class="mt-1 list-group-item p-2"
-                                                            v-for="(category, index) in shopping_list_store.supermarket_categories" v-hover
+                                                            v-for="(category, index) in shopping_list_store.supermarket_categories"
+                                                            v-hover
                                                             :key="category.id">
                                                         <b-card-header class="p-2 border-0">
                                                             <b-row>
@@ -313,7 +341,8 @@
                 </template>
                 <div class="row justify-content-center">
                     <div class="col-12 col-md-8">
-                        <shopping-settings-component @updated="settings = $event" :user_id="user_id"></shopping-settings-component>
+                        <shopping-settings-component @updated="settings = $event"
+                                                     :user_id="user_id"></shopping-settings-component>
                     </div>
                 </div>
             </b-tab>
@@ -324,37 +353,48 @@
             <div>
                 <b-form-group v-bind:label="$t('GroupBy')" label-for="popover-input-1" label-cols="6" class="mb-1">
                     <b-form-select v-model="user_preference_store.device_settings.shopping_selected_grouping" size="sm">
-                        <b-form-select-option v-for="go in shopping_list_store.grouping_options" :value="go.id" v-bind:key="go.id">{{ $t(go.translatable_label) }}</b-form-select-option>
+                        <b-form-select-option v-for="go in shopping_list_store.grouping_options" :value="go.id"
+                                              v-bind:key="go.id">{{ $t(go.translatable_label) }}
+                        </b-form-select-option>
                     </b-form-select>
                 </b-form-group>
                 <b-form-group v-bind:label="$t('Supermarket')" label-for="popover-input-2" label-cols="6" class="mb-1">
-                    <generic-multiselect :model="Models.SUPERMARKET" :initial_single_selection="user_preference_store.device_settings.shopping_selected_supermarket"
-                                         @change="user_preference_store.device_settings.shopping_selected_supermarket = $event.val; user_preference_store.updateDeviceSettings()" :multiple="false"></generic-multiselect>
+                    <generic-multiselect :model="Models.SUPERMARKET"
+                                         :initial_single_selection="user_preference_store.device_settings.shopping_selected_supermarket"
+                                         @change="user_preference_store.device_settings.shopping_selected_supermarket = $event.val; user_preference_store.updateDeviceSettings()"
+                                         :multiple="false"></generic-multiselect>
                 </b-form-group>
                 <b-form-group v-bind:label="$t('ShowDelayed')" label-for="popover-input-3" content-cols="1"
                               class="mb-1">
-                    <b-form-checkbox v-model="user_preference_store.device_settings.shopping_show_delayed_entries" @change="user_preference_store.updateDeviceSettings()"></b-form-checkbox>
+                    <b-form-checkbox v-model="user_preference_store.device_settings.shopping_show_delayed_entries"
+                                     @change="user_preference_store.updateDeviceSettings()"></b-form-checkbox>
                 </b-form-group>
                 <b-form-group v-bind:label="$t('ShowRecentlyCompleted')" label-for="popover-input-3" content-cols="1"
                               class="mb-1">
-                    <b-form-checkbox v-model="user_preference_store.device_settings.shopping_show_checked_entries" @change="user_preference_store.updateDeviceSettings()"></b-form-checkbox>
+                    <b-form-checkbox v-model="user_preference_store.device_settings.shopping_show_checked_entries"
+                                     @change="user_preference_store.updateDeviceSettings()"></b-form-checkbox>
                 </b-form-group>
                 <b-form-group v-bind:label="$t('SupermarketCategoriesOnly')" label-for="popover-input-5"
                               content-cols="1" class="mb-1">
-                    <b-form-checkbox v-model="user_preference_store.device_settings.shopping_show_selected_supermarket_only" @change="user_preference_store.updateDeviceSettings()"></b-form-checkbox>
+                    <b-form-checkbox
+                        v-model="user_preference_store.device_settings.shopping_show_selected_supermarket_only"
+                        @change="user_preference_store.updateDeviceSettings()"></b-form-checkbox>
                 </b-form-group>
                 <span>{{ $t('Information') }}</span>
                 <b-form-group v-bind:label="$t('Recipe')" label-for="popover-input-5"
                               content-cols="1" class="mb-1">
-                    <b-form-checkbox v-model="user_preference_store.device_settings.shopping_item_info_recipe" @change="user_preference_store.updateDeviceSettings()"></b-form-checkbox>
+                    <b-form-checkbox v-model="user_preference_store.device_settings.shopping_item_info_recipe"
+                                     @change="user_preference_store.updateDeviceSettings()"></b-form-checkbox>
                 </b-form-group>
                 <b-form-group v-bind:label="$t('Meal_Plan')" label-for="popover-input-5"
                               content-cols="1" class="mb-1">
-                    <b-form-checkbox v-model="user_preference_store.device_settings.shopping_item_info_mealplan" @change="user_preference_store.updateDeviceSettings()"></b-form-checkbox>
+                    <b-form-checkbox v-model="user_preference_store.device_settings.shopping_item_info_mealplan"
+                                     @change="user_preference_store.updateDeviceSettings()"></b-form-checkbox>
                 </b-form-group>
                 <b-form-group v-bind:label="$t('created_by')" label-for="popover-input-5"
                               content-cols="1" class="mb-1">
-                    <b-form-checkbox v-model="user_preference_store.device_settings.shopping_item_info_created_by" @change="user_preference_store.updateDeviceSettings()"></b-form-checkbox>
+                    <b-form-checkbox v-model="user_preference_store.device_settings.shopping_item_info_created_by"
+                                     @change="user_preference_store.updateDeviceSettings()"></b-form-checkbox>
                 </b-form-group>
             </div>
             <div class="row" style="margin-top: 1vh; min-width: 300px">
@@ -366,7 +406,8 @@
             </div>
         </b-popover>
 
-        <shopping-modal v-if="new_recipe.id" :recipe="new_recipe" :modal_id="new_recipe.id" :servings="new_recipe.servings" :mealplan="undefined" @finish="finishShopping"/>
+        <shopping-modal v-if="new_recipe.id" :recipe="new_recipe" :modal_id="new_recipe.id"
+                        :servings="new_recipe.servings" :mealplan="undefined" @finish="finishShopping"/>
 
         <bottom-navigation-bar active-view="view_shopping">
             <template #custom_nav_content v-if="current_tab <= 1">
@@ -375,7 +416,8 @@
 
                     <template v-if="current_tab===0">
                         <b-input-group>
-                            <b-form-input v-model="new_item.ingredient" :placeholder="$t('Food')" @keyup.enter="addItem"></b-form-input>
+                            <b-form-input v-model="new_item.ingredient" :placeholder="$t('Food')"
+                                          @keyup.enter="addItem"></b-form-input>
                             <b-input-group-append>
                                 <b-button @click="addItem" variant="success">
                                     <i class="fas fa-cart-plus "/>
@@ -535,45 +577,33 @@ export default {
             }
         },
     },
-    watch: {
-
-        "settings.shopping_auto_sync": function (newVal, oldVal) {
-            clearInterval(this.autosync_id)
-            this.autosync_id = undefined
-            if (this.settings.shopping_auto_sync > 0) {
-                if (!newVal) {
-                    window.removeEventListener("online", this.updateOnlineStatus)
-                    window.removeEventListener("offline", this.updateOnlineStatus)
-                    return
-                } else if (oldVal === 0 && newVal > 0) {
-                    window.addEventListener("online", this.updateOnlineStatus)
-                    window.addEventListener("offline", this.updateOnlineStatus)
-                }
-                this.autosync_id = setInterval(() => {
-                    if (this.online && !this.auto_sync_running) {
-                        this.auto_sync_running = true
-                        this.getShoppingList(true)
-                    }
-                }, this.settings.shopping_auto_sync * 1000)
-            }
-
-        },
-
-    },
+    watch: {},
     mounted() {
-        //this.getShoppingList()
-
-        if (this.settings.shopping_auto_sync) {
-            window.addEventListener("online", this.updateOnlineStatus)
-            window.addEventListener("offline", this.updateOnlineStatus)
-        }
+        window.addEventListener("online", this.updateOnlineStatus)
+        window.addEventListener("offline", this.updateOnlineStatus)
 
         this.$i18n.locale = window.CUSTOM_LOCALE
 
         this.shopping_list_store.refreshFromAPI()
+        this.setupAutoSync()
     },
     methods: {
         useShoppingListStore,
+        setupAutoSync: function () {
+            // prevent setting up multiple loops on accident
+            // TODO should this just raise an error?
+            clearInterval(this.autosync_id)
+            this.autosync_id = undefined
+
+            let timeout = Math.max(this.settings.shopping_auto_sync, 1) * 1000 // if disabled (shopping_auto_sync=0) check again after 1 second if enabled
+
+            this.autosync_id = setInterval(() => { //TODO does setInterval automatically loop (because it kind of did)
+                if (this.online && this.settings.shopping_auto_sync > 0) {
+                    this.shopping_list_store.autosync()
+                    this.setupAutoSync()
+                }
+            }, timeout)
+        },
         /**
          * failed requests to sync entry check events are automatically re-queued by the service worker for sync
          * this command allows to manually force replaying those events before re-enabling automatic sync
@@ -589,6 +619,7 @@ export default {
          * get the number of entries left in the sync queue for entry check events
          * @returns {Promise<Number>} promise resolving to the number of entries left
          */
+        //TODO maybe show this somewhere if efficient enough to run often
         getSyncQueueLength: function () {
             const wb = new Workbox('/service-worker.js');
             wb.register();
@@ -740,14 +771,17 @@ export default {
 
             if (recipe.servings > 0 && recipe.servings !== "") {
                 let api = new ApiApiFactory()
-                api.partialUpdateShoppingListRecipe(recipe.shopping_list_recipe_id, {id: recipe.shopping_list_recipe_id, servings: recipe.servings}).then(() => {
+                api.partialUpdateShoppingListRecipe(recipe.shopping_list_recipe_id, {
+                    id: recipe.shopping_list_recipe_id,
+                    servings: recipe.servings
+                }).then(() => {
                     useShoppingListStore().refreshFromAPI()
                 })
                 return recipe.servings
             }
         },
 
-         // TODO cleanup, review data structure, probably move to its own component --> FOR ALL SUPERMARKET FUNCTIONS
+        // TODO cleanup, review data structure, probably move to its own component --> FOR ALL SUPERMARKET FUNCTIONS
         deleteSupermarket(index) {
             this.$bvModal.msgBoxConfirm(this.$t('Are_You_Sure'), {
                 title: this.$t('Confirm'),
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index e8739742..80d8cb73 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -4,6 +4,7 @@ import {defineStore} from "pinia"
 import Vue from "vue"
 import _ from 'lodash';
 import {useUserPreferenceStore} from "@/stores/UserPreferenceStore";
+import moment from "moment/moment";
 
 const _STORE_ID = "shopping_list_store"
 /*
@@ -19,6 +20,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
 
         // internal
         currently_updating: false,
+        last_autosync: null,
 
         // constants
         GROUP_CATEGORY: 'food.supermarket_category.name',
@@ -117,7 +119,10 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
          * @return {[{id: *, translatable_label: string},{id: *, translatable_label: string},{id: *, translatable_label: string}]}
          */
         grouping_options: function () {
-            return [{'id': this.GROUP_CATEGORY, 'translatable_label': 'Category'}, {'id': this.GROUP_CREATED_BY, 'translatable_label': 'created_by'}, {
+            return [{'id': this.GROUP_CATEGORY, 'translatable_label': 'Category'}, {
+                'id': this.GROUP_CREATED_BY,
+                'translatable_label': 'created_by'
+            }, {
                 'id': this.GROUP_RECIPE,
                 'translatable_label': 'Recipe'
             }]
@@ -139,6 +144,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                     })
                     this.currently_updating = false
                 }).catch((err) => {
+                    this.currently_updating = false
                     StandardToasts.makeStandardToast(this, StandardToasts.FAIL_FETCH, err)
                 })
 
@@ -155,6 +161,32 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                 })
             }
         },
+        autosync() {
+            if (!this.currently_updating) {
+                console.log('running autosync')
+                this.currently_updating = true
+
+                let previous_autosync = this.last_autosync
+                this.last_autosync = new Date().getTime();
+
+                let apiClient = new ApiApiFactory()
+                apiClient.listShoppingListEntrys(undefined, undefined, undefined, {
+                    'query': {'last_autosync': previous_autosync}
+                }).then((r) => {
+                    r.data.forEach((e) => {
+                        // dont update stale client data
+                        if (Date.parse(this.entries[e.id].updated_at) <= Date.parse(e.updated_at)) { //TODO validate the django datetime can be parsed in all browsers
+                            console.log('updating entry ', e)
+                            Vue.set(this.entries, e.id, e)
+                        }
+                    })
+                    this.currently_updating = false
+                }).catch((err) => {
+                    console.log('auto sync failed')
+                    this.currently_updating = false
+                })
+            }
+        },
         /**
          * Create a new shopping list entry
          * adds new entry to store
@@ -180,6 +212,10 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
          */
         updateObject(object) {
             let apiClient = new ApiApiFactory()
+            // set the update_at timestamp on the client to prevent auto sync from overriding with older changes
+            // moment().format() yields locale aware datetime without ms 2024-01-04T13:39:08.607238+01:00
+            Vue.set(object, 'update_at', moment().format())
+            console.log('set local update timestamp to ', moment().format())
             return apiClient.updateShoppingListEntry(object.id, object).then((r) => {
                 Vue.set(this.entries, r.data.id, r.data)
             }).catch((err) => {
@@ -238,7 +274,11 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                 Vue.set(structure, grouping_key, {'name': grouping_key, 'foods': {}})
             }
             if (!(entry.food.id in structure[grouping_key]['foods'])) {
-                Vue.set(structure[grouping_key]['foods'], entry.food.id, {'id': entry.food.id, 'name': entry.food.name, 'entries': {}})
+                Vue.set(structure[grouping_key]['foods'], entry.food.id, {
+                    'id': entry.food.id,
+                    'name': entry.food.name,
+                    'entries': {}
+                })
             }
             Vue.set(structure[grouping_key]['foods'][entry.food.id]['entries'], entry.id, entry)
             return structure

From 44ac3cf51e18d9b7aa251a39b18e50e2739c58db Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Fri, 5 Jan 2024 21:21:34 +0800
Subject: [PATCH 29/95] user pref store with caching

---
 .../ShoppingListView/ShoppingListView.vue     |  34 +++---
 vue/src/stores/ShoppingListStore.js           |   2 +-
 vue/src/stores/UserPreferenceStore.js         | 102 +++++++++++++++---
 3 files changed, 100 insertions(+), 38 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 893c06aa..0c58d393 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -12,11 +12,11 @@
                     <div class="dropdown-menu dropdown-menu-right" aria-labelledby="downloadShoppingLink">
                         <DownloadPDF dom="#shoppinglist" name="shopping.pdf" :label="$t('download_pdf')"
                                      icon="far fa-file-pdf"/>
-                        <DownloadCSV :items="csvData" :delim="settings.csv_delim" name="shopping.csv"
+                        <DownloadCSV :items="csvData" :delim="user_preference_store.user_settings.csv_delim" name="shopping.csv"
                                      :label="$t('download_csv')" icon="fas fa-file-csv"/>
-                        <CopyToClipboard :items="csvData" :settings="settings" :label="$t('copy_to_clipboard')"
+                        <CopyToClipboard :items="csvData" :settings="user_preference_store.user_settings" :label="$t('copy_to_clipboard')"
                                          icon="fas fa-clipboard-list"/>
-                        <CopyToClipboard :items="csvData" :settings="settings" format="table"
+                        <CopyToClipboard :items="csvData" :settings="user_preference_store.user_settings" format="table"
                                          :label="$t('copy_markdown_table')" icon="fab fa-markdown"/>
                     </div>
                 </b-button>
@@ -341,7 +341,7 @@
                 </template>
                 <div class="row justify-content-center">
                     <div class="col-12 col-md-8">
-                        <shopping-settings-component @updated="settings = $event"
+                        <shopping-settings-component @updated="user_preference_store.updateUserSettings()"
                                                      :user_id="user_id"></shopping-settings-component>
                     </div>
                 </div>
@@ -444,11 +444,11 @@
 
                 <DownloadPDF dom="#shoppinglist" name="shopping.pdf" :label="$t('download_pdf')"
                              icon="far fa-file-pdf fa-fw"/>
-                <DownloadCSV :items="csvData" :delim="settings.csv_delim" name="shopping.csv"
+                <DownloadCSV :items="csvData" :delim="user_preference_store.user_settings.csv_delim" name="shopping.csv"
                              :label="$t('download_csv')" icon="fas fa-file-csv fa-fw"/>
-                <CopyToClipboard :items="csvData" :settings="settings" :label="$t('copy_to_clipboard')"
+                <CopyToClipboard :items="csvData" :settings="user_preference_store.user_settings" :label="$t('copy_to_clipboard')"
                                  icon="fas fa-clipboard-list fa-fw"/>
-                <CopyToClipboard :items="csvData" :settings="settings" format="table"
+                <CopyToClipboard :items="csvData" :settings="user_preference_store.user_settings" format="table"
                                  :label="$t('copy_markdown_table')" icon="fab fa-markdown fa-fw"/>
 
 
@@ -518,19 +518,7 @@ export default {
                 entry_mode_simple: true,
                 selected_supermarket: undefined,
             },
-            settings: {
-                shopping_auto_sync: 0,
-                default_delay: 4,
-                mealplan_autoadd_shopping: false,
-                mealplan_autoinclude_related: false,
-                mealplan_autoexclude_onhand: true,
-                filter_to_supermarket: false,
-                shopping_recent_days: 7,
-                csv_delim: ",",
-                csv_prefix: undefined,
-                shopping_add_onhand: true,
-                left_handed: false,
-            },
+
             user_id: parseInt(localStorage.getItem('USER_ID')),
             editing_supermarket_categories: [],
             editing_supermarket: null,
@@ -585,6 +573,8 @@ export default {
         this.$i18n.locale = window.CUSTOM_LOCALE
 
         this.shopping_list_store.refreshFromAPI()
+        useUserPreferenceStore().loadUserSettings()
+        useUserPreferenceStore().loadDeviceSettings()
         this.setupAutoSync()
     },
     methods: {
@@ -595,10 +585,10 @@ export default {
             clearInterval(this.autosync_id)
             this.autosync_id = undefined
 
-            let timeout = Math.max(this.settings.shopping_auto_sync, 1) * 1000 // if disabled (shopping_auto_sync=0) check again after 1 second if enabled
+            let timeout = Math.max(this.user_preference_store.user_settings.shopping_auto_sync, 1) * 1000 // if disabled (shopping_auto_sync=0) check again after 1 second if enabled
 
             this.autosync_id = setInterval(() => { //TODO does setInterval automatically loop (because it kind of did)
-                if (this.online && this.settings.shopping_auto_sync > 0) {
+                if (this.online && this.user_preference_store.user_settings.shopping_auto_sync > 0) {
                     this.shopping_list_store.autosync()
                     this.setupAutoSync()
                 }
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index 80d8cb73..02279b46 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -215,7 +215,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
             // set the update_at timestamp on the client to prevent auto sync from overriding with older changes
             // moment().format() yields locale aware datetime without ms 2024-01-04T13:39:08.607238+01:00
             Vue.set(object, 'update_at', moment().format())
-            console.log('set local update timestamp to ', moment().format())
+
             return apiClient.updateShoppingListEntry(object.id, object).then((r) => {
                 Vue.set(this.entries, r.data.id, r.data)
             }).catch((err) => {
diff --git a/vue/src/stores/UserPreferenceStore.js b/vue/src/stores/UserPreferenceStore.js
index b378eeb3..8328c3d0 100644
--- a/vue/src/stores/UserPreferenceStore.js
+++ b/vue/src/stores/UserPreferenceStore.js
@@ -1,14 +1,15 @@
 import {defineStore} from 'pinia'
 
 
-import {ApiApiFactory} from "@/utils/openapi/api";
+import {ApiApiFactory, UserPreference} from "@/utils/openapi/api";
 import Vue from "vue";
 
 const _STALE_TIME_IN_MS = 1000 * 30
 const _STORE_ID = 'user_preference_store'
 
-const _LOCAL_STORAGE_KEY = 'TANDOOR_LOCAL_SETTINGS'
-
+const _LS_DEVICE_SETTINGS = 'TANDOOR_LOCAL_SETTINGS'
+const _LS_USER_SETTINGS = 'TANDOOR_USER_SETTINGS'
+const _USER_ID = localStorage.getItem('USER_ID')
 
 export const useUserPreferenceStore = defineStore(_STORE_ID, {
     state: () => ({
@@ -16,7 +17,41 @@ export const useUserPreferenceStore = defineStore(_STORE_ID, {
         updated_at: null,
         currently_updating: false,
 
+        user_settings_loaded_at: new Date(0),
+        user_settings: {
+            image: null,
+            theme: "TANDOOR",
+            nav_bg_color: "#ddbf86",
+            nav_text_color: "DARK",
+            nav_show_logo: true,
+            default_unit: "g",
+            default_page: "SEARCH",
+            use_fractions: false,
+            use_kj: false,
+            plan_share: [],
+            nav_sticky: true,
+            ingredient_decimals: 2,
+            comments: true,
+            shopping_auto_sync: 5,
+            mealplan_autoadd_shopping: false,
+            food_inherit_default: [],
+            default_delay: "4.0000",
+            mealplan_autoinclude_related: true,
+            mealplan_autoexclude_onhand: true,
+            shopping_share: [],
+            shopping_recent_days: 7,
+            csv_delim: ",",
+            csv_prefix: "",
+            filter_to_supermarket: false,
+            shopping_add_onhand: false,
+            left_handed: false,
+            show_step_ingredients: true,
+            food_children_exist: false,
+            locally_updated_at: new Date(0),
+        },
+
         device_settings_initialized: false,
+        device_settings_loaded_at: new Date(0),
         device_settings: {
             // shopping
             shopping_show_checked_entries: false,
@@ -29,36 +64,69 @@ export const useUserPreferenceStore = defineStore(_STORE_ID, {
             shopping_item_info_recipe: true,
         },
     }),
-    getters: {
-        get_device_settings: function () {
-            if (!this.device_settings_initialized) {
-                // stupid hack to initialize device settings variable when store loads
-                this.loadDeviceSettings()
-                this.device_settings_initialized = true
-            }
-            return this.device_settings
-        }
-    },
+    getters: {},
     actions: {
         // Device settings (on device settings stored in local storage)
         /**
          * Load device settings from local storage and update state device_settings
          */
         loadDeviceSettings() {
-            let s = localStorage.getItem(_LOCAL_STORAGE_KEY)
+            let s = localStorage.getItem(_LS_DEVICE_SETTINGS)
             if (!(s === null || s === {})) {
                 let settings = JSON.parse(s)
                 for (s in settings) {
                     Vue.set(this.device_settings, s, settings[s])
                 }
             }
+            this.device_settings_initialized = true
         },
         /**
          * persist changes to device settings into local storage
          */
         updateDeviceSettings: function () {
-            localStorage.setItem(_LOCAL_STORAGE_KEY, JSON.stringify(this.device_settings))
+            localStorage.setItem(_LS_DEVICE_SETTINGS, JSON.stringify(this.device_settings))
         },
+        // ---------------- new methods for user settings
+        loadUserSettings: function () {
+            let s = localStorage.getItem(_LS_USER_SETTINGS)
+            if (!(s === null || s === {})) {
+                let settings = JSON.parse(s)
+                for (s in settings) {
+                    Vue.set(this.user_settings, s, settings[s])
+                }
+                console.log(`loaded local user settings age ${((new Date().getTime()) - this.user_settings.locally_updated_at) / 1000} `)
+            }
+            if (((new Date().getTime()) - this.user_settings.locally_updated_at) > _STALE_TIME_IN_MS) {
+                console.log('refreshing user settings from API')
+                let apiClient = new ApiApiFactory()
+                apiClient.retrieveUserPreference(localStorage.getItem('USER_ID')).then(r => {
+                    for (s in r.data) {
+                        if (!(s in this.user_settings) && s !== 'user') {
+                            // dont load new keys if no default exists (to prevent forgetting to add defaults)
+                            console.error(`API returned UserPreference key "${s}" which has no default in UserPreferenceStore.user_settings.`)
+                        } else {
+                            Vue.set(this.user_settings, s, r.data[s])
+                        }
+                    }
+                    Vue.set(this.user_settings, 'locally_updated_at', new Date().getTime())
+                    localStorage.setItem(_LS_USER_SETTINGS, JSON.stringify(this.user_settings))
+                }).catch(err => {
+                    this.currently_updating = false
+                })
+            }
+
+        },
+        updateUserSettings: function () {
+            let apiClient = new ApiApiFactory()
+            apiClient.partialUpdateUserPreference(_USER_ID, this.user_settings).then(r => {
+                this.user_settings = r.data
+                Vue.set(this.user_settings, 'locally_updated_at', new Date().getTime())
+                localStorage.setItem(_LS_USER_SETTINGS, JSON.stringify(this.user_settings))
+            }).catch(err => {
+                this.currently_updating = false
+            })
+        },
+        // ----------------
         // User Preferences (database settings stored in user preference model)
         /**
          * gets data from the store either directly or refreshes from API if data is considered stale
@@ -120,6 +188,10 @@ export const useUserPreferenceStore = defineStore(_STORE_ID, {
                     this.data = r.data
                     this.updated_at = new Date()
                     this.currently_updating = false
+
+                    this.user_settings = r.data
+                    this.user_settings_loaded_at = new Date()
+
                     return this.data
                 }).catch(err => {
                     this.currently_updating = false

From a1ff54bf3fb28e088359c266c78d8562795dcea9 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Tue, 9 Jan 2024 22:26:05 +0800
Subject: [PATCH 30/95] reduced top margin

---
 cookbook/templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cookbook/templates/base.html b/cookbook/templates/base.html
index d84ccbd4..4bade1a5 100644
--- a/cookbook/templates/base.html
+++ b/cookbook/templates/base.html
@@ -404,7 +404,7 @@
     </div>
 {% endif %}
 
-<div class="container-fluid mt-2 mt-md-5 mt-xl-5 mt-lg-5{% if request.user.userpreference.left_handed %} left-handed {% endif %}"
+<div class="container-fluid mt-2 mt-md-3 mt-xl-3 mt-lg-3{% if request.user.userpreference.left_handed %} left-handed {% endif %}"
      id="id_base_container">
     <div class="row">
         <div class="col-xl-2 d-none d-xl-block">

From 69b24db4428aad52cd7cd49b0215af909e63db37 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Tue, 9 Jan 2024 22:34:48 +0800
Subject: [PATCH 31/95] added missing string and improved tabs titels

---
 .../ShoppingListView/ShoppingListView.vue     | 38 +++++++++++--------
 vue/src/locales/en.json                       |  1 +
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 0c58d393..b998ffe2 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -12,9 +12,11 @@
                     <div class="dropdown-menu dropdown-menu-right" aria-labelledby="downloadShoppingLink">
                         <DownloadPDF dom="#shoppinglist" name="shopping.pdf" :label="$t('download_pdf')"
                                      icon="far fa-file-pdf"/>
-                        <DownloadCSV :items="csvData" :delim="user_preference_store.user_settings.csv_delim" name="shopping.csv"
+                        <DownloadCSV :items="csvData" :delim="user_preference_store.user_settings.csv_delim"
+                                     name="shopping.csv"
                                      :label="$t('download_csv')" icon="fas fa-file-csv"/>
-                        <CopyToClipboard :items="csvData" :settings="user_preference_store.user_settings" :label="$t('copy_to_clipboard')"
+                        <CopyToClipboard :items="csvData" :settings="user_preference_store.user_settings"
+                                         :label="$t('copy_to_clipboard')"
                                          icon="fas fa-clipboard-list"/>
                         <CopyToClipboard :items="csvData" :settings="user_preference_store.user_settings" format="table"
                                          :label="$t('copy_markdown_table')" icon="fab fa-markdown"/>
@@ -29,13 +31,14 @@
             <!-- shopping list tab -->
             <b-tab active>
                 <template #title>
-                    <b-spinner v-if="shopping_list_store.currently_updating" type="border" small
-                               class="d-inline-block"></b-spinner>
                     <i v-if="!shopping_list_store.currently_updating"
-                       class="fas fa-shopping-cart fa-fw d-inline-block d-md-none"></i>
-                    <span class="d-none d-md-inline-block">{{
-                            $t('Shopping_list') + ` (${Object.keys(shopping_list_store.entries).length})`
-                        }}</span> <!-- TODO properly count only checked -->
+                       class="fas fa-shopping-cart fa-fw"></i>
+                    <b-spinner v-if="shopping_list_store.currently_updating" type="border" small
+                               style="width: 1.25em!important; height: 1.25em!important;"></b-spinner>
+                    <span class="d-none d-md-inline-block ml-1">
+                        {{ $t('Shopping_list') + ` (${Object.keys(shopping_list_store.entries).length})` }}
+                    </span> <!-- TODO properly count only checked -->
+
                 </template>
 
                 <b-row class="d-lg-block d-print-none d-none pr-1 pl-1 mb-3 mt-3">
@@ -58,7 +61,8 @@
                 <b-row v-for="c in shopping_list_store.get_entries_by_group" v-bind:key="c.id" class="pr-1 pl-1">
                     <b-col cols="12"
                            v-if="c.count_unchecked > 0 || user_preference_store.device_settings.shopping_show_checked_entries && (c.count_unchecked + c.count_ecked) > 0">
-                        <b-button-group class="w-100 mt-1">
+                        <b-button-group class="w-100 mt-1"
+                                        :class="{'flex-row-reverse': useUserPreferenceStore().user_settings.left_handed}">
                             <b-button variant="light" block class="btn btn-block text-left">
                                 <span v-if="c.name === shopping_list_store.UNDEFINED_CATEGORY">{{
                                         $t('Undefined')
@@ -79,8 +83,8 @@
             <!-- recipe tab -->
             <b-tab :title="$t('Recipes')">
                 <template #title>
-                    <i class="fas fa-book fa-fw d-block d-md-none"></i>
-                    <span class="d-none d-md-block">{{
+                    <i class="fas fa-book fa-fw"></i>
+                    <span class="d-none d-md-inline-block ml-1">{{
                             $t('Recipes') + ` (${Object.keys(shopping_list_store.getAssociatedRecipes()).length})`
                         }}</span>
                 </template>
@@ -134,8 +138,8 @@
             <!-- supermarkets tab -->
             <b-tab>
                 <template #title>
-                    <i class="fas fa-store-alt fa-fw d-block d-md-none"></i>
-                    <span class="d-none d-md-block">{{
+                    <i class="fas fa-store-alt fa-fw"></i>
+                    <span class="d-none d-md-inline-block ml-1">{{
                             $t('Supermarkets') + ` (${shopping_list_store.supermarkets.length})`
                         }}</span>
                 </template>
@@ -336,8 +340,8 @@
             <!-- settings tab -->
             <b-tab>
                 <template #title>
-                    <i class="fas fa-user-cog fa-fw d-block d-md-none"></i>
-                    <span class="d-none d-md-block">{{ $t('Settings') }}</span>
+                    <i class="fas fa-user-cog fa-fw"></i>
+                    <span class="d-none d-md-inline-block ml-1">{{ $t('Settings') }}</span>
                 </template>
                 <div class="row justify-content-center">
                     <div class="col-12 col-md-8">
@@ -446,7 +450,8 @@
                              icon="far fa-file-pdf fa-fw"/>
                 <DownloadCSV :items="csvData" :delim="user_preference_store.user_settings.csv_delim" name="shopping.csv"
                              :label="$t('download_csv')" icon="fas fa-file-csv fa-fw"/>
-                <CopyToClipboard :items="csvData" :settings="user_preference_store.user_settings" :label="$t('copy_to_clipboard')"
+                <CopyToClipboard :items="csvData" :settings="user_preference_store.user_settings"
+                                 :label="$t('copy_to_clipboard')"
                                  icon="fas fa-clipboard-list fa-fw"/>
                 <CopyToClipboard :items="csvData" :settings="user_preference_store.user_settings" format="table"
                                  :label="$t('copy_markdown_table')" icon="fab fa-markdown fa-fw"/>
@@ -578,6 +583,7 @@ export default {
         this.setupAutoSync()
     },
     methods: {
+        useUserPreferenceStore,
         useShoppingListStore,
         setupAutoSync: function () {
             // prevent setting up multiple loops on accident
diff --git a/vue/src/locales/en.json b/vue/src/locales/en.json
index e085bd92..46bdeff8 100644
--- a/vue/src/locales/en.json
+++ b/vue/src/locales/en.json
@@ -141,6 +141,7 @@
 	"Edit": "Edit",
 	"Image": "Image",
 	"Delete": "Delete",
+	"Delete_All": "Delete all",
 	"Open": "Open",
 	"Ok": "Ok",
 	"Save": "Save",

From 6d4f09445533965289662892f37c56335145ef20 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Wed, 10 Jan 2024 06:51:34 +0800
Subject: [PATCH 32/95] number scaler component and changing entry amount

---
 .../ShoppingListView/ShoppingListView.vue     | 57 +++-----------
 vue/src/components/NumberScalerComponent.vue  | 74 +++++++++++++++++++
 vue/src/components/ShoppingLineItem.vue       |  7 +-
 vue/src/locales/en.json                       |  1 +
 4 files changed, 92 insertions(+), 47 deletions(-)
 create mode 100644 vue/src/components/NumberScalerComponent.vue

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index b998ffe2..2e39cd82 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -108,29 +108,11 @@
                                 <span><small class="text-muted">{{ r.recipe_name }}</small></span>
                                 <!-- TODO show meal plan date/type -->
                             </b-button>
-                            <!--                            <b-form-input min="1" type="number" :debounce="300" v-model="r.servings" @update="updateServings(r.shopping_list_recipe_id, r.servings)"></b-form-input>-->
                             <b-button variant="danger" @click="deleteRecipe(r.shopping_list_recipe_id)"><i
                                 class="fas fa-trash fa-fw"></i></b-button>
                         </b-button-group>
 
-                        <b-button-group class="w-100 mt-1">
-                            <b-button @click="r.servings = updateServings(r, 'half')"
-                                      :disabled="shopping_list_store.currently_updating"><i class="fas fa-divide"></i> 2
-                            </b-button>
-                            <b-button variant="info" @click="r.servings = updateServings(r, 'sub')"
-                                      :disabled="shopping_list_store.currently_updating"><i class="fas fa-minus"></i>
-                            </b-button>
-                            <b-button variant="info" @click="r.servings = updateServings(r, 'prompt')">{{
-                                    r.servings
-                                }}
-                            </b-button>
-                            <b-button variant="info" @click="r.servings = updateServings(r, 'add')"
-                                      :disabled="shopping_list_store.currently_updating"><i class="fas fa-plus"></i>
-                            </b-button>
-                            <b-button @click="r.servings = updateServings(r, 'multiply')"
-                                      :disabled="shopping_list_store.currently_updating"><i class="fas fa-times"></i> 2
-                            </b-button>
-                        </b-button-group>
+                        <number-scaler-component :number="r.servings" @change="updateServings(r, $event)" :disable="useShoppingListStore().currently_updating"></number-scaler-component>
 
                     </b-col>
                 </b-row>
@@ -488,11 +470,13 @@ import {Workbox} from 'workbox-window';
 import BottomNavigationBar from "@/components/BottomNavigationBar.vue";
 import {useShoppingListStore} from "@/stores/ShoppingListStore";
 import {useUserPreferenceStore} from "@/stores/UserPreferenceStore";
+import NumberScalerComponent from "@/components/NumberScalerComponent.vue";
 
 export default {
     name: "ShoppingListView",
     mixins: [ApiMixin, ResolveUrlMixin],
     components: {
+        NumberScalerComponent,
 
         ShoppingLineItem,
         GenericMultiselect,
@@ -741,39 +725,22 @@ export default {
          * change number of servings of a shopping list recipe
          * backend handles scaling of associated entries
          * @param recipe recipe to update
-         * @param mode mode to change servings
+         * @param servings number of servings to set recipe to
          */
-        updateServings(recipe, mode) {
-            if (mode === 'half') {
-                recipe.servings = recipe.servings / 2
-            }
-            if (mode === 'multiply') {
-                recipe.servings = recipe.servings * 2
-            }
-            if (mode === 'add') {
-                recipe.servings++
-            }
-            if (mode === 'sub') {
-                recipe.servings--
-            }
-            if (mode === 'prompt') {
-                let servings = prompt(this.$t('Servings'), recipe.servings);
-                if (servings !== null && servings !== "" && !isNaN(servings) && !isNaN(parseFloat(servings))) {
-                    recipe.servings = parseFloat(servings)
-                } else {
-                    console.log('Invalid input in servings prompt', servings)
-                }
-            }
-
-            if (recipe.servings > 0 && recipe.servings !== "") {
+        updateServings(recipe, servings) {
+            if (servings > 0 && servings !== "") {
                 let api = new ApiApiFactory()
+                useShoppingListStore().currently_updating = true
                 api.partialUpdateShoppingListRecipe(recipe.shopping_list_recipe_id, {
                     id: recipe.shopping_list_recipe_id,
-                    servings: recipe.servings
+                    servings: servings
                 }).then(() => {
+                    useShoppingListStore().currently_updating = false
                     useShoppingListStore().refreshFromAPI()
+                }).catch((err) => {
+                    useShoppingListStore().currently_updating = false
+                    StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
                 })
-                return recipe.servings
             }
         },
 
diff --git a/vue/src/components/NumberScalerComponent.vue b/vue/src/components/NumberScalerComponent.vue
new file mode 100644
index 00000000..8e9c9579
--- /dev/null
+++ b/vue/src/components/NumberScalerComponent.vue
@@ -0,0 +1,74 @@
+<template>
+    <div>
+        <b-button-group class="w-100 mt-1">
+            <b-button @click="updateNumber( 'half')"
+                      :disabled="disable"><i class="fas fa-divide"></i> 2
+            </b-button>
+            <b-button variant="info" @click="updateNumber( 'sub')"
+                      :disabled="disable"><i class="fas fa-minus"></i>
+            </b-button>
+            <b-button variant="info" @click="updateNumber('prompt')"
+                      :disabled="disable">
+                {{ number }}
+            </b-button>
+            <b-button variant="info" @click="updateNumber( 'add')"
+                      :disabled="disable"><i class="fas fa-plus"></i>
+            </b-button>
+            <b-button @click="updateNumber('multiply')"
+                      :disabled="disable"><i class="fas fa-times"></i> 2
+            </b-button>
+        </b-button-group>
+    </div>
+</template>
+
+<script>
+import Vue from "vue"
+import {BootstrapVue} from "bootstrap-vue"
+import "bootstrap-vue/dist/bootstrap-vue.css"
+
+Vue.use(BootstrapVue)
+
+export default {
+    name: "NumberScalerComponent",
+    props: {
+        number: {type: Number, default:0},
+        disable: {type: Boolean, default: false}
+    },
+    data() {
+        return {}
+    },
+    methods: {
+        /**
+         * perform given operation on linked number
+         * @param operation update mode
+         */
+        updateNumber: function(operation) {
+            if (operation === 'half') {
+                this.$emit('change', this.number / 2)
+            }
+            if (operation === 'multiply') {
+                this.$emit('change', this.number * 2)
+            }
+            if (operation === 'add') {
+                this.$emit('change', this.number + 1)
+            }
+            if (operation === 'sub') {
+                this.$emit('change', this.number - 1)
+            }
+            if (operation === 'prompt') {
+                let input_number = prompt(this.$t('Input'), this.number);
+                if (input_number !== null && input_number !== "" && !isNaN(input_number) && !isNaN(parseFloat(input_number))) {
+                    this.$emit('change', parseFloat(input_number))
+                } else {
+                    console.log('Invalid number input in  prompt', input_number)
+                }
+            }
+        },
+    },
+}
+</script>
+
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index 3c21da14..7490e5d0 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -57,7 +57,7 @@
                     <b-col cold="12">
                         <b-button-group class="mt-1 w-100">
                             <b-button variant="dark" block class="btn btn-block text-left">
-                                <span>{{ food.name }}</span>
+                                <span><span v-if="e.amount > 0">{{e.amount}}</span> {{e.unit?.name}} {{ food.name }}</span>
                                 <span><br/><small class="text-muted">
                                     <span v-if="e.recipe_mealplan && e.recipe_mealplan.recipe_name !== ''">
                                         <a :href="resolveDjangoUrl('view_recipe', e.recipe_mealplan.recipe)"> {{ e.recipe_mealplan.recipe_name }} </a>({{
@@ -76,6 +76,8 @@
                             <b-button variant="warning" @click="detail_modal_visible = false; useShoppingListStore().deleteObject(e)"><i class="fas fa-trash"></i></b-button> <!-- TODO implement -->
                         </b-button-group>
 
+                        <number-scaler-component :number="e.amount" @change="e.amount = $event; useShoppingListStore().updateObject(e)"></number-scaler-component>
+
                     </b-col>
                 </b-row>
             </template>
@@ -97,6 +99,7 @@ import {useMealPlanStore} from "@/stores/MealPlanStore";
 import {useShoppingListStore} from "@/stores/ShoppingListStore";
 import {ApiApiFactory} from "@/utils/openapi/api";
 import {useUserPreferenceStore} from "@/stores/UserPreferenceStore";
+import NumberScalerComponent from "@/components/NumberScalerComponent.vue";
 
 
 Vue.use(BootstrapVue)
@@ -104,7 +107,7 @@ Vue.use(BootstrapVue)
 export default {
     name: "ShoppingLineItem",
     mixins: [ApiMixin],
-    components: {},
+    components: {NumberScalerComponent},
     props: {
         entries: {type: Object,},
     },
diff --git a/vue/src/locales/en.json b/vue/src/locales/en.json
index 46bdeff8..abb63510 100644
--- a/vue/src/locales/en.json
+++ b/vue/src/locales/en.json
@@ -96,6 +96,7 @@
 	"base_unit": "Base Unit",
 	"base_amount": "Base Amount",
 	"Datatype": "Datatype",
+	"Input": "Input",
 	"Number of Objects": "Number of Objects",
 	"Add_Step": "Add Step",
 	"Keywords": "Keywords",

From 66a07ab39d61b25fa34367c366410e058feb28fa Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Wed, 10 Jan 2024 06:54:54 +0800
Subject: [PATCH 33/95] only show entry scaler if not a recipe

---
 vue/src/components/ShoppingLineItem.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index 7490e5d0..a1f3bb42 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -76,7 +76,7 @@
                             <b-button variant="warning" @click="detail_modal_visible = false; useShoppingListStore().deleteObject(e)"><i class="fas fa-trash"></i></b-button> <!-- TODO implement -->
                         </b-button-group>
 
-                        <number-scaler-component :number="e.amount" @change="e.amount = $event; useShoppingListStore().updateObject(e)"></number-scaler-component>
+                        <number-scaler-component :number="e.amount" @change="e.amount = $event; useShoppingListStore().updateObject(e)" v-if="e.recipe_mealplan === null"></number-scaler-component>
 
                     </b-col>
                 </b-row>

From e045849e89a7455f088a07c21a78aba2e4b147ed Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sat, 13 Jan 2024 07:36:41 +0800
Subject: [PATCH 34/95] more theming firendly classses in shopping

---
 .../apps/ShoppingListView/ShoppingListView.vue   |  2 +-
 vue/src/components/ShoppingLineItem.vue          | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 2e39cd82..42f0b088 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -63,7 +63,7 @@
                            v-if="c.count_unchecked > 0 || user_preference_store.device_settings.shopping_show_checked_entries && (c.count_unchecked + c.count_ecked) > 0">
                         <b-button-group class="w-100 mt-1"
                                         :class="{'flex-row-reverse': useUserPreferenceStore().user_settings.left_handed}">
-                            <b-button variant="light" block class="btn btn-block text-left">
+                            <b-button variant="info" block class="btn btn-block text-left">
                                 <span v-if="c.name === shopping_list_store.UNDEFINED_CATEGORY">{{
                                         $t('Undefined')
                                     }}</span>
diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index a1f3bb42..0edaaa6a 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -5,9 +5,8 @@
             <b-button variant="primary" v-if="is_delayed">
                 <i class="fa-fw fas fa-hourglass-half"></i>
             </b-button>
-
-            <b-button variant="dark" block class="btn btn-block text-left" @click="detail_modal_visible = true">
-                <div class="d-flex ">
+            <div class="card flex-grow-1 btn-block p-1" @click="detail_modal_visible = true">
+                <div class="d-flex">
                     <div class="d-flex flex-column pr-2" v-if="Object.keys(amounts).length> 0">
                         <span v-for="a in amounts" v-bind:key="a.id">{{ a.amount }} {{ a.unit }}<br/></span>
                     </div>
@@ -17,7 +16,7 @@
                 </div>
 
                 <span v-if="info_row"><small class="text-muted">{{ info_row }}</small></span>
-            </b-button>
+            </div>
             <b-button variant="success" @click="useShoppingListStore().setEntriesCheckedState(entries, !is_checked)" :class="{'btn-success': !is_checked, 'btn-warning': is_checked}">
                 <i class="fa-fw fas" :class="{'fa-check': !is_checked , 'fa-cart-plus': is_checked }"></i>
             </b-button>
@@ -87,6 +86,8 @@
             </template>
         </b-modal>
 
+        <generic-modal-form :model="Models.FOOD" :show="editing_food !== null" @hidden="editing_food = null; useShoppingListStore().refreshFromAPI()"></generic-modal-form>
+
     </div>
 </template>
 
@@ -94,12 +95,13 @@
 import Vue from "vue"
 import {BootstrapVue} from "bootstrap-vue"
 import "bootstrap-vue/dist/bootstrap-vue.css"
-import {ApiMixin, resolveDjangoUrl, StandardToasts} from "@/utils/utils"
+import {ApiMixin, getThemeDependentDarkButton, resolveDjangoUrl, StandardToasts} from "@/utils/utils"
 import {useMealPlanStore} from "@/stores/MealPlanStore";
 import {useShoppingListStore} from "@/stores/ShoppingListStore";
 import {ApiApiFactory} from "@/utils/openapi/api";
 import {useUserPreferenceStore} from "@/stores/UserPreferenceStore";
 import NumberScalerComponent from "@/components/NumberScalerComponent.vue";
+import GenericModalForm from "@/components/Modals/GenericModalForm.vue";
 
 
 Vue.use(BootstrapVue)
@@ -107,13 +109,14 @@ Vue.use(BootstrapVue)
 export default {
     name: "ShoppingLineItem",
     mixins: [ApiMixin],
-    components: {NumberScalerComponent},
+    components: {GenericModalForm, NumberScalerComponent},
     props: {
         entries: {type: Object,},
     },
     data() {
         return {
             detail_modal_visible: false,
+            editing_food: null,
         }
     },
     computed: {
@@ -221,6 +224,7 @@ export default {
 
     },
     methods: {
+        getThemeDependentDarkButton,
         useUserPreferenceStore,
         useShoppingListStore,
         resolveDjangoUrl,

From 65dd82e292ee2568c7459470f6015c85ddcd7dd1 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sat, 13 Jan 2024 21:30:39 +0800
Subject: [PATCH 35/95] fixed to string of ingredient

---
 cookbook/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cookbook/models.py b/cookbook/models.py
index b8449756..a38ac5f3 100644
--- a/cookbook/models.py
+++ b/cookbook/models.py
@@ -755,7 +755,7 @@ class Ingredient(ExportModelOperationsMixin('ingredient'), models.Model, Permiss
     objects = ScopedManager(space='space')
 
     def __str__(self):
-        return f'{self.pk}: {self.amount} {self.food.name} {self.unit.name}'
+        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']

From 995d423a6fc6a13ef5dfe652b2ca18fb8f603426 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sat, 13 Jan 2024 21:30:48 +0800
Subject: [PATCH 36/95] WIP shopping undo

---
 .../ShoppingListView/ShoppingListView.vue     |  2 +
 vue/src/components/ShoppingLineItem.vue       |  3 +-
 vue/src/stores/ShoppingListStore.js           | 40 ++++++++++++++++++-
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 42f0b088..b3e61796 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -2,6 +2,8 @@
     <div id="app">
         <b-alert :show="!online" dismissible class="small float-up" variant="warning">{{ $t("OfflineAlert") }}</b-alert>
 
+        <b-button @click="useShoppingListStore().undoChange()">Undo</b-button>
+
         <div class="row float-top w-100">
             <div class="col-auto no-gutter ml-auto">
 
diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index 0edaaa6a..f6f08006 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -95,7 +95,7 @@
 import Vue from "vue"
 import {BootstrapVue} from "bootstrap-vue"
 import "bootstrap-vue/dist/bootstrap-vue.css"
-import {ApiMixin, getThemeDependentDarkButton, resolveDjangoUrl, StandardToasts} from "@/utils/utils"
+import {ApiMixin, resolveDjangoUrl, StandardToasts} from "@/utils/utils"
 import {useMealPlanStore} from "@/stores/MealPlanStore";
 import {useShoppingListStore} from "@/stores/ShoppingListStore";
 import {ApiApiFactory} from "@/utils/openapi/api";
@@ -224,7 +224,6 @@ export default {
 
     },
     methods: {
-        getThemeDependentDarkButton,
         useUserPreferenceStore,
         useShoppingListStore,
         resolveDjangoUrl,
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index 02279b46..5b656226 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -21,6 +21,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
         // internal
         currently_updating: false,
         last_autosync: null,
+        undo_stack: [],
 
         // constants
         GROUP_CATEGORY: 'food.supermarket_category.name',
@@ -200,19 +201,22 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
 
             return apiClient.createShoppingListEntry(object).then((r) => {
                 Vue.set(this.entries, r.data.id, r.data)
+
+                this.registerChange('CREATED', r.data, undefined, undefined)
             }).catch((err) => {
                 StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
             })
         },
         /**
-         * update existing entry object
+         * update existing entry object and updated_at timestamp
          * updates data in store
+         * IMPORTANT: always use this method to update objects to keep client state consistent
          * @param object entry object to update
          * @return {Promise<T | void>} promise of updating call to subscribe to
          */
         updateObject(object) {
             let apiClient = new ApiApiFactory()
-            // set the update_at timestamp on the client to prevent auto sync from overriding with older changes
+            // sets the update_at timestamp on the client to prevent auto sync from overriding with older changes
             // moment().format() yields locale aware datetime without ms 2024-01-04T13:39:08.607238+01:00
             Vue.set(object, 'update_at', moment().format())
 
@@ -317,5 +321,37 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                 this.deleteObject(this.entries[i])
             }
         },
+        /**
+         *
+         */
+        registerChange(type, entries, new_value, old_value) {
+            if (!(type in ['CREATED', 'CHECKED', 'UNCHECKED', 'DELAY'])) {
+                //throw Error('Tried to register unknown change type')
+            }
+
+            this.undo_stack.push({'type': type, 'new_value': new_value, 'old_value': old_value, 'entries': entries})
+        },
+        /**
+         *
+         */
+        undoChange() {
+            let last_item = this.undo_stack.pop()
+            let type = last_item['type']
+            let entries = last_item['entries']
+
+            for (let i in entries) {
+                let e = entries[i]
+                if (type === 'CREATED') {
+                    this.deleteObject(e)
+                } else if (type === 'CHECKED' || type === 'UNCHECKED') {
+                    e.checked = (type === 'UNCHECKED')
+                    this.updateObject(e)
+                } else if (type === 'DELAY'){
+                    e.delay_until = null
+                    this.updateObject(e)
+                }
+
+            }
+        }
     },
 })

From fd821c30c715e097992fd3b5f4864bbf0fd7152d Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sat, 13 Jan 2024 21:34:27 +0800
Subject: [PATCH 37/95] removed ingredient from shopping list entry API

---
 cookbook/serializer.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cookbook/serializer.py b/cookbook/serializer.py
index 229390c1..46c314fd 100644
--- a/cookbook/serializer.py
+++ b/cookbook/serializer.py
@@ -1073,7 +1073,6 @@ class ShoppingListRecipeSerializer(serializers.ModelSerializer):
 class ShoppingListEntrySerializer(WritableNestedModelSerializer):
     food = FoodSerializer(allow_null=True)
     unit = UnitSerializer(allow_null=True, required=False)
-    ingredient_note = serializers.ReadOnlyField(source='ingredient.note')
     recipe_mealplan = ShoppingListRecipeSerializer(source='list_recipe', read_only=True)
     amount = CustomDecimalField()
     created_by = UserSerializer(read_only=True)
@@ -1126,7 +1125,7 @@ class ShoppingListEntrySerializer(WritableNestedModelSerializer):
     class Meta:
         model = ShoppingListEntry
         fields = (
-            'id', 'list_recipe', 'food', 'unit', 'ingredient', 'ingredient_note', 'amount', 'order', 'checked',
+            'id', 'list_recipe', 'food', 'unit', 'amount', 'order', 'checked',
             'recipe_mealplan',
             'created_by', 'created_at', 'updated_at', 'completed_at', 'delay_until'
         )

From 3d6d560c5d82e2e25104a66b5ff4935caa35731b Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sat, 13 Jan 2024 22:58:28 +0800
Subject: [PATCH 38/95] add undo functionality to shopping

---
 .../ShoppingListView/ShoppingListView.vue     |  3 +-
 vue/src/locales/en.json                       |  2 +
 vue/src/stores/ShoppingListStore.js           | 53 +++++++++++--------
 3 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index b3e61796..6541dba7 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -2,10 +2,11 @@
     <div id="app">
         <b-alert :show="!online" dismissible class="small float-up" variant="warning">{{ $t("OfflineAlert") }}</b-alert>
 
-        <b-button @click="useShoppingListStore().undoChange()">Undo</b-button>
+
 
         <div class="row float-top w-100">
             <div class="col-auto no-gutter ml-auto">
+                <b-button variant="link" @click="useShoppingListStore().undoChange()"><i class="fas fa-undo"></i></b-button>
 
                 <b-button variant="link" class="px-1 pt-0 pb-1 d-none d-md-inline-block">
                     <i class="fas fa-download fa-lg nav-link dropdown-toggle text-primary px-1"
diff --git a/vue/src/locales/en.json b/vue/src/locales/en.json
index abb63510..65265100 100644
--- a/vue/src/locales/en.json
+++ b/vue/src/locales/en.json
@@ -97,6 +97,8 @@
 	"base_amount": "Base Amount",
 	"Datatype": "Datatype",
 	"Input": "Input",
+	"Undo": "Undo",
+	"NoMoreUndo": "No changes to be undone.",
 	"Number of Objects": "Number of Objects",
 	"Add_Step": "Add Step",
 	"Keywords": "Keywords",
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index 5b656226..488b40ee 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -202,7 +202,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
             return apiClient.createShoppingListEntry(object).then((r) => {
                 Vue.set(this.entries, r.data.id, r.data)
 
-                this.registerChange('CREATED', r.data, undefined, undefined)
+                this.registerChange('CREATED', {[r.data.id]: r.data},)
             }).catch((err) => {
                 StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
             })
@@ -293,6 +293,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
          * @param checked boolean to set checked state of entry to
          */
         setEntriesCheckedState(entries, checked) {
+            this.registerChange((checked ? 'CHECKED' : 'UNCHECKED'), entries)
             for (let i in entries) {
                 this.entries[i].checked = checked
                 this.updateObject(this.entries[i])
@@ -306,6 +307,8 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
             let delay = 4 //TODO get delay from settings in an offline friendly way
             let delay_date = new Date(Date.now() + delay * (60 * 60 * 1000))
 
+            this.registerChange('DELAY', entries)
+
             for (let i in entries) {
                 console.log('DELAYING ', i, ' until ', delay_date)
                 this.entries[i].delay_until = delay_date
@@ -322,35 +325,43 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
             }
         },
         /**
-         *
+         * register the change to a set of entries to allow undoing it
+         * throws an Error if the operation type is not known
+         * @param type the type of change to register. This determines what undoing the change does. (CREATE->delete object,
+         *              CHECKED->uncheck entry, UNCHECKED->check entry, DELAY->remove delay)
+         * @param {{}} entries set of entries
          */
-        registerChange(type, entries, new_value, old_value) {
-            if (!(type in ['CREATED', 'CHECKED', 'UNCHECKED', 'DELAY'])) {
-                //throw Error('Tried to register unknown change type')
+        registerChange(type, entries) {
+            if (!['CREATED', 'CHECKED', 'UNCHECKED', 'DELAY'].includes(type)) {
+                throw Error('Tried to register unknown change type')
             }
-
-            this.undo_stack.push({'type': type, 'new_value': new_value, 'old_value': old_value, 'entries': entries})
+            this.undo_stack.push({'type': type, 'entries': entries})
         },
         /**
-         *
+         * takes the last item from the undo stack and reverts it
          */
         undoChange() {
             let last_item = this.undo_stack.pop()
-            let type = last_item['type']
-            let entries = last_item['entries']
+            if (last_item !== undefined) {
+                let type = last_item['type']
+                let entries = last_item['entries']
+
+                for (let i in entries) {
+                    let e = entries[i]
+                    if (type === 'CREATED') {
+                        this.deleteObject(e)
+                    } else if (type === 'CHECKED' || type === 'UNCHECKED') {
+                        e.checked = (type === 'UNCHECKED')
+                        this.updateObject(e)
+                    } else if (type === 'DELAY') {
+                        e.delay_until = null
+                        this.updateObject(e)
+                    }
 
-            for (let i in entries) {
-                let e = entries[i]
-                if (type === 'CREATED') {
-                    this.deleteObject(e)
-                } else if (type === 'CHECKED' || type === 'UNCHECKED') {
-                    e.checked = (type === 'UNCHECKED')
-                    this.updateObject(e)
-                } else if (type === 'DELAY'){
-                    e.delay_until = null
-                    this.updateObject(e)
                 }
-
+            } else {
+                // can use localization in store
+                //StandardToasts.makeStandardToast(this, this.$t('NoMoreUndo'))
             }
         }
     },

From 5a0ca3f4e573f6de510cb8253f3f681d643911ac Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sun, 14 Jan 2024 11:54:10 +0800
Subject: [PATCH 39/95] basic swiping working

---
 vue/src/components/ShoppingLineItem.vue | 116 +++++++++++++++++++-----
 vue/src/stores/ShoppingListStore.js     |  44 +++++----
 2 files changed, 116 insertions(+), 44 deletions(-)

diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index f6f08006..a5560f6a 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -1,7 +1,12 @@
 <template>
-    <div id="shopping_line_item">
+    <div id="shopping_line_item" class="swipe-container" @touchend="handleSwipe()"
+         v-if="(useUserPreferenceStore().device_settings.shopping_show_checked_entries || !is_checked) && (useUserPreferenceStore().device_settings.shopping_show_delayed_entries || !is_delayed)"
+    >
+        <div class="swipe-action" :class="{'bg-success': !is_checked , 'bg-warning': is_checked }">
+            <i class="swipe-icon fa-fw fas" :class="{'fa-check': !is_checked , 'fa-cart-plus': is_checked }"></i>
+        </div>
 
-        <b-button-group class="w-100" v-if="(useUserPreferenceStore().device_settings.shopping_show_checked_entries || !is_checked) && (useUserPreferenceStore().device_settings.shopping_show_delayed_entries || !is_delayed)">
+        <b-button-group class="swipe-element">
             <b-button variant="primary" v-if="is_delayed">
                 <i class="fa-fw fas fa-hourglass-half"></i>
             </b-button>
@@ -17,11 +22,14 @@
 
                 <span v-if="info_row"><small class="text-muted">{{ info_row }}</small></span>
             </div>
-            <b-button variant="success" @click="useShoppingListStore().setEntriesCheckedState(entries, !is_checked)" :class="{'btn-success': !is_checked, 'btn-warning': is_checked}">
+            <b-button variant="success" @click="useShoppingListStore().setEntriesCheckedState(entries, !is_checked)"
+                      :class="{'btn-success': !is_checked, 'btn-warning': is_checked}">
                 <i class="fa-fw fas" :class="{'fa-check': !is_checked , 'fa-cart-plus': is_checked }"></i>
             </b-button>
         </b-button-group>
-
+        <div class="swipe-action bg-primary justify-content-end">
+            <i class="fa-fw fas fa-hourglass-half swipe-icon"></i>
+        </div>
 
         <b-modal v-model="detail_modal_visible" @hidden="detail_modal_visible = false">
             <template #modal-title>
@@ -45,21 +53,29 @@
                 <!-- TODO implement -->
                 <!--                <b-button variant="success" block @click="detail_modal_visible = false;"> {{ $t("Edit_Food") }}</b-button>  -->
 
-                <b-button variant="info" block @click="detail_modal_visible = false;useShoppingListStore().delayEntries(entries)">{{ $t('Postpone') }}</b-button>
+                <b-button variant="info" block
+                          @click="detail_modal_visible = false;useShoppingListStore().delayEntries(entries,!this.is_delayed, true)">
+                    {{ $t('Postpone') }}
+                </b-button>
 
 
                 <h6 class="mt-2">{{ $t('Entries') }}</h6>
 
-                <b-button variant="danger" block @click="detail_modal_visible = false;useShoppingListStore().deleteEntries(entries)">{{ $t('Delete_All') }}</b-button>
+                <b-button variant="danger" block
+                          @click="detail_modal_visible = false;useShoppingListStore().deleteEntries(entries)">
+                    {{ $t('Delete_All') }}
+                </b-button>
 
                 <b-row v-for="e in entries" v-bind:key="e.id">
                     <b-col cold="12">
                         <b-button-group class="mt-1 w-100">
                             <b-button variant="dark" block class="btn btn-block text-left">
-                                <span><span v-if="e.amount > 0">{{e.amount}}</span> {{e.unit?.name}} {{ food.name }}</span>
+                                <span><span v-if="e.amount > 0">{{ e.amount }}</span> {{ e.unit?.name }} {{ food.name }}</span>
                                 <span><br/><small class="text-muted">
                                     <span v-if="e.recipe_mealplan && e.recipe_mealplan.recipe_name !== ''">
-                                        <a :href="resolveDjangoUrl('view_recipe', e.recipe_mealplan.recipe)"> {{ e.recipe_mealplan.recipe_name }} </a>({{
+                                        <a :href="resolveDjangoUrl('view_recipe', e.recipe_mealplan.recipe)"> {{
+                                                e.recipe_mealplan.recipe_name
+                                            }} </a>({{
                                             e.recipe_mealplan.servings
                                         }} {{ $t('Servings') }})<br/>
                                     </span>
@@ -72,10 +88,14 @@
                                 </small></span>
 
                             </b-button>
-                            <b-button variant="warning" @click="detail_modal_visible = false; useShoppingListStore().deleteObject(e)"><i class="fas fa-trash"></i></b-button> <!-- TODO implement -->
+                            <b-button variant="warning"
+                                      @click="detail_modal_visible = false; useShoppingListStore().deleteObject(e)"><i
+                                class="fas fa-trash"></i></b-button> <!-- TODO implement -->
                         </b-button-group>
 
-                        <number-scaler-component :number="e.amount" @change="e.amount = $event; useShoppingListStore().updateObject(e)" v-if="e.recipe_mealplan === null"></number-scaler-component>
+                        <number-scaler-component :number="e.amount"
+                                                 @change="e.amount = $event; useShoppingListStore().updateObject(e)"
+                                                 v-if="e.recipe_mealplan === null"></number-scaler-component>
 
                     </b-col>
                 </b-row>
@@ -86,7 +106,8 @@
             </template>
         </b-modal>
 
-        <generic-modal-form :model="Models.FOOD" :show="editing_food !== null" @hidden="editing_food = null; useShoppingListStore().refreshFromAPI()"></generic-modal-form>
+        <generic-modal-form :model="Models.FOOD" :show="editing_food !== null"
+                            @hidden="editing_food = null; useShoppingListStore().refreshFromAPI()"></generic-modal-form>
 
     </div>
 </template>
@@ -186,7 +207,7 @@ export default {
                 if (e.recipe_mealplan !== null) {
                     let recipe_name = e.recipe_mealplan.recipe_name
                     if (recipes.indexOf(recipe_name) === -1) {
-                        recipes.push(recipe_name)
+                        recipes.push(recipe_name.substring(0, 14) + (recipe_name.length > 14 ? '..' : ''))
                     }
 
                     if ('mealplan_from_date' in e.recipe_mealplan) {
@@ -196,14 +217,6 @@ export default {
                         }
                     }
                 }
-
-                if (recipes.length > 1) {
-                    let short_recipes = []
-                    recipes.forEach(r => {
-                        short_recipes.push(r.substring(0, 14) + (r.length > 14 ? '..' : ''))
-                    })
-                    recipes = short_recipes
-                }
             }
 
             if (useUserPreferenceStore().device_settings.shopping_item_info_created_by && authors.length > 0) {
@@ -236,9 +249,12 @@ export default {
                 dateStyle: "short",
             }).format(Date.parse(datetime))
         },
-
+        /**
+         * update the food after the category was changed
+         * handle changing category to category ID as a workaround
+         * @param food
+         */
         updateFoodCategory: function (food) {
-
             if (typeof food.supermarket_category === "number") { // not the best solution, but as long as generic multiselect does not support caching, I don't want to use a proper model
                 food.supermarket_category = this.useShoppingListStore().supermarket_categories.filter(sc => sc.id === food.supermarket_category)[0]
             }
@@ -249,14 +265,66 @@ export default {
             }).catch((err) => {
                 StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
             })
+        },
+        /**
+         * function triggered by touchend event of swipe container
+         * check if min distance is reached and execute desired action
+         */
+        handleSwipe: function () {
+            const minDistance = 80;
+            const container = document.querySelector('.swipe-container');
+            // get the distance the user swiped
+            const swipeDistance = container.scrollLeft - container.clientWidth;
+            if (swipeDistance < minDistance * -1) {
+                useShoppingListStore().setEntriesCheckedState(this.entries, !this.is_checked)
+            } else if (swipeDistance > minDistance) {
+                useShoppingListStore().delayEntries(this.entries, !this.is_delayed, true)
+            }
         }
-
-
     },
 }
 </script>
 
 
 <style>
+/* scroll snap takes care of restoring scroll position */
+.swipe-container {
+    display: flex;
+    overflow: auto;
+    overflow-x: scroll;
+    scroll-snap-type: x mandatory;
+}
+
+/* scrollbar should be hidden */
+.swipe-container::-webkit-scrollbar {
+    display: none;
+}
+
+/* main element should always snap into view */
+.swipe-element {
+    scroll-snap-align: start;
+}
+
+.swipe-icon {
+    color: white;
+    position: sticky;
+    left: 16px;
+    right: 16px;
+}
+
+/* swipe-actions and element should be 100% wide */
+.swipe-action,
+.swipe-element {
+    min-width: 100%;
+}
+
+.swipe-action {
+    display: flex;
+    align-items: center;
+}
+
+.right {
+    justify-content: flex-end;
+}
 
 </style>
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index 488b40ee..f13076a6 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -291,27 +291,34 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
          * function to handle user checking or unchecking a set of entries
          * @param {{}} entries set of entries
          * @param checked boolean to set checked state of entry to
+         * @param undo if the user should be able to undo the change or not
          */
-        setEntriesCheckedState(entries, checked) {
-            this.registerChange((checked ? 'CHECKED' : 'UNCHECKED'), entries)
+        setEntriesCheckedState(entries, checked, undo) {
+            if (undo) {
+                this.registerChange((checked ? 'CHECKED' : 'UNCHECKED'), entries)
+            }
+
             for (let i in entries) {
                 this.entries[i].checked = checked
                 this.updateObject(this.entries[i])
             }
         },
         /**
-         * function to handle user "delaying" shopping entries
+         * function to handle user "delaying" and "undelaying" shopping entries
          * @param {{}} entries set of entries
+         * @param delay if entries should be delayed or if delay should be removed
+         * @param undo if the user should be able to undo the change or not
          */
-        delayEntries(entries) {
-            let delay = 4 //TODO get delay from settings in an offline friendly way
-            let delay_date = new Date(Date.now() + delay * (60 * 60 * 1000))
+        delayEntries(entries, delay, undo) {
+            let delay_hours = 4 //TODO get delay from settings in an offline friendly way
+            let delay_date = new Date(Date.now() + delay_hours * (60 * 60 * 1000))
 
-            this.registerChange('DELAY', entries)
+            if (undo) {
+                this.registerChange((delay ? 'DELAY' : 'UNDELAY'), entries)
+            }
 
             for (let i in entries) {
-                console.log('DELAYING ', i, ' until ', delay_date)
-                this.entries[i].delay_until = delay_date
+                this.entries[i].delay_until = (delay ? delay_date : null)
                 this.updateObject(this.entries[i])
             }
         },
@@ -332,7 +339,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
          * @param {{}} entries set of entries
          */
         registerChange(type, entries) {
-            if (!['CREATED', 'CHECKED', 'UNCHECKED', 'DELAY'].includes(type)) {
+            if (!['CREATED', 'CHECKED', 'UNCHECKED', 'DELAY', 'UNDELAY'].includes(type)) {
                 throw Error('Tried to register unknown change type')
             }
             this.undo_stack.push({'type': type, 'entries': entries})
@@ -346,18 +353,15 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                 let type = last_item['type']
                 let entries = last_item['entries']
 
-                for (let i in entries) {
-                    let e = entries[i]
-                    if (type === 'CREATED') {
+                if (type === 'CHECKED' || type === 'UNCHECKED') {
+                    this.setEntriesCheckedState(entries, (type === 'UNCHECKED'), false)
+                } else if (type === 'DELAY' || type === 'UNDELAY') {
+                    this.delayEntries(entries, (type === 'UNDELAY'), false)
+                } else if (type === 'CREATED') {
+                    for (let i in entries) {
+                        let e = entries[i]
                         this.deleteObject(e)
-                    } else if (type === 'CHECKED' || type === 'UNCHECKED') {
-                        e.checked = (type === 'UNCHECKED')
-                        this.updateObject(e)
-                    } else if (type === 'DELAY') {
-                        e.delay_until = null
-                        this.updateObject(e)
                     }
-
                 }
             } else {
                 // can use localization in store

From 1692230f0187f71c20abe2763dddb5377bcb861e Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sun, 14 Jan 2024 12:04:52 +0800
Subject: [PATCH 40/95] swiping working for all items

---
 vue/src/apps/ShoppingListView/ShoppingListView.vue |  8 +++++---
 vue/src/components/ShoppingLineItem.vue            | 11 +++++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 6541dba7..fd5c458b 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -400,10 +400,11 @@
 
         <bottom-navigation-bar active-view="view_shopping">
             <template #custom_nav_content v-if="current_tab <= 1">
-                <div class="d-flex flex-row justify-content-around mb-3">
+                <b-row class="pr-1 pl-1 mb-3">
+                    <b-col cols="12">
+                          <template v-if="current_tab===0">
 
 
-                    <template v-if="current_tab===0">
                         <b-input-group>
                             <b-form-input v-model="new_item.ingredient" :placeholder="$t('Food')"
                                           @keyup.enter="addItem"></b-form-input>
@@ -422,8 +423,9 @@
                         ></generic-multiselect>
                     </template>
 
+                    </b-col>
+                </b-row>
 
-                </div>
             </template>
 
             <template #custom_create_functions>
diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index a5560f6a..911b1a3e 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -1,5 +1,5 @@
 <template>
-    <div id="shopping_line_item" class="swipe-container" @touchend="handleSwipe()"
+    <div class="swipe-container" :id="item_container_id" @touchend="handleSwipe()"
          v-if="(useUserPreferenceStore().device_settings.shopping_show_checked_entries || !is_checked) && (useUserPreferenceStore().device_settings.shopping_show_delayed_entries || !is_delayed)"
     >
         <div class="swipe-action" :class="{'bg-success': !is_checked , 'bg-warning': is_checked }">
@@ -141,6 +141,13 @@ export default {
         }
     },
     computed: {
+        item_container_id: function () {
+            let id = 'id_sli_'
+            for (let i in this.entries) {
+                id += i + '_'
+            }
+            return id
+        },
         is_checked: function () {
             for (let i in this.entries) {
                 if (!this.entries[i].checked) {
@@ -272,7 +279,7 @@ export default {
          */
         handleSwipe: function () {
             const minDistance = 80;
-            const container = document.querySelector('.swipe-container');
+            const container = document.querySelector('#' + this.item_container_id);
             // get the distance the user swiped
             const swipeDistance = container.scrollLeft - container.clientWidth;
             if (swipeDistance < minDistance * -1) {

From d1865b57f112d098024084dba64f7c474a44d477 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sun, 14 Jan 2024 12:14:47 +0800
Subject: [PATCH 41/95] group checking and unchecking

---
 .../ShoppingListView/ShoppingListView.vue     | 64 +++++++++++--------
 1 file changed, 39 insertions(+), 25 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index fd5c458b..2ea04cf7 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -3,10 +3,10 @@
         <b-alert :show="!online" dismissible class="small float-up" variant="warning">{{ $t("OfflineAlert") }}</b-alert>
 
 
-
         <div class="row float-top w-100">
             <div class="col-auto no-gutter ml-auto">
-                <b-button variant="link" @click="useShoppingListStore().undoChange()"><i class="fas fa-undo"></i></b-button>
+                <b-button variant="link" @click="useShoppingListStore().undoChange()"><i class="fas fa-undo"></i>
+                </b-button>
 
                 <b-button variant="link" class="px-1 pt-0 pb-1 d-none d-md-inline-block">
                     <i class="fas fa-download fa-lg nav-link dropdown-toggle text-primary px-1"
@@ -63,7 +63,7 @@
                 <!-- shopping list table -->
                 <b-row v-for="c in shopping_list_store.get_entries_by_group" v-bind:key="c.id" class="pr-1 pl-1">
                     <b-col cols="12"
-                           v-if="c.count_unchecked > 0 || user_preference_store.device_settings.shopping_show_checked_entries && (c.count_unchecked + c.count_ecked) > 0">
+                           v-if="c.count_unchecked > 0 || user_preference_store.device_settings.shopping_show_checked_entries && (c.count_unchecked + c.count_checked) > 0">
                         <b-button-group class="w-100 mt-1"
                                         :class="{'flex-row-reverse': useUserPreferenceStore().user_settings.left_handed}">
                             <b-button variant="info" block class="btn btn-block text-left">
@@ -72,8 +72,12 @@
                                     }}</span>
                                 <span v-else>{{ c.name }}</span>
                             </b-button>
-                            <b-button variant="success"><i class="fas fa-check fa-fw"></i></b-button>
-                            <!-- todo implement -->
+                            <b-button
+                                :class="{'btn-success':(c.count_unchecked > 0), 'btn-warning': (c.count_unchecked <= 0)}"
+                                @click="checkGroup(c, (c.count_unchecked > 0))">
+                                <i class="fas fa-fw"
+                                   :class="{'fa-check':(c.count_unchecked > 0), 'fa-cart-plus':(c.count_unchecked <= 0) }"></i>
+                            </b-button>
                         </b-button-group>
 
                         <span v-for="f in c.foods" v-bind:key="f.id">
@@ -115,7 +119,8 @@
                                 class="fas fa-trash fa-fw"></i></b-button>
                         </b-button-group>
 
-                        <number-scaler-component :number="r.servings" @change="updateServings(r, $event)" :disable="useShoppingListStore().currently_updating"></number-scaler-component>
+                        <number-scaler-component :number="r.servings" @change="updateServings(r, $event)"
+                                                 :disable="useShoppingListStore().currently_updating"></number-scaler-component>
 
                     </b-col>
                 </b-row>
@@ -402,26 +407,26 @@
             <template #custom_nav_content v-if="current_tab <= 1">
                 <b-row class="pr-1 pl-1 mb-3">
                     <b-col cols="12">
-                          <template v-if="current_tab===0">
+                        <template v-if="current_tab===0">
 
 
-                        <b-input-group>
-                            <b-form-input v-model="new_item.ingredient" :placeholder="$t('Food')"
-                                          @keyup.enter="addItem"></b-form-input>
-                            <b-input-group-append>
-                                <b-button @click="addItem" variant="success">
-                                    <i class="fas fa-cart-plus "/>
-                                </b-button>
-                            </b-input-group-append>
-                        </b-input-group>
-                    </template>
-                    <template v-if="current_tab===1">
-                        <generic-multiselect
-                            :model="Models.RECIPE"
-                            :multiple="false"
-                            @change="addRecipeToShopping($event.val)"
-                        ></generic-multiselect>
-                    </template>
+                            <b-input-group>
+                                <b-form-input v-model="new_item.ingredient" :placeholder="$t('Food')"
+                                              @keyup.enter="addItem"></b-form-input>
+                                <b-input-group-append>
+                                    <b-button @click="addItem" variant="success">
+                                        <i class="fas fa-cart-plus "/>
+                                    </b-button>
+                                </b-input-group-append>
+                            </b-input-group>
+                        </template>
+                        <template v-if="current_tab===1">
+                            <generic-multiselect
+                                :model="Models.RECIPE"
+                                :multiple="false"
+                                @change="addRecipeToShopping($event.val)"
+                            ></generic-multiselect>
+                        </template>
 
                     </b-col>
                 </b-row>
@@ -748,7 +753,16 @@ export default {
                 })
             }
         },
-
+        /**
+         * set checked state for all foods->entries of a group
+         * @param group group to set state
+         * @param checked_state checked state to set group to
+         */
+        checkGroup(group, checked_state) {
+            for (let f in group.foods) {
+                useShoppingListStore().setEntriesCheckedState(group.foods[f].entries, checked_state, false)
+            }
+        },
         // TODO cleanup, review data structure, probably move to its own component --> FOR ALL SUPERMARKET FUNCTIONS
         deleteSupermarket(index) {
             this.$bvModal.msgBoxConfirm(this.$t('Are_You_Sure'), {

From 4a7bd6a8855482721c044c0d3e63356b87e1f538 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sun, 14 Jan 2024 22:16:38 +0800
Subject: [PATCH 42/95] only auto sync when window is focused

---
 vue/src/apps/ShoppingListView/ShoppingListView.vue | 10 ++++++++++
 vue/src/locales/en.json                            |  3 ++-
 vue/src/stores/ShoppingListStore.js                |  3 ++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 2ea04cf7..49d3a6bd 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -575,10 +575,20 @@ export default {
         useUserPreferenceStore().loadUserSettings()
         useUserPreferenceStore().loadDeviceSettings()
         this.setupAutoSync()
+        this.setupFocusMonitor()
+
     },
     methods: {
         useUserPreferenceStore,
         useShoppingListStore,
+
+        setupFocusMonitor: function () {
+            setInterval(() => {
+                useShoppingListStore().autosync_has_focus = document.hasFocus()
+            }, 1000);
+
+        },
+
         setupAutoSync: function () {
             // prevent setting up multiple loops on accident
             // TODO should this just raise an error?
diff --git a/vue/src/locales/en.json b/vue/src/locales/en.json
index 65265100..022e5d60 100644
--- a/vue/src/locales/en.json
+++ b/vue/src/locales/en.json
@@ -299,7 +299,8 @@
 	"Warning": "Warning",
 	"NoCategory": "No category selected.",
 	"InheritWarning": "{food} is set to inherit, changes may not persist.",
-	"ShowDelayed": "Show Delayed Items",
+	"ShowDelayed": "Show delayed items",
+	"ShowRecentlyCompleted": "Show recently completed items",
 	"Completed": "Completed",
 	"OfflineAlert": "You are offline, shopping list may not syncronize.",
 	"shopping_share": "Share Shopping List",
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index f13076a6..b22700dd 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -22,6 +22,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
         currently_updating: false,
         last_autosync: null,
         undo_stack: [],
+        autosync_has_focus: false,
 
         // constants
         GROUP_CATEGORY: 'food.supermarket_category.name',
@@ -163,7 +164,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
             }
         },
         autosync() {
-            if (!this.currently_updating) {
+            if (!this.currently_updating && this.autosync_has_focus) {
                 console.log('running autosync')
                 this.currently_updating = true
 

From 40da2cee199e68c33e7bcfdad16cc15aa7372506 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Mon, 15 Jan 2024 07:58:10 +0800
Subject: [PATCH 43/95] updated migration

---
 ...entry_updated_at.py => 0209_shoppinglistentry_updated_at.py} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename cookbook/migrations/{0207_shoppinglistentry_updated_at.py => 0209_shoppinglistentry_updated_at.py} (80%)

diff --git a/cookbook/migrations/0207_shoppinglistentry_updated_at.py b/cookbook/migrations/0209_shoppinglistentry_updated_at.py
similarity index 80%
rename from cookbook/migrations/0207_shoppinglistentry_updated_at.py
rename to cookbook/migrations/0209_shoppinglistentry_updated_at.py
index 72e609fa..57bcb95f 100644
--- a/cookbook/migrations/0207_shoppinglistentry_updated_at.py
+++ b/cookbook/migrations/0209_shoppinglistentry_updated_at.py
@@ -6,7 +6,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('cookbook', '0206_rename_sticky_navbar_userpreference_nav_sticky_and_more'),
+        ('cookbook', '0208_space_app_name_userpreference_max_owned_spaces'),
     ]
 
     operations = [

From 2b1eda12d1266290ebfdae49348076cf9ef575e0 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Tue, 16 Jan 2024 07:33:20 +0800
Subject: [PATCH 44/95] added undo to category checking

---
 vue/src/apps/ShoppingListView/ShoppingListView.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 49d3a6bd..0dbb8fe6 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -769,9 +769,11 @@ export default {
          * @param checked_state checked state to set group to
          */
         checkGroup(group, checked_state) {
+            let all_entries = {}
             for (let f in group.foods) {
-                useShoppingListStore().setEntriesCheckedState(group.foods[f].entries, checked_state, false)
+                all_entries = Object.assign({},all_entries, group.foods[f].entries)
             }
+            useShoppingListStore().setEntriesCheckedState(all_entries, checked_state, true)
         },
         // TODO cleanup, review data structure, probably move to its own component --> FOR ALL SUPERMARKET FUNCTIONS
         deleteSupermarket(index) {

From 2697e42af7b96a9bf711a3596a817de102368a74 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Tue, 16 Jan 2024 08:06:26 +0800
Subject: [PATCH 45/95] added bulk api endpoint for SLE checking

---
 cookbook/serializer.py              |   75 +-
 cookbook/views/api.py               |   19 +-
 vue/src/stores/ShoppingListStore.js |   13 +-
 vue/src/utils/openapi/api.ts        | 3969 ++-------------------------
 4 files changed, 260 insertions(+), 3816 deletions(-)

diff --git a/cookbook/serializer.py b/cookbook/serializer.py
index 46c314fd..eb91081d 100644
--- a/cookbook/serializer.py
+++ b/cookbook/serializer.py
@@ -57,7 +57,8 @@ class ExtendedRecipeMixin(serializers.ModelSerializer):
             api_serializer = None
         # extended values are computationally expensive and not needed in normal circumstances
         try:
-            if str2bool(self.context['request'].query_params.get('extended', False)) and self.__class__ == api_serializer:
+            if str2bool(
+                    self.context['request'].query_params.get('extended', False)) and self.__class__ == api_serializer:
                 return fields
         except (AttributeError, KeyError):
             pass
@@ -81,12 +82,14 @@ class ExtendedRecipeMixin(serializers.ModelSerializer):
 class OpenDataModelMixin(serializers.ModelSerializer):
 
     def create(self, validated_data):
-        if 'open_data_slug' in validated_data and validated_data['open_data_slug'] is not None and validated_data['open_data_slug'].strip() == '':
+        if 'open_data_slug' in validated_data and validated_data['open_data_slug'] is not None and validated_data[
+            'open_data_slug'].strip() == '':
             validated_data['open_data_slug'] = None
         return super().create(validated_data)
 
     def update(self, instance, validated_data):
-        if 'open_data_slug' in validated_data and validated_data['open_data_slug'] is not None and validated_data['open_data_slug'].strip() == '':
+        if 'open_data_slug' in validated_data and validated_data['open_data_slug'] is not None and validated_data[
+            'open_data_slug'].strip() == '':
             validated_data['open_data_slug'] = None
         return super().update(instance, validated_data)
 
@@ -122,7 +125,8 @@ class CustomOnHandField(serializers.Field):
         if not self.context["request"].user.is_authenticated:
             return []
         shared_users = []
-        if c := caches['default'].get(f'shopping_shared_users_{self.context["request"].space.id}_{self.context["request"].user.id}', None):
+        if c := caches['default'].get(
+                f'shopping_shared_users_{self.context["request"].space.id}_{self.context["request"].user.id}', None):
             shared_users = c
         else:
             try:
@@ -312,7 +316,8 @@ class SpaceSerializer(WritableNestedModelSerializer):
             'id', 'name', 'created_by', 'created_at', 'message', 'max_recipes', 'max_file_storage_mb', 'max_users',
             'allow_sharing', 'demo', 'food_inherit', 'user_count', 'recipe_count', 'file_size_mb',
             'image', 'nav_logo', 'space_theme', 'custom_space_theme', 'nav_bg_color', 'nav_text_color', 'use_plural',
-            'logo_color_32', 'logo_color_128', 'logo_color_144', 'logo_color_180', 'logo_color_192', 'logo_color_512', 'logo_color_svg',)
+            'logo_color_32', 'logo_color_128', 'logo_color_144', 'logo_color_180', 'logo_color_192', 'logo_color_512',
+            'logo_color_svg',)
         read_only_fields = (
             'id', 'created_by', 'created_at', 'max_recipes', 'max_file_storage_mb', 'max_users', 'allow_sharing',
             'demo',)
@@ -332,7 +337,8 @@ class UserSpaceSerializer(WritableNestedModelSerializer):
 
     class Meta:
         model = UserSpace
-        fields = ('id', 'user', 'space', 'groups', 'active', 'internal_note', 'invite_link', 'created_at', 'updated_at',)
+        fields = (
+        'id', 'user', 'space', 'groups', 'active', 'internal_note', 'invite_link', 'created_at', 'updated_at',)
         read_only_fields = ('id', 'invite_link', 'created_at', 'updated_at', 'space')
 
 
@@ -348,7 +354,8 @@ class MealTypeSerializer(SpacedModelSerializer, WritableNestedModelSerializer):
         validated_data['name'] = validated_data['name'].strip()
         space = validated_data.pop('space', self.context['request'].space)
         validated_data['created_by'] = self.context['request'].user
-        obj, created = MealType.objects.get_or_create(name__iexact=validated_data['name'], space=space, defaults=validated_data)
+        obj, created = MealType.objects.get_or_create(name__iexact=validated_data['name'], space=space,
+                                                      defaults=validated_data)
         return obj
 
     class Meta:
@@ -382,13 +389,15 @@ class UserPreferenceSerializer(WritableNestedModelSerializer):
     class Meta:
         model = UserPreference
         fields = (
-            'user', 'image', 'theme', 'nav_bg_color', 'nav_text_color', 'nav_show_logo', 'default_unit', 'default_page', 'use_fractions', 'use_kj',
+            'user', 'image', 'theme', 'nav_bg_color', 'nav_text_color', 'nav_show_logo', 'default_unit', 'default_page',
+            'use_fractions', 'use_kj',
             'plan_share', 'nav_sticky',
             'ingredient_decimals', 'comments', 'shopping_auto_sync', 'mealplan_autoadd_shopping',
             'food_inherit_default', 'default_delay',
             'mealplan_autoinclude_related', 'mealplan_autoexclude_onhand', 'shopping_share', 'shopping_recent_days',
             'csv_delim', 'csv_prefix',
-            'filter_to_supermarket', 'shopping_add_onhand', 'left_handed', 'show_step_ingredients', 'food_children_exist'
+            'filter_to_supermarket', 'shopping_add_onhand', 'left_handed', 'show_step_ingredients',
+            'food_children_exist'
         )
 
 
@@ -477,10 +486,13 @@ class UnitSerializer(UniqueFieldsMixin, ExtendedRecipeMixin, OpenDataModelMixin)
         if x := validated_data.get('name', None):
             validated_data['plural_name'] = x.strip()
 
-        if unit := Unit.objects.filter(Q(name__iexact=validated_data['name']) | Q(plural_name__iexact=validated_data['name']), space=space).first():
+        if unit := Unit.objects.filter(
+                Q(name__iexact=validated_data['name']) | Q(plural_name__iexact=validated_data['name']),
+                space=space).first():
             return unit
 
-        obj, created = Unit.objects.get_or_create(name__iexact=validated_data['name'], space=space, defaults=validated_data)
+        obj, created = Unit.objects.get_or_create(name__iexact=validated_data['name'], space=space,
+                                                  defaults=validated_data)
         return obj
 
     def update(self, instance, validated_data):
@@ -500,7 +512,8 @@ class SupermarketCategorySerializer(UniqueFieldsMixin, WritableNestedModelSerial
     def create(self, validated_data):
         validated_data['name'] = validated_data['name'].strip()
         space = validated_data.pop('space', self.context['request'].space)
-        obj, created = SupermarketCategory.objects.get_or_create(name__iexact=validated_data['name'], space=space, defaults=validated_data)
+        obj, created = SupermarketCategory.objects.get_or_create(name__iexact=validated_data['name'], space=space,
+                                                                 defaults=validated_data)
         return obj
 
     def update(self, instance, validated_data):
@@ -525,7 +538,8 @@ class SupermarketSerializer(UniqueFieldsMixin, SpacedModelSerializer, OpenDataMo
     def create(self, validated_data):
         validated_data['name'] = validated_data['name'].strip()
         space = validated_data.pop('space', self.context['request'].space)
-        obj, created = Supermarket.objects.get_or_create(name__iexact=validated_data['name'], space=space, defaults=validated_data)
+        obj, created = Supermarket.objects.get_or_create(name__iexact=validated_data['name'], space=space,
+                                                         defaults=validated_data)
         return obj
 
     class Meta:
@@ -540,7 +554,8 @@ class PropertyTypeSerializer(OpenDataModelMixin, WritableNestedModelSerializer,
     def create(self, validated_data):
         validated_data['name'] = validated_data['name'].strip()
         space = validated_data.pop('space', self.context['request'].space)
-        obj, created = PropertyType.objects.get_or_create(name__iexact=validated_data['name'], space=space, defaults=validated_data)
+        obj, created = PropertyType.objects.get_or_create(name__iexact=validated_data['name'], space=space,
+                                                          defaults=validated_data)
         return obj
 
     class Meta:
@@ -665,12 +680,14 @@ class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedR
 
         properties = validated_data.pop('properties', None)
 
-        obj, created = Food.objects.get_or_create(name=name, plural_name=plural_name, space=space, properties_food_unit=properties_food_unit,
+        obj, created = Food.objects.get_or_create(name=name, plural_name=plural_name, space=space,
+                                                  properties_food_unit=properties_food_unit,
                                                   defaults=validated_data)
 
         if properties and len(properties) > 0:
             for p in properties:
-                obj.properties.add(Property.objects.create(property_type_id=p['property_type']['id'], property_amount=p['property_amount'], space=space))
+                obj.properties.add(Property.objects.create(property_type_id=p['property_type']['id'],
+                                                           property_amount=p['property_amount'], space=space))
 
         return obj
 
@@ -702,7 +719,8 @@ class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedR
             'properties', 'properties_food_amount', 'properties_food_unit', 'fdc_id',
             'food_onhand', 'supermarket_category',
             'image', 'parent', 'numchild', 'numrecipe', 'inherit_fields', 'full_name', 'ignore_shopping',
-            'substitute', 'substitute_siblings', 'substitute_children', 'substitute_onhand', 'child_inherit_fields', 'open_data_slug',
+            'substitute', 'substitute_siblings', 'substitute_children', 'substitute_onhand', 'child_inherit_fields',
+            'open_data_slug',
         )
         read_only_fields = ('id', 'numchild', 'parent', 'image', 'numrecipe')
 
@@ -726,7 +744,8 @@ class IngredientSimpleSerializer(WritableNestedModelSerializer):
             uch = UnitConversionHelper(self.context['request'].space)
             conversions = []
             for c in uch.get_conversions(obj):
-                conversions.append({'food': c.food.name, 'unit': c.unit.name, 'amount': c.amount})  # TODO do formatting in helper
+                conversions.append(
+                    {'food': c.food.name, 'unit': c.unit.name, 'amount': c.amount})  # TODO do formatting in helper
             return conversions
         else:
             return []
@@ -828,7 +847,8 @@ class UnitConversionSerializer(WritableNestedModelSerializer, OpenDataModelMixin
 
     class Meta:
         model = UnitConversion
-        fields = ('id', 'name', 'base_amount', 'base_unit', 'converted_amount', 'converted_unit', 'food', 'open_data_slug')
+        fields = (
+        'id', 'name', 'base_amount', 'base_unit', 'converted_amount', 'converted_unit', 'food', 'open_data_slug')
 
 
 class NutritionInformationSerializer(serializers.ModelSerializer):
@@ -898,7 +918,8 @@ class RecipeSerializer(RecipeBaseSerializer):
         fields = (
             'id', 'name', 'description', 'image', 'keywords', 'steps', 'working_time',
             'waiting_time', 'created_by', 'created_at', 'updated_at', 'source_url',
-            'internal', 'show_ingredient_overview', 'nutrition', 'properties', 'food_properties', 'servings', 'file_path', 'servings_text', 'rating',
+            'internal', 'show_ingredient_overview', 'nutrition', 'properties', 'food_properties', 'servings',
+            'file_path', 'servings_text', 'rating',
             'last_cooked',
             'private', 'shared',
         )
@@ -977,7 +998,8 @@ class RecipeBookEntrySerializer(serializers.ModelSerializer):
     def create(self, validated_data):
         book = validated_data['book']
         recipe = validated_data['recipe']
-        if not book.get_owner() == self.context['request'].user and not self.context['request'].user in book.get_shared():
+        if not book.get_owner() == self.context['request'].user and not self.context[
+                                                                            'request'].user in book.get_shared():
             raise NotFound(detail=None, code=None)
         obj, created = RecipeBookEntry.objects.get_or_create(book=book, recipe=recipe)
         return obj
@@ -1066,7 +1088,8 @@ class ShoppingListRecipeSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = ShoppingListRecipe
-        fields = ('id', 'recipe_name', 'name', 'recipe', 'mealplan', 'servings', 'mealplan_note', 'mealplan_from_date', 'mealplan_type')
+        fields = ('id', 'recipe_name', 'name', 'recipe', 'mealplan', 'servings', 'mealplan_note', 'mealplan_from_date',
+                  'mealplan_type')
         read_only_fields = ('id',)
 
 
@@ -1132,6 +1155,11 @@ class ShoppingListEntrySerializer(WritableNestedModelSerializer):
         read_only_fields = ('id', 'created_by', 'created_at',)
 
 
+class ShoppingListEntryBulkSerializer(serializers.Serializer):
+    ids = serializers.ListField()
+    checked = serializers.BooleanField()
+
+
 # TODO deprecate
 class ShoppingListEntryCheckedSerializer(serializers.ModelSerializer):
     class Meta:
@@ -1284,7 +1312,8 @@ class InviteLinkSerializer(WritableNestedModelSerializer):
     class Meta:
         model = InviteLink
         fields = (
-            'id', 'uuid', 'email', 'group', 'valid_until', 'used_by', 'reusable', 'internal_note', 'created_by', 'created_at',)
+            'id', 'uuid', 'email', 'group', 'valid_until', 'used_by', 'reusable', 'internal_note', 'created_by',
+            'created_at',)
         read_only_fields = ('id', 'uuid', 'created_by', 'created_at',)
 
 
diff --git a/cookbook/views/api.py b/cookbook/views/api.py
index ae673494..60105472 100644
--- a/cookbook/views/api.py
+++ b/cookbook/views/api.py
@@ -103,7 +103,8 @@ from cookbook.serializer import (AccessTokenSerializer, AutomationSerializer,
                                  SupermarketCategorySerializer, SupermarketSerializer,
                                  SyncLogSerializer, SyncSerializer, UnitConversionSerializer,
                                  UnitSerializer, UserFileSerializer, UserPreferenceSerializer,
-                                 UserSerializer, UserSpaceSerializer, ViewLogSerializer)
+                                 UserSerializer, UserSpaceSerializer, ViewLogSerializer,
+                                 ShoppingListEntryBulkSerializer)
 from cookbook.views.import_export import get_integration
 from recipes import settings
 from recipes.settings import FDC_API_KEY, DRF_THROTTLE_RECIPE_URL_IMPORT
@@ -1175,6 +1176,22 @@ class ShoppingListEntryViewSet(viewsets.ModelViewSet):
         # TODO once old shopping list is removed this needs updated to sharing users in preferences
         return self.queryset
 
+    @decorators.action(
+        detail=False,
+        methods=['POST'],
+        serializer_class=ShoppingListEntryBulkSerializer,
+    )
+    def bulk(self, request):
+        serializer = self.serializer_class(data=request.data)
+        if serializer.is_valid():
+            ShoppingListEntry.objects.filter(
+                Q(created_by=self.request.user)
+                | Q(shoppinglist__shared=self.request.user)
+                | Q(created_by__in=list(self.request.user.get_shopping_share()))
+            ).filter(space=request.space, id__in=serializer.validated_data['ids']).update(checked=serializer.validated_data['checked'])
+            return Response(serializer.data)
+        else:
+            return Response(serializer.errors, 400)
 
 # TODO deprecate
 class ShoppingListViewSet(viewsets.ModelViewSet):
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index b22700dd..be163cb5 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -299,10 +299,19 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                 this.registerChange((checked ? 'CHECKED' : 'UNCHECKED'), entries)
             }
 
+            let entry_id_list = []
             for (let i in entries) {
-                this.entries[i].checked = checked
-                this.updateObject(this.entries[i])
+                Vue.set(this.entries[i], 'checked', checked)
+                Vue.set(this.entries[i], 'update_at', moment().format())
+                entry_id_list.push(i)
             }
+
+            let apiClient = new ApiApiFactory()
+            apiClient.bulkShoppingListEntry({'ids': entry_id_list, 'checked': checked}).then((r) => {
+
+            }).catch((err) => {
+                StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
+            })
         },
         /**
          * function to handle user "delaying" and "undelaying" shopping entries
diff --git a/vue/src/utils/openapi/api.ts b/vue/src/utils/openapi/api.ts
index 367811a3..984ab54c 100644
--- a/vue/src/utils/openapi/api.ts
+++ b/vue/src/utils/openapi/api.ts
@@ -2091,957 +2091,6 @@ export interface MealType {
      */
     created_by?: string;
 }
-/**
- * 
- * @export
- * @interface OpenDataCategory
- */
-export interface OpenDataCategory {
-    /**
-     * 
-     * @type {number}
-     * @memberof OpenDataCategory
-     */
-    id?: number;
-    /**
-     * 
-     * @type {OpenDataUnitVersion}
-     * @memberof OpenDataCategory
-     */
-    version: OpenDataUnitVersion;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataCategory
-     */
-    slug: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataCategory
-     */
-    name: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataCategory
-     */
-    description?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataCategory
-     */
-    comment?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataCategory
-     */
-    created_by?: string;
-}
-/**
- * 
- * @export
- * @interface OpenDataConversion
- */
-export interface OpenDataConversion {
-    /**
-     * 
-     * @type {number}
-     * @memberof OpenDataConversion
-     */
-    id?: number;
-    /**
-     * 
-     * @type {OpenDataUnitVersion}
-     * @memberof OpenDataConversion
-     */
-    version: OpenDataUnitVersion;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversion
-     */
-    slug: string;
-    /**
-     * 
-     * @type {OpenDataConversionFood}
-     * @memberof OpenDataConversion
-     */
-    food: OpenDataConversionFood;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversion
-     */
-    base_amount: string;
-    /**
-     * 
-     * @type {OpenDataConversionFoodPropertiesFoodUnit}
-     * @memberof OpenDataConversion
-     */
-    base_unit: OpenDataConversionFoodPropertiesFoodUnit;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversion
-     */
-    converted_amount: string;
-    /**
-     * 
-     * @type {OpenDataConversionFoodPropertiesFoodUnit}
-     * @memberof OpenDataConversion
-     */
-    converted_unit: OpenDataConversionFoodPropertiesFoodUnit;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversion
-     */
-    source: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversion
-     */
-    comment?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversion
-     */
-    created_by?: string;
-}
-/**
- * 
- * @export
- * @interface OpenDataConversionFood
- */
-export interface OpenDataConversionFood {
-    /**
-     * 
-     * @type {number}
-     * @memberof OpenDataConversionFood
-     */
-    id?: number;
-    /**
-     * 
-     * @type {OpenDataUnitVersion}
-     * @memberof OpenDataConversionFood
-     */
-    version: OpenDataUnitVersion;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversionFood
-     */
-    slug: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversionFood
-     */
-    name: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversionFood
-     */
-    plural_name: string;
-    /**
-     * 
-     * @type {OpenDataStoreCategory}
-     * @memberof OpenDataConversionFood
-     */
-    store_category: OpenDataStoreCategory;
-    /**
-     * 
-     * @type {OpenDataConversionFoodPreferredUnitMetric}
-     * @memberof OpenDataConversionFood
-     */
-    preferred_unit_metric?: OpenDataConversionFoodPreferredUnitMetric | null;
-    /**
-     * 
-     * @type {OpenDataConversionFoodPreferredUnitMetric}
-     * @memberof OpenDataConversionFood
-     */
-    preferred_shopping_unit_metric?: OpenDataConversionFoodPreferredUnitMetric | null;
-    /**
-     * 
-     * @type {OpenDataConversionFoodPreferredUnitMetric}
-     * @memberof OpenDataConversionFood
-     */
-    preferred_unit_imperial?: OpenDataConversionFoodPreferredUnitMetric | null;
-    /**
-     * 
-     * @type {OpenDataConversionFoodPreferredUnitMetric}
-     * @memberof OpenDataConversionFood
-     */
-    preferred_shopping_unit_imperial?: OpenDataConversionFoodPreferredUnitMetric | null;
-    /**
-     * 
-     * @type {Array<OpenDataConversionFoodProperties>}
-     * @memberof OpenDataConversionFood
-     */
-    properties: Array<OpenDataConversionFoodProperties> | null;
-    /**
-     * 
-     * @type {number}
-     * @memberof OpenDataConversionFood
-     */
-    properties_food_amount?: number;
-    /**
-     * 
-     * @type {OpenDataConversionFoodPropertiesFoodUnit}
-     * @memberof OpenDataConversionFood
-     */
-    properties_food_unit: OpenDataConversionFoodPropertiesFoodUnit;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversionFood
-     */
-    properties_source?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversionFood
-     */
-    fdc_id: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversionFood
-     */
-    comment?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversionFood
-     */
-    created_by?: string;
-}
-/**
- * 
- * @export
- * @interface OpenDataConversionFoodPreferredUnitMetric
- */
-export interface OpenDataConversionFoodPreferredUnitMetric {
-    /**
-     * 
-     * @type {number}
-     * @memberof OpenDataConversionFoodPreferredUnitMetric
-     */
-    id?: number;
-    /**
-     * 
-     * @type {OpenDataUnitVersion}
-     * @memberof OpenDataConversionFoodPreferredUnitMetric
-     */
-    version: OpenDataUnitVersion;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversionFoodPreferredUnitMetric
-     */
-    slug: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversionFoodPreferredUnitMetric
-     */
-    name: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversionFoodPreferredUnitMetric
-     */
-    plural_name?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversionFoodPreferredUnitMetric
-     */
-    base_unit?: OpenDataConversionFoodPreferredUnitMetricBaseUnitEnum;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversionFoodPreferredUnitMetric
-     */
-    type: OpenDataConversionFoodPreferredUnitMetricTypeEnum;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversionFoodPreferredUnitMetric
-     */
-    comment?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversionFoodPreferredUnitMetric
-     */
-    created_by?: string;
-}
-
-/**
-    * @export
-    * @enum {string}
-    */
-export enum OpenDataConversionFoodPreferredUnitMetricBaseUnitEnum {
-    G = 'G',
-    Kg = 'KG',
-    Ml = 'ML',
-    L = 'L',
-    Ounce = 'OUNCE',
-    Pound = 'POUND',
-    FluidOunce = 'FLUID_OUNCE',
-    Tsp = 'TSP',
-    Tbsp = 'TBSP',
-    Cup = 'CUP',
-    Pint = 'PINT',
-    Quart = 'QUART',
-    Gallon = 'GALLON',
-    ImperialFluidOunce = 'IMPERIAL_FLUID_OUNCE',
-    ImperialPint = 'IMPERIAL_PINT',
-    ImperialQuart = 'IMPERIAL_QUART',
-    ImperialGallon = 'IMPERIAL_GALLON'
-}
-/**
-    * @export
-    * @enum {string}
-    */
-export enum OpenDataConversionFoodPreferredUnitMetricTypeEnum {
-    Weight = 'WEIGHT',
-    Volume = 'VOLUME',
-    Other = 'OTHER'
-}
-
-/**
- * 
- * @export
- * @interface OpenDataConversionFoodProperties
- */
-export interface OpenDataConversionFoodProperties {
-    /**
-     * 
-     * @type {number}
-     * @memberof OpenDataConversionFoodProperties
-     */
-    id?: number;
-    /**
-     * 
-     * @type {OpenDataConversionFoodProperty}
-     * @memberof OpenDataConversionFoodProperties
-     */
-    property: OpenDataConversionFoodProperty;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversionFoodProperties
-     */
-    property_amount: string;
-}
-/**
- * 
- * @export
- * @interface OpenDataConversionFoodPropertiesFoodUnit
- */
-export interface OpenDataConversionFoodPropertiesFoodUnit {
-    /**
-     * 
-     * @type {number}
-     * @memberof OpenDataConversionFoodPropertiesFoodUnit
-     */
-    id?: number;
-    /**
-     * 
-     * @type {OpenDataUnitVersion}
-     * @memberof OpenDataConversionFoodPropertiesFoodUnit
-     */
-    version: OpenDataUnitVersion;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversionFoodPropertiesFoodUnit
-     */
-    slug: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversionFoodPropertiesFoodUnit
-     */
-    name: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversionFoodPropertiesFoodUnit
-     */
-    plural_name?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversionFoodPropertiesFoodUnit
-     */
-    base_unit?: OpenDataConversionFoodPropertiesFoodUnitBaseUnitEnum;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversionFoodPropertiesFoodUnit
-     */
-    type: OpenDataConversionFoodPropertiesFoodUnitTypeEnum;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversionFoodPropertiesFoodUnit
-     */
-    comment?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversionFoodPropertiesFoodUnit
-     */
-    created_by?: string;
-}
-
-/**
-    * @export
-    * @enum {string}
-    */
-export enum OpenDataConversionFoodPropertiesFoodUnitBaseUnitEnum {
-    G = 'G',
-    Kg = 'KG',
-    Ml = 'ML',
-    L = 'L',
-    Ounce = 'OUNCE',
-    Pound = 'POUND',
-    FluidOunce = 'FLUID_OUNCE',
-    Tsp = 'TSP',
-    Tbsp = 'TBSP',
-    Cup = 'CUP',
-    Pint = 'PINT',
-    Quart = 'QUART',
-    Gallon = 'GALLON',
-    ImperialFluidOunce = 'IMPERIAL_FLUID_OUNCE',
-    ImperialPint = 'IMPERIAL_PINT',
-    ImperialQuart = 'IMPERIAL_QUART',
-    ImperialGallon = 'IMPERIAL_GALLON'
-}
-/**
-    * @export
-    * @enum {string}
-    */
-export enum OpenDataConversionFoodPropertiesFoodUnitTypeEnum {
-    Weight = 'WEIGHT',
-    Volume = 'VOLUME',
-    Other = 'OTHER'
-}
-
-/**
- * 
- * @export
- * @interface OpenDataConversionFoodProperty
- */
-export interface OpenDataConversionFoodProperty {
-    /**
-     * 
-     * @type {number}
-     * @memberof OpenDataConversionFoodProperty
-     */
-    id?: number;
-    /**
-     * 
-     * @type {OpenDataUnitVersion}
-     * @memberof OpenDataConversionFoodProperty
-     */
-    version: OpenDataUnitVersion;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversionFoodProperty
-     */
-    slug: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversionFoodProperty
-     */
-    name: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversionFoodProperty
-     */
-    unit?: string;
-    /**
-     * 
-     * @type {number}
-     * @memberof OpenDataConversionFoodProperty
-     */
-    fdc_id?: number | null;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversionFoodProperty
-     */
-    comment?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataConversionFoodProperty
-     */
-    created_by?: string;
-}
-/**
- * 
- * @export
- * @interface OpenDataFood
- */
-export interface OpenDataFood {
-    /**
-     * 
-     * @type {number}
-     * @memberof OpenDataFood
-     */
-    id?: number;
-    /**
-     * 
-     * @type {OpenDataUnitVersion}
-     * @memberof OpenDataFood
-     */
-    version: OpenDataUnitVersion;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataFood
-     */
-    slug: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataFood
-     */
-    name: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataFood
-     */
-    plural_name: string;
-    /**
-     * 
-     * @type {OpenDataStoreCategory}
-     * @memberof OpenDataFood
-     */
-    store_category: OpenDataStoreCategory;
-    /**
-     * 
-     * @type {OpenDataConversionFoodPreferredUnitMetric}
-     * @memberof OpenDataFood
-     */
-    preferred_unit_metric?: OpenDataConversionFoodPreferredUnitMetric | null;
-    /**
-     * 
-     * @type {OpenDataConversionFoodPreferredUnitMetric}
-     * @memberof OpenDataFood
-     */
-    preferred_shopping_unit_metric?: OpenDataConversionFoodPreferredUnitMetric | null;
-    /**
-     * 
-     * @type {OpenDataConversionFoodPreferredUnitMetric}
-     * @memberof OpenDataFood
-     */
-    preferred_unit_imperial?: OpenDataConversionFoodPreferredUnitMetric | null;
-    /**
-     * 
-     * @type {OpenDataConversionFoodPreferredUnitMetric}
-     * @memberof OpenDataFood
-     */
-    preferred_shopping_unit_imperial?: OpenDataConversionFoodPreferredUnitMetric | null;
-    /**
-     * 
-     * @type {Array<OpenDataConversionFoodProperties>}
-     * @memberof OpenDataFood
-     */
-    properties: Array<OpenDataConversionFoodProperties> | null;
-    /**
-     * 
-     * @type {number}
-     * @memberof OpenDataFood
-     */
-    properties_food_amount?: number;
-    /**
-     * 
-     * @type {OpenDataConversionFoodPropertiesFoodUnit}
-     * @memberof OpenDataFood
-     */
-    properties_food_unit: OpenDataConversionFoodPropertiesFoodUnit;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataFood
-     */
-    properties_source?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataFood
-     */
-    fdc_id: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataFood
-     */
-    comment?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataFood
-     */
-    created_by?: string;
-}
-/**
- * 
- * @export
- * @interface OpenDataProperty
- */
-export interface OpenDataProperty {
-    /**
-     * 
-     * @type {number}
-     * @memberof OpenDataProperty
-     */
-    id?: number;
-    /**
-     * 
-     * @type {OpenDataUnitVersion}
-     * @memberof OpenDataProperty
-     */
-    version: OpenDataUnitVersion;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataProperty
-     */
-    slug: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataProperty
-     */
-    name: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataProperty
-     */
-    unit?: string;
-    /**
-     * 
-     * @type {number}
-     * @memberof OpenDataProperty
-     */
-    fdc_id?: number | null;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataProperty
-     */
-    comment?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataProperty
-     */
-    created_by?: string;
-}
-/**
- * 
- * @export
- * @interface OpenDataStore
- */
-export interface OpenDataStore {
-    /**
-     * 
-     * @type {number}
-     * @memberof OpenDataStore
-     */
-    id?: number;
-    /**
-     * 
-     * @type {OpenDataUnitVersion}
-     * @memberof OpenDataStore
-     */
-    version: OpenDataUnitVersion;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataStore
-     */
-    slug: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataStore
-     */
-    name: string;
-    /**
-     * 
-     * @type {Array<OpenDataStoreCategoryToStore>}
-     * @memberof OpenDataStore
-     */
-    category_to_store: Array<OpenDataStoreCategoryToStore> | null;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataStore
-     */
-    comment?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataStore
-     */
-    created_by?: string;
-}
-/**
- * 
- * @export
- * @interface OpenDataStoreCategory
- */
-export interface OpenDataStoreCategory {
-    /**
-     * 
-     * @type {number}
-     * @memberof OpenDataStoreCategory
-     */
-    id?: number;
-    /**
-     * 
-     * @type {OpenDataUnitVersion}
-     * @memberof OpenDataStoreCategory
-     */
-    version: OpenDataUnitVersion;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataStoreCategory
-     */
-    slug: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataStoreCategory
-     */
-    name: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataStoreCategory
-     */
-    description?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataStoreCategory
-     */
-    comment?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataStoreCategory
-     */
-    created_by?: string;
-}
-/**
- * 
- * @export
- * @interface OpenDataStoreCategoryToStore
- */
-export interface OpenDataStoreCategoryToStore {
-    /**
-     * 
-     * @type {number}
-     * @memberof OpenDataStoreCategoryToStore
-     */
-    id?: number;
-    /**
-     * 
-     * @type {OpenDataStoreCategory}
-     * @memberof OpenDataStoreCategoryToStore
-     */
-    category: OpenDataStoreCategory;
-    /**
-     * 
-     * @type {number}
-     * @memberof OpenDataStoreCategoryToStore
-     */
-    store: number;
-    /**
-     * 
-     * @type {number}
-     * @memberof OpenDataStoreCategoryToStore
-     */
-    order?: number;
-}
-/**
- * 
- * @export
- * @interface OpenDataUnit
- */
-export interface OpenDataUnit {
-    /**
-     * 
-     * @type {number}
-     * @memberof OpenDataUnit
-     */
-    id?: number;
-    /**
-     * 
-     * @type {OpenDataUnitVersion}
-     * @memberof OpenDataUnit
-     */
-    version: OpenDataUnitVersion;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataUnit
-     */
-    slug: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataUnit
-     */
-    name: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataUnit
-     */
-    plural_name?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataUnit
-     */
-    base_unit?: OpenDataUnitBaseUnitEnum;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataUnit
-     */
-    type: OpenDataUnitTypeEnum;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataUnit
-     */
-    comment?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataUnit
-     */
-    created_by?: string;
-}
-
-/**
-    * @export
-    * @enum {string}
-    */
-export enum OpenDataUnitBaseUnitEnum {
-    G = 'G',
-    Kg = 'KG',
-    Ml = 'ML',
-    L = 'L',
-    Ounce = 'OUNCE',
-    Pound = 'POUND',
-    FluidOunce = 'FLUID_OUNCE',
-    Tsp = 'TSP',
-    Tbsp = 'TBSP',
-    Cup = 'CUP',
-    Pint = 'PINT',
-    Quart = 'QUART',
-    Gallon = 'GALLON',
-    ImperialFluidOunce = 'IMPERIAL_FLUID_OUNCE',
-    ImperialPint = 'IMPERIAL_PINT',
-    ImperialQuart = 'IMPERIAL_QUART',
-    ImperialGallon = 'IMPERIAL_GALLON'
-}
-/**
-    * @export
-    * @enum {string}
-    */
-export enum OpenDataUnitTypeEnum {
-    Weight = 'WEIGHT',
-    Volume = 'VOLUME',
-    Other = 'OTHER'
-}
-
-/**
- * 
- * @export
- * @interface OpenDataUnitVersion
- */
-export interface OpenDataUnitVersion {
-    /**
-     * 
-     * @type {number}
-     * @memberof OpenDataUnitVersion
-     */
-    id?: number;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataUnitVersion
-     */
-    name: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataUnitVersion
-     */
-    code: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataUnitVersion
-     */
-    comment?: string;
-}
-/**
- * 
- * @export
- * @interface OpenDataVersion
- */
-export interface OpenDataVersion {
-    /**
-     * 
-     * @type {number}
-     * @memberof OpenDataVersion
-     */
-    id?: number;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataVersion
-     */
-    name: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataVersion
-     */
-    code: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof OpenDataVersion
-     */
-    comment?: string;
-}
 /**
  * 
  * @export
@@ -4013,18 +3062,6 @@ export interface ShoppingListEntries {
      * @memberof ShoppingListEntries
      */
     unit?: FoodPropertiesFoodUnit | null;
-    /**
-     * 
-     * @type {number}
-     * @memberof ShoppingListEntries
-     */
-    ingredient?: number | null;
-    /**
-     * 
-     * @type {string}
-     * @memberof ShoppingListEntries
-     */
-    ingredient_note?: string;
     /**
      * 
      * @type {string}
@@ -4061,6 +3098,12 @@ export interface ShoppingListEntries {
      * @memberof ShoppingListEntries
      */
     created_at?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ShoppingListEntries
+     */
+    updated_at?: string;
     /**
      * 
      * @type {string}
@@ -4104,18 +3147,6 @@ export interface ShoppingListEntry {
      * @memberof ShoppingListEntry
      */
     unit?: FoodPropertiesFoodUnit | null;
-    /**
-     * 
-     * @type {number}
-     * @memberof ShoppingListEntry
-     */
-    ingredient?: number | null;
-    /**
-     * 
-     * @type {string}
-     * @memberof ShoppingListEntry
-     */
-    ingredient_note?: string;
     /**
      * 
      * @type {string}
@@ -4152,6 +3183,12 @@ export interface ShoppingListEntry {
      * @memberof ShoppingListEntry
      */
     created_at?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ShoppingListEntry
+     */
+    updated_at?: string;
     /**
      * 
      * @type {string}
@@ -4165,6 +3202,25 @@ export interface ShoppingListEntry {
      */
     delay_until?: string | null;
 }
+/**
+ * 
+ * @export
+ * @interface ShoppingListEntryBulk
+ */
+export interface ShoppingListEntryBulk {
+    /**
+     * 
+     * @type {Array<any>}
+     * @memberof ShoppingListEntryBulk
+     */
+    ids: Array<any>;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof ShoppingListEntryBulk
+     */
+    checked: boolean;
+}
 /**
  * 
  * @export
@@ -4543,19 +3599,103 @@ export interface Space {
      * @memberof Space
      */
     nav_logo?: RecipeFile | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof Space
+     */
+    space_theme?: SpaceSpaceThemeEnum;
     /**
      * 
      * @type {RecipeFile}
      * @memberof Space
      */
-    space_theme?: RecipeFile | null;
+    custom_space_theme?: RecipeFile | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof Space
+     */
+    nav_bg_color?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof Space
+     */
+    nav_text_color?: SpaceNavTextColorEnum;
     /**
      * 
      * @type {boolean}
      * @memberof Space
      */
     use_plural?: boolean;
+    /**
+     * 
+     * @type {RecipeFile}
+     * @memberof Space
+     */
+    logo_color_32?: RecipeFile | null;
+    /**
+     * 
+     * @type {RecipeFile}
+     * @memberof Space
+     */
+    logo_color_128?: RecipeFile | null;
+    /**
+     * 
+     * @type {RecipeFile}
+     * @memberof Space
+     */
+    logo_color_144?: RecipeFile | null;
+    /**
+     * 
+     * @type {RecipeFile}
+     * @memberof Space
+     */
+    logo_color_180?: RecipeFile | null;
+    /**
+     * 
+     * @type {RecipeFile}
+     * @memberof Space
+     */
+    logo_color_192?: RecipeFile | null;
+    /**
+     * 
+     * @type {RecipeFile}
+     * @memberof Space
+     */
+    logo_color_512?: RecipeFile | null;
+    /**
+     * 
+     * @type {RecipeFile}
+     * @memberof Space
+     */
+    logo_color_svg?: RecipeFile | null;
 }
+
+/**
+    * @export
+    * @enum {string}
+    */
+export enum SpaceSpaceThemeEnum {
+    Blank = 'BLANK',
+    Tandoor = 'TANDOOR',
+    Bootstrap = 'BOOTSTRAP',
+    Darkly = 'DARKLY',
+    Flatly = 'FLATLY',
+    Superhero = 'SUPERHERO',
+    TandoorDark = 'TANDOOR_DARK'
+}
+/**
+    * @export
+    * @enum {string}
+    */
+export enum SpaceNavTextColorEnum {
+    Blank = 'BLANK',
+    Light = 'LIGHT',
+    Dark = 'DARK'
+}
+
 /**
  * 
  * @export
@@ -5418,6 +4558,39 @@ export interface ViewLog {
  */
 export const ApiApiAxiosParamCreator = function (configuration?: Configuration) {
     return {
+        /**
+         * 
+         * @param {ShoppingListEntryBulk} [shoppingListEntryBulk] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        bulkShoppingListEntry: async (shoppingListEntryBulk?: ShoppingListEntryBulk, options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/shopping-list-entry/bulk/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(shoppingListEntryBulk, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @param {AccessToken} [accessToken] 
@@ -5880,237 +5053,6 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
                 options: localVarRequestOptions,
             };
         },
-        /**
-         * 
-         * @param {OpenDataCategory} [openDataCategory] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        createOpenDataCategory: async (openDataCategory?: OpenDataCategory, options: any = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/open-data-category/`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(openDataCategory, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {OpenDataConversion} [openDataConversion] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        createOpenDataConversion: async (openDataConversion?: OpenDataConversion, options: any = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/open-data-conversion/`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(openDataConversion, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {OpenDataFood} [openDataFood] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        createOpenDataFood: async (openDataFood?: OpenDataFood, options: any = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/open-data-food/`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(openDataFood, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {OpenDataProperty} [openDataProperty] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        createOpenDataProperty: async (openDataProperty?: OpenDataProperty, options: any = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/open-data-property/`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(openDataProperty, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {OpenDataStore} [openDataStore] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        createOpenDataStore: async (openDataStore?: OpenDataStore, options: any = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/open-data-store/`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(openDataStore, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {OpenDataUnit} [openDataUnit] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        createOpenDataUnit: async (openDataUnit?: OpenDataUnit, options: any = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/open-data-unit/`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(openDataUnit, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {OpenDataVersion} [openDataVersion] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        createOpenDataVersion: async (openDataVersion?: OpenDataVersion, options: any = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/open-data-version/`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(openDataVersion, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
         /**
          * 
          * @param {Property} [property] 
@@ -7225,237 +6167,6 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
 
 
     
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data category.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        destroyOpenDataCategory: async (id: string, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('destroyOpenDataCategory', 'id', id)
-            const localVarPath = `/api/open-data-category/{id}/`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'DELETE', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data conversion.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        destroyOpenDataConversion: async (id: string, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('destroyOpenDataConversion', 'id', id)
-            const localVarPath = `/api/open-data-conversion/{id}/`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'DELETE', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data food.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        destroyOpenDataFood: async (id: string, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('destroyOpenDataFood', 'id', id)
-            const localVarPath = `/api/open-data-food/{id}/`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'DELETE', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data property.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        destroyOpenDataProperty: async (id: string, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('destroyOpenDataProperty', 'id', id)
-            const localVarPath = `/api/open-data-property/{id}/`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'DELETE', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data store.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        destroyOpenDataStore: async (id: string, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('destroyOpenDataStore', 'id', id)
-            const localVarPath = `/api/open-data-store/{id}/`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'DELETE', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data unit.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        destroyOpenDataUnit: async (id: string, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('destroyOpenDataUnit', 'id', id)
-            const localVarPath = `/api/open-data-unit/{id}/`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'DELETE', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data version.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        destroyOpenDataVersion: async (id: string, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('destroyOpenDataVersion', 'id', id)
-            const localVarPath = `/api/open-data-version/{id}/`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'DELETE', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -8707,238 +7418,6 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
 
 
     
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listOpenDataCategorys: async (options: any = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/open-data-category/`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listOpenDataConversions: async (options: any = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/open-data-conversion/`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listOpenDataFoods: async (options: any = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/open-data-food/`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listOpenDataPropertys: async (options: any = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/open-data-property/`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listOpenDataStatisticsViewSets: async (options: any = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/open-data-stats/`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listOpenDataStores: async (options: any = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/open-data-store/`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listOpenDataUnits: async (options: any = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/open-data-unit/`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listOpenDataVersions: async (options: any = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/open-data-version/`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -10575,265 +9054,6 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
                 options: localVarRequestOptions,
             };
         },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data category.
-         * @param {OpenDataCategory} [openDataCategory] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        partialUpdateOpenDataCategory: async (id: string, openDataCategory?: OpenDataCategory, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('partialUpdateOpenDataCategory', 'id', id)
-            const localVarPath = `/api/open-data-category/{id}/`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'PATCH', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(openDataCategory, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data conversion.
-         * @param {OpenDataConversion} [openDataConversion] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        partialUpdateOpenDataConversion: async (id: string, openDataConversion?: OpenDataConversion, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('partialUpdateOpenDataConversion', 'id', id)
-            const localVarPath = `/api/open-data-conversion/{id}/`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'PATCH', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(openDataConversion, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data food.
-         * @param {OpenDataFood} [openDataFood] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        partialUpdateOpenDataFood: async (id: string, openDataFood?: OpenDataFood, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('partialUpdateOpenDataFood', 'id', id)
-            const localVarPath = `/api/open-data-food/{id}/`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'PATCH', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(openDataFood, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data property.
-         * @param {OpenDataProperty} [openDataProperty] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        partialUpdateOpenDataProperty: async (id: string, openDataProperty?: OpenDataProperty, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('partialUpdateOpenDataProperty', 'id', id)
-            const localVarPath = `/api/open-data-property/{id}/`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'PATCH', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(openDataProperty, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data store.
-         * @param {OpenDataStore} [openDataStore] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        partialUpdateOpenDataStore: async (id: string, openDataStore?: OpenDataStore, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('partialUpdateOpenDataStore', 'id', id)
-            const localVarPath = `/api/open-data-store/{id}/`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'PATCH', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(openDataStore, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data unit.
-         * @param {OpenDataUnit} [openDataUnit] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        partialUpdateOpenDataUnit: async (id: string, openDataUnit?: OpenDataUnit, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('partialUpdateOpenDataUnit', 'id', id)
-            const localVarPath = `/api/open-data-unit/{id}/`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'PATCH', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(openDataUnit, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data version.
-         * @param {OpenDataVersion} [openDataVersion] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        partialUpdateOpenDataVersion: async (id: string, openDataVersion?: OpenDataVersion, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('partialUpdateOpenDataVersion', 'id', id)
-            const localVarPath = `/api/open-data-version/{id}/`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'PATCH', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(openDataVersion, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -11904,39 +10124,6 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
 
 
     
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {string} id 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        retrieveFDCViewSet: async (id: string, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('retrieveFDCViewSet', 'id', id)
-            const localVarPath = `/api/open-data-FDC/{id}/`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -12234,237 +10421,6 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
 
 
     
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data category.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        retrieveOpenDataCategory: async (id: string, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('retrieveOpenDataCategory', 'id', id)
-            const localVarPath = `/api/open-data-category/{id}/`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data conversion.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        retrieveOpenDataConversion: async (id: string, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('retrieveOpenDataConversion', 'id', id)
-            const localVarPath = `/api/open-data-conversion/{id}/`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data food.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        retrieveOpenDataFood: async (id: string, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('retrieveOpenDataFood', 'id', id)
-            const localVarPath = `/api/open-data-food/{id}/`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data property.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        retrieveOpenDataProperty: async (id: string, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('retrieveOpenDataProperty', 'id', id)
-            const localVarPath = `/api/open-data-property/{id}/`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data store.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        retrieveOpenDataStore: async (id: string, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('retrieveOpenDataStore', 'id', id)
-            const localVarPath = `/api/open-data-store/{id}/`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data unit.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        retrieveOpenDataUnit: async (id: string, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('retrieveOpenDataUnit', 'id', id)
-            const localVarPath = `/api/open-data-unit/{id}/`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data version.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        retrieveOpenDataVersion: async (id: string, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('retrieveOpenDataVersion', 'id', id)
-            const localVarPath = `/api/open-data-version/{id}/`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -13887,265 +11843,6 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
                 options: localVarRequestOptions,
             };
         },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data category.
-         * @param {OpenDataCategory} [openDataCategory] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        updateOpenDataCategory: async (id: string, openDataCategory?: OpenDataCategory, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('updateOpenDataCategory', 'id', id)
-            const localVarPath = `/api/open-data-category/{id}/`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(openDataCategory, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data conversion.
-         * @param {OpenDataConversion} [openDataConversion] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        updateOpenDataConversion: async (id: string, openDataConversion?: OpenDataConversion, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('updateOpenDataConversion', 'id', id)
-            const localVarPath = `/api/open-data-conversion/{id}/`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(openDataConversion, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data food.
-         * @param {OpenDataFood} [openDataFood] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        updateOpenDataFood: async (id: string, openDataFood?: OpenDataFood, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('updateOpenDataFood', 'id', id)
-            const localVarPath = `/api/open-data-food/{id}/`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(openDataFood, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data property.
-         * @param {OpenDataProperty} [openDataProperty] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        updateOpenDataProperty: async (id: string, openDataProperty?: OpenDataProperty, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('updateOpenDataProperty', 'id', id)
-            const localVarPath = `/api/open-data-property/{id}/`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(openDataProperty, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data store.
-         * @param {OpenDataStore} [openDataStore] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        updateOpenDataStore: async (id: string, openDataStore?: OpenDataStore, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('updateOpenDataStore', 'id', id)
-            const localVarPath = `/api/open-data-store/{id}/`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(openDataStore, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data unit.
-         * @param {OpenDataUnit} [openDataUnit] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        updateOpenDataUnit: async (id: string, openDataUnit?: OpenDataUnit, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('updateOpenDataUnit', 'id', id)
-            const localVarPath = `/api/open-data-unit/{id}/`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(openDataUnit, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data version.
-         * @param {OpenDataVersion} [openDataVersion] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        updateOpenDataVersion: async (id: string, openDataVersion?: OpenDataVersion, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            assertParamExists('updateOpenDataVersion', 'id', id)
-            const localVarPath = `/api/open-data-version/{id}/`
-                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(openDataVersion, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -14856,6 +12553,16 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
 export const ApiApiFp = function(configuration?: Configuration) {
     const localVarAxiosParamCreator = ApiApiAxiosParamCreator(configuration)
     return {
+        /**
+         * 
+         * @param {ShoppingListEntryBulk} [shoppingListEntryBulk] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async bulkShoppingListEntry(shoppingListEntryBulk?: ShoppingListEntryBulk, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<ShoppingListEntryBulk>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.bulkShoppingListEntry(shoppingListEntryBulk, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @param {AccessToken} [accessToken] 
@@ -14996,76 +12703,6 @@ export const ApiApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.createMealType(mealType, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
-        /**
-         * 
-         * @param {OpenDataCategory} [openDataCategory] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async createOpenDataCategory(openDataCategory?: OpenDataCategory, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataCategory>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.createOpenDataCategory(openDataCategory, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {OpenDataConversion} [openDataConversion] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async createOpenDataConversion(openDataConversion?: OpenDataConversion, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataConversion>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.createOpenDataConversion(openDataConversion, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {OpenDataFood} [openDataFood] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async createOpenDataFood(openDataFood?: OpenDataFood, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataFood>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.createOpenDataFood(openDataFood, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {OpenDataProperty} [openDataProperty] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async createOpenDataProperty(openDataProperty?: OpenDataProperty, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataProperty>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.createOpenDataProperty(openDataProperty, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {OpenDataStore} [openDataStore] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async createOpenDataStore(openDataStore?: OpenDataStore, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataStore>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.createOpenDataStore(openDataStore, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {OpenDataUnit} [openDataUnit] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async createOpenDataUnit(openDataUnit?: OpenDataUnit, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataUnit>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.createOpenDataUnit(openDataUnit, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {OpenDataVersion} [openDataVersion] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async createOpenDataVersion(openDataVersion?: OpenDataVersion, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataVersion>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.createOpenDataVersion(openDataVersion, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
         /**
          * 
          * @param {Property} [property] 
@@ -15401,76 +13038,6 @@ export const ApiApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.destroyMealType(id, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data category.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async destroyOpenDataCategory(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.destroyOpenDataCategory(id, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data conversion.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async destroyOpenDataConversion(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.destroyOpenDataConversion(id, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data food.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async destroyOpenDataFood(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.destroyOpenDataFood(id, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data property.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async destroyOpenDataProperty(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.destroyOpenDataProperty(id, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data store.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async destroyOpenDataStore(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.destroyOpenDataStore(id, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data unit.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async destroyOpenDataUnit(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.destroyOpenDataUnit(id, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data version.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async destroyOpenDataVersion(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.destroyOpenDataVersion(id, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -15840,78 +13407,6 @@ export const ApiApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.listMealTypes(options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
-        /**
-         * 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async listOpenDataCategorys(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<OpenDataCategory>>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.listOpenDataCategorys(options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async listOpenDataConversions(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<OpenDataConversion>>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.listOpenDataConversions(options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async listOpenDataFoods(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<OpenDataFood>>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.listOpenDataFoods(options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async listOpenDataPropertys(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<OpenDataProperty>>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.listOpenDataPropertys(options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async listOpenDataStatisticsViewSets(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<any>>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.listOpenDataStatisticsViewSets(options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async listOpenDataStores(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<OpenDataStore>>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.listOpenDataStores(options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async listOpenDataUnits(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<OpenDataUnit>>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.listOpenDataUnits(options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async listOpenDataVersions(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<OpenDataVersion>>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.listOpenDataVersions(options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
         /**
          * 
          * @param {*} [options] Override http request option.
@@ -16380,83 +13875,6 @@ export const ApiApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateMealType(id, mealType, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data category.
-         * @param {OpenDataCategory} [openDataCategory] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async partialUpdateOpenDataCategory(id: string, openDataCategory?: OpenDataCategory, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataCategory>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateOpenDataCategory(id, openDataCategory, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data conversion.
-         * @param {OpenDataConversion} [openDataConversion] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async partialUpdateOpenDataConversion(id: string, openDataConversion?: OpenDataConversion, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataConversion>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateOpenDataConversion(id, openDataConversion, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data food.
-         * @param {OpenDataFood} [openDataFood] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async partialUpdateOpenDataFood(id: string, openDataFood?: OpenDataFood, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataFood>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateOpenDataFood(id, openDataFood, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data property.
-         * @param {OpenDataProperty} [openDataProperty] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async partialUpdateOpenDataProperty(id: string, openDataProperty?: OpenDataProperty, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataProperty>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateOpenDataProperty(id, openDataProperty, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data store.
-         * @param {OpenDataStore} [openDataStore] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async partialUpdateOpenDataStore(id: string, openDataStore?: OpenDataStore, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataStore>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateOpenDataStore(id, openDataStore, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data unit.
-         * @param {OpenDataUnit} [openDataUnit] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async partialUpdateOpenDataUnit(id: string, openDataUnit?: OpenDataUnit, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataUnit>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateOpenDataUnit(id, openDataUnit, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data version.
-         * @param {OpenDataVersion} [openDataVersion] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async partialUpdateOpenDataVersion(id: string, openDataVersion?: OpenDataVersion, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataVersion>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateOpenDataVersion(id, openDataVersion, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -16774,16 +14192,6 @@ export const ApiApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveExportLog(id, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
-        /**
-         * 
-         * @param {string} id 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async retrieveFDCViewSet(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<any>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveFDCViewSet(id, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
         /**
          * 
          * @param {string} id A unique integer value identifying this food.
@@ -16874,76 +14282,6 @@ export const ApiApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveMealType(id, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data category.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async retrieveOpenDataCategory(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataCategory>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveOpenDataCategory(id, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data conversion.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async retrieveOpenDataConversion(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataConversion>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveOpenDataConversion(id, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data food.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async retrieveOpenDataFood(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataFood>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveOpenDataFood(id, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data property.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async retrieveOpenDataProperty(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataProperty>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveOpenDataProperty(id, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data store.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async retrieveOpenDataStore(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataStore>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveOpenDataStore(id, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data unit.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async retrieveOpenDataUnit(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataUnit>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveOpenDataUnit(id, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data version.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async retrieveOpenDataVersion(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataVersion>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveOpenDataVersion(id, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -17369,83 +14707,6 @@ export const ApiApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.updateMealType(id, mealType, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data category.
-         * @param {OpenDataCategory} [openDataCategory] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async updateOpenDataCategory(id: string, openDataCategory?: OpenDataCategory, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataCategory>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.updateOpenDataCategory(id, openDataCategory, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data conversion.
-         * @param {OpenDataConversion} [openDataConversion] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async updateOpenDataConversion(id: string, openDataConversion?: OpenDataConversion, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataConversion>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.updateOpenDataConversion(id, openDataConversion, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data food.
-         * @param {OpenDataFood} [openDataFood] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async updateOpenDataFood(id: string, openDataFood?: OpenDataFood, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataFood>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.updateOpenDataFood(id, openDataFood, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data property.
-         * @param {OpenDataProperty} [openDataProperty] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async updateOpenDataProperty(id: string, openDataProperty?: OpenDataProperty, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataProperty>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.updateOpenDataProperty(id, openDataProperty, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data store.
-         * @param {OpenDataStore} [openDataStore] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async updateOpenDataStore(id: string, openDataStore?: OpenDataStore, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataStore>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.updateOpenDataStore(id, openDataStore, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data unit.
-         * @param {OpenDataUnit} [openDataUnit] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async updateOpenDataUnit(id: string, openDataUnit?: OpenDataUnit, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataUnit>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.updateOpenDataUnit(id, openDataUnit, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data version.
-         * @param {OpenDataVersion} [openDataVersion] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async updateOpenDataVersion(id: string, openDataVersion?: OpenDataVersion, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataVersion>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.updateOpenDataVersion(id, openDataVersion, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -17659,6 +14920,15 @@ export const ApiApiFp = function(configuration?: Configuration) {
 export const ApiApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
     const localVarFp = ApiApiFp(configuration)
     return {
+        /**
+         * 
+         * @param {ShoppingListEntryBulk} [shoppingListEntryBulk] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        bulkShoppingListEntry(shoppingListEntryBulk?: ShoppingListEntryBulk, options?: any): AxiosPromise<ShoppingListEntryBulk> {
+            return localVarFp.bulkShoppingListEntry(shoppingListEntryBulk, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @param {AccessToken} [accessToken] 
@@ -17785,69 +15055,6 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         createMealType(mealType?: MealType, options?: any): AxiosPromise<MealType> {
             return localVarFp.createMealType(mealType, options).then((request) => request(axios, basePath));
         },
-        /**
-         * 
-         * @param {OpenDataCategory} [openDataCategory] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        createOpenDataCategory(openDataCategory?: OpenDataCategory, options?: any): AxiosPromise<OpenDataCategory> {
-            return localVarFp.createOpenDataCategory(openDataCategory, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {OpenDataConversion} [openDataConversion] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        createOpenDataConversion(openDataConversion?: OpenDataConversion, options?: any): AxiosPromise<OpenDataConversion> {
-            return localVarFp.createOpenDataConversion(openDataConversion, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {OpenDataFood} [openDataFood] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        createOpenDataFood(openDataFood?: OpenDataFood, options?: any): AxiosPromise<OpenDataFood> {
-            return localVarFp.createOpenDataFood(openDataFood, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {OpenDataProperty} [openDataProperty] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        createOpenDataProperty(openDataProperty?: OpenDataProperty, options?: any): AxiosPromise<OpenDataProperty> {
-            return localVarFp.createOpenDataProperty(openDataProperty, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {OpenDataStore} [openDataStore] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        createOpenDataStore(openDataStore?: OpenDataStore, options?: any): AxiosPromise<OpenDataStore> {
-            return localVarFp.createOpenDataStore(openDataStore, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {OpenDataUnit} [openDataUnit] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        createOpenDataUnit(openDataUnit?: OpenDataUnit, options?: any): AxiosPromise<OpenDataUnit> {
-            return localVarFp.createOpenDataUnit(openDataUnit, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {OpenDataVersion} [openDataVersion] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        createOpenDataVersion(openDataVersion?: OpenDataVersion, options?: any): AxiosPromise<OpenDataVersion> {
-            return localVarFp.createOpenDataVersion(openDataVersion, options).then((request) => request(axios, basePath));
-        },
         /**
          * 
          * @param {Property} [property] 
@@ -18150,69 +15357,6 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         destroyMealType(id: string, options?: any): AxiosPromise<void> {
             return localVarFp.destroyMealType(id, options).then((request) => request(axios, basePath));
         },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data category.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        destroyOpenDataCategory(id: string, options?: any): AxiosPromise<void> {
-            return localVarFp.destroyOpenDataCategory(id, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data conversion.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        destroyOpenDataConversion(id: string, options?: any): AxiosPromise<void> {
-            return localVarFp.destroyOpenDataConversion(id, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data food.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        destroyOpenDataFood(id: string, options?: any): AxiosPromise<void> {
-            return localVarFp.destroyOpenDataFood(id, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data property.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        destroyOpenDataProperty(id: string, options?: any): AxiosPromise<void> {
-            return localVarFp.destroyOpenDataProperty(id, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data store.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        destroyOpenDataStore(id: string, options?: any): AxiosPromise<void> {
-            return localVarFp.destroyOpenDataStore(id, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data unit.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        destroyOpenDataUnit(id: string, options?: any): AxiosPromise<void> {
-            return localVarFp.destroyOpenDataUnit(id, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data version.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        destroyOpenDataVersion(id: string, options?: any): AxiosPromise<void> {
-            return localVarFp.destroyOpenDataVersion(id, options).then((request) => request(axios, basePath));
-        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -18546,70 +15690,6 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         listMealTypes(options?: any): AxiosPromise<Array<MealType>> {
             return localVarFp.listMealTypes(options).then((request) => request(axios, basePath));
         },
-        /**
-         * 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listOpenDataCategorys(options?: any): AxiosPromise<Array<OpenDataCategory>> {
-            return localVarFp.listOpenDataCategorys(options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listOpenDataConversions(options?: any): AxiosPromise<Array<OpenDataConversion>> {
-            return localVarFp.listOpenDataConversions(options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listOpenDataFoods(options?: any): AxiosPromise<Array<OpenDataFood>> {
-            return localVarFp.listOpenDataFoods(options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listOpenDataPropertys(options?: any): AxiosPromise<Array<OpenDataProperty>> {
-            return localVarFp.listOpenDataPropertys(options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listOpenDataStatisticsViewSets(options?: any): AxiosPromise<Array<any>> {
-            return localVarFp.listOpenDataStatisticsViewSets(options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listOpenDataStores(options?: any): AxiosPromise<Array<OpenDataStore>> {
-            return localVarFp.listOpenDataStores(options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listOpenDataUnits(options?: any): AxiosPromise<Array<OpenDataUnit>> {
-            return localVarFp.listOpenDataUnits(options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listOpenDataVersions(options?: any): AxiosPromise<Array<OpenDataVersion>> {
-            return localVarFp.listOpenDataVersions(options).then((request) => request(axios, basePath));
-        },
         /**
          * 
          * @param {*} [options] Override http request option.
@@ -19036,76 +16116,6 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         partialUpdateMealType(id: string, mealType?: MealType, options?: any): AxiosPromise<MealType> {
             return localVarFp.partialUpdateMealType(id, mealType, options).then((request) => request(axios, basePath));
         },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data category.
-         * @param {OpenDataCategory} [openDataCategory] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        partialUpdateOpenDataCategory(id: string, openDataCategory?: OpenDataCategory, options?: any): AxiosPromise<OpenDataCategory> {
-            return localVarFp.partialUpdateOpenDataCategory(id, openDataCategory, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data conversion.
-         * @param {OpenDataConversion} [openDataConversion] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        partialUpdateOpenDataConversion(id: string, openDataConversion?: OpenDataConversion, options?: any): AxiosPromise<OpenDataConversion> {
-            return localVarFp.partialUpdateOpenDataConversion(id, openDataConversion, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data food.
-         * @param {OpenDataFood} [openDataFood] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        partialUpdateOpenDataFood(id: string, openDataFood?: OpenDataFood, options?: any): AxiosPromise<OpenDataFood> {
-            return localVarFp.partialUpdateOpenDataFood(id, openDataFood, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data property.
-         * @param {OpenDataProperty} [openDataProperty] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        partialUpdateOpenDataProperty(id: string, openDataProperty?: OpenDataProperty, options?: any): AxiosPromise<OpenDataProperty> {
-            return localVarFp.partialUpdateOpenDataProperty(id, openDataProperty, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data store.
-         * @param {OpenDataStore} [openDataStore] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        partialUpdateOpenDataStore(id: string, openDataStore?: OpenDataStore, options?: any): AxiosPromise<OpenDataStore> {
-            return localVarFp.partialUpdateOpenDataStore(id, openDataStore, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data unit.
-         * @param {OpenDataUnit} [openDataUnit] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        partialUpdateOpenDataUnit(id: string, openDataUnit?: OpenDataUnit, options?: any): AxiosPromise<OpenDataUnit> {
-            return localVarFp.partialUpdateOpenDataUnit(id, openDataUnit, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data version.
-         * @param {OpenDataVersion} [openDataVersion] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        partialUpdateOpenDataVersion(id: string, openDataVersion?: OpenDataVersion, options?: any): AxiosPromise<OpenDataVersion> {
-            return localVarFp.partialUpdateOpenDataVersion(id, openDataVersion, options).then((request) => request(axios, basePath));
-        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -19394,15 +16404,6 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         retrieveExportLog(id: string, options?: any): AxiosPromise<ExportLog> {
             return localVarFp.retrieveExportLog(id, options).then((request) => request(axios, basePath));
         },
-        /**
-         * 
-         * @param {string} id 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        retrieveFDCViewSet(id: string, options?: any): AxiosPromise<any> {
-            return localVarFp.retrieveFDCViewSet(id, options).then((request) => request(axios, basePath));
-        },
         /**
          * 
          * @param {string} id A unique integer value identifying this food.
@@ -19484,69 +16485,6 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         retrieveMealType(id: string, options?: any): AxiosPromise<MealType> {
             return localVarFp.retrieveMealType(id, options).then((request) => request(axios, basePath));
         },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data category.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        retrieveOpenDataCategory(id: string, options?: any): AxiosPromise<OpenDataCategory> {
-            return localVarFp.retrieveOpenDataCategory(id, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data conversion.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        retrieveOpenDataConversion(id: string, options?: any): AxiosPromise<OpenDataConversion> {
-            return localVarFp.retrieveOpenDataConversion(id, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data food.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        retrieveOpenDataFood(id: string, options?: any): AxiosPromise<OpenDataFood> {
-            return localVarFp.retrieveOpenDataFood(id, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data property.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        retrieveOpenDataProperty(id: string, options?: any): AxiosPromise<OpenDataProperty> {
-            return localVarFp.retrieveOpenDataProperty(id, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data store.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        retrieveOpenDataStore(id: string, options?: any): AxiosPromise<OpenDataStore> {
-            return localVarFp.retrieveOpenDataStore(id, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data unit.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        retrieveOpenDataUnit(id: string, options?: any): AxiosPromise<OpenDataUnit> {
-            return localVarFp.retrieveOpenDataUnit(id, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data version.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        retrieveOpenDataVersion(id: string, options?: any): AxiosPromise<OpenDataVersion> {
-            return localVarFp.retrieveOpenDataVersion(id, options).then((request) => request(axios, basePath));
-        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -19931,76 +16869,6 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         updateMealType(id: string, mealType?: MealType, options?: any): AxiosPromise<MealType> {
             return localVarFp.updateMealType(id, mealType, options).then((request) => request(axios, basePath));
         },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data category.
-         * @param {OpenDataCategory} [openDataCategory] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        updateOpenDataCategory(id: string, openDataCategory?: OpenDataCategory, options?: any): AxiosPromise<OpenDataCategory> {
-            return localVarFp.updateOpenDataCategory(id, openDataCategory, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data conversion.
-         * @param {OpenDataConversion} [openDataConversion] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        updateOpenDataConversion(id: string, openDataConversion?: OpenDataConversion, options?: any): AxiosPromise<OpenDataConversion> {
-            return localVarFp.updateOpenDataConversion(id, openDataConversion, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data food.
-         * @param {OpenDataFood} [openDataFood] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        updateOpenDataFood(id: string, openDataFood?: OpenDataFood, options?: any): AxiosPromise<OpenDataFood> {
-            return localVarFp.updateOpenDataFood(id, openDataFood, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data property.
-         * @param {OpenDataProperty} [openDataProperty] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        updateOpenDataProperty(id: string, openDataProperty?: OpenDataProperty, options?: any): AxiosPromise<OpenDataProperty> {
-            return localVarFp.updateOpenDataProperty(id, openDataProperty, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data store.
-         * @param {OpenDataStore} [openDataStore] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        updateOpenDataStore(id: string, openDataStore?: OpenDataStore, options?: any): AxiosPromise<OpenDataStore> {
-            return localVarFp.updateOpenDataStore(id, openDataStore, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data unit.
-         * @param {OpenDataUnit} [openDataUnit] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        updateOpenDataUnit(id: string, openDataUnit?: OpenDataUnit, options?: any): AxiosPromise<OpenDataUnit> {
-            return localVarFp.updateOpenDataUnit(id, openDataUnit, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @param {string} id A unique integer value identifying this open data version.
-         * @param {OpenDataVersion} [openDataVersion] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        updateOpenDataVersion(id: string, openDataVersion?: OpenDataVersion, options?: any): AxiosPromise<OpenDataVersion> {
-            return localVarFp.updateOpenDataVersion(id, openDataVersion, options).then((request) => request(axios, basePath));
-        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -20196,6 +17064,17 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
  * @extends {BaseAPI}
  */
 export class ApiApi extends BaseAPI {
+    /**
+     * 
+     * @param {ShoppingListEntryBulk} [shoppingListEntryBulk] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public bulkShoppingListEntry(shoppingListEntryBulk?: ShoppingListEntryBulk, options?: any) {
+        return ApiApiFp(this.configuration).bulkShoppingListEntry(shoppingListEntryBulk, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @param {AccessToken} [accessToken] 
@@ -20350,83 +17229,6 @@ export class ApiApi extends BaseAPI {
         return ApiApiFp(this.configuration).createMealType(mealType, options).then((request) => request(this.axios, this.basePath));
     }
 
-    /**
-     * 
-     * @param {OpenDataCategory} [openDataCategory] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public createOpenDataCategory(openDataCategory?: OpenDataCategory, options?: any) {
-        return ApiApiFp(this.configuration).createOpenDataCategory(openDataCategory, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {OpenDataConversion} [openDataConversion] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public createOpenDataConversion(openDataConversion?: OpenDataConversion, options?: any) {
-        return ApiApiFp(this.configuration).createOpenDataConversion(openDataConversion, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {OpenDataFood} [openDataFood] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public createOpenDataFood(openDataFood?: OpenDataFood, options?: any) {
-        return ApiApiFp(this.configuration).createOpenDataFood(openDataFood, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {OpenDataProperty} [openDataProperty] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public createOpenDataProperty(openDataProperty?: OpenDataProperty, options?: any) {
-        return ApiApiFp(this.configuration).createOpenDataProperty(openDataProperty, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {OpenDataStore} [openDataStore] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public createOpenDataStore(openDataStore?: OpenDataStore, options?: any) {
-        return ApiApiFp(this.configuration).createOpenDataStore(openDataStore, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {OpenDataUnit} [openDataUnit] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public createOpenDataUnit(openDataUnit?: OpenDataUnit, options?: any) {
-        return ApiApiFp(this.configuration).createOpenDataUnit(openDataUnit, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {OpenDataVersion} [openDataVersion] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public createOpenDataVersion(openDataVersion?: OpenDataVersion, options?: any) {
-        return ApiApiFp(this.configuration).createOpenDataVersion(openDataVersion, options).then((request) => request(this.axios, this.basePath));
-    }
-
     /**
      * 
      * @param {Property} [property] 
@@ -20795,83 +17597,6 @@ export class ApiApi extends BaseAPI {
         return ApiApiFp(this.configuration).destroyMealType(id, options).then((request) => request(this.axios, this.basePath));
     }
 
-    /**
-     * 
-     * @param {string} id A unique integer value identifying this open data category.
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public destroyOpenDataCategory(id: string, options?: any) {
-        return ApiApiFp(this.configuration).destroyOpenDataCategory(id, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {string} id A unique integer value identifying this open data conversion.
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public destroyOpenDataConversion(id: string, options?: any) {
-        return ApiApiFp(this.configuration).destroyOpenDataConversion(id, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {string} id A unique integer value identifying this open data food.
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public destroyOpenDataFood(id: string, options?: any) {
-        return ApiApiFp(this.configuration).destroyOpenDataFood(id, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {string} id A unique integer value identifying this open data property.
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public destroyOpenDataProperty(id: string, options?: any) {
-        return ApiApiFp(this.configuration).destroyOpenDataProperty(id, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {string} id A unique integer value identifying this open data store.
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public destroyOpenDataStore(id: string, options?: any) {
-        return ApiApiFp(this.configuration).destroyOpenDataStore(id, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {string} id A unique integer value identifying this open data unit.
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public destroyOpenDataUnit(id: string, options?: any) {
-        return ApiApiFp(this.configuration).destroyOpenDataUnit(id, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {string} id A unique integer value identifying this open data version.
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public destroyOpenDataVersion(id: string, options?: any) {
-        return ApiApiFp(this.configuration).destroyOpenDataVersion(id, options).then((request) => request(this.axios, this.basePath));
-    }
-
     /**
      * 
      * @param {string} id A unique integer value identifying this property.
@@ -21277,86 +18002,6 @@ export class ApiApi extends BaseAPI {
         return ApiApiFp(this.configuration).listMealTypes(options).then((request) => request(this.axios, this.basePath));
     }
 
-    /**
-     * 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public listOpenDataCategorys(options?: any) {
-        return ApiApiFp(this.configuration).listOpenDataCategorys(options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public listOpenDataConversions(options?: any) {
-        return ApiApiFp(this.configuration).listOpenDataConversions(options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public listOpenDataFoods(options?: any) {
-        return ApiApiFp(this.configuration).listOpenDataFoods(options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public listOpenDataPropertys(options?: any) {
-        return ApiApiFp(this.configuration).listOpenDataPropertys(options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public listOpenDataStatisticsViewSets(options?: any) {
-        return ApiApiFp(this.configuration).listOpenDataStatisticsViewSets(options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public listOpenDataStores(options?: any) {
-        return ApiApiFp(this.configuration).listOpenDataStores(options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public listOpenDataUnits(options?: any) {
-        return ApiApiFp(this.configuration).listOpenDataUnits(options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public listOpenDataVersions(options?: any) {
-        return ApiApiFp(this.configuration).listOpenDataVersions(options).then((request) => request(this.axios, this.basePath));
-    }
-
     /**
      * 
      * @param {*} [options] Override http request option.
@@ -21867,90 +18512,6 @@ export class ApiApi extends BaseAPI {
         return ApiApiFp(this.configuration).partialUpdateMealType(id, mealType, options).then((request) => request(this.axios, this.basePath));
     }
 
-    /**
-     * 
-     * @param {string} id A unique integer value identifying this open data category.
-     * @param {OpenDataCategory} [openDataCategory] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public partialUpdateOpenDataCategory(id: string, openDataCategory?: OpenDataCategory, options?: any) {
-        return ApiApiFp(this.configuration).partialUpdateOpenDataCategory(id, openDataCategory, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {string} id A unique integer value identifying this open data conversion.
-     * @param {OpenDataConversion} [openDataConversion] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public partialUpdateOpenDataConversion(id: string, openDataConversion?: OpenDataConversion, options?: any) {
-        return ApiApiFp(this.configuration).partialUpdateOpenDataConversion(id, openDataConversion, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {string} id A unique integer value identifying this open data food.
-     * @param {OpenDataFood} [openDataFood] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public partialUpdateOpenDataFood(id: string, openDataFood?: OpenDataFood, options?: any) {
-        return ApiApiFp(this.configuration).partialUpdateOpenDataFood(id, openDataFood, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {string} id A unique integer value identifying this open data property.
-     * @param {OpenDataProperty} [openDataProperty] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public partialUpdateOpenDataProperty(id: string, openDataProperty?: OpenDataProperty, options?: any) {
-        return ApiApiFp(this.configuration).partialUpdateOpenDataProperty(id, openDataProperty, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {string} id A unique integer value identifying this open data store.
-     * @param {OpenDataStore} [openDataStore] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public partialUpdateOpenDataStore(id: string, openDataStore?: OpenDataStore, options?: any) {
-        return ApiApiFp(this.configuration).partialUpdateOpenDataStore(id, openDataStore, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {string} id A unique integer value identifying this open data unit.
-     * @param {OpenDataUnit} [openDataUnit] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public partialUpdateOpenDataUnit(id: string, openDataUnit?: OpenDataUnit, options?: any) {
-        return ApiApiFp(this.configuration).partialUpdateOpenDataUnit(id, openDataUnit, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {string} id A unique integer value identifying this open data version.
-     * @param {OpenDataVersion} [openDataVersion] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public partialUpdateOpenDataVersion(id: string, openDataVersion?: OpenDataVersion, options?: any) {
-        return ApiApiFp(this.configuration).partialUpdateOpenDataVersion(id, openDataVersion, options).then((request) => request(this.axios, this.basePath));
-    }
-
     /**
      * 
      * @param {string} id A unique integer value identifying this property.
@@ -22297,17 +18858,6 @@ export class ApiApi extends BaseAPI {
         return ApiApiFp(this.configuration).retrieveExportLog(id, options).then((request) => request(this.axios, this.basePath));
     }
 
-    /**
-     * 
-     * @param {string} id 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public retrieveFDCViewSet(id: string, options?: any) {
-        return ApiApiFp(this.configuration).retrieveFDCViewSet(id, options).then((request) => request(this.axios, this.basePath));
-    }
-
     /**
      * 
      * @param {string} id A unique integer value identifying this food.
@@ -22407,83 +18957,6 @@ export class ApiApi extends BaseAPI {
         return ApiApiFp(this.configuration).retrieveMealType(id, options).then((request) => request(this.axios, this.basePath));
     }
 
-    /**
-     * 
-     * @param {string} id A unique integer value identifying this open data category.
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public retrieveOpenDataCategory(id: string, options?: any) {
-        return ApiApiFp(this.configuration).retrieveOpenDataCategory(id, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {string} id A unique integer value identifying this open data conversion.
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public retrieveOpenDataConversion(id: string, options?: any) {
-        return ApiApiFp(this.configuration).retrieveOpenDataConversion(id, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {string} id A unique integer value identifying this open data food.
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public retrieveOpenDataFood(id: string, options?: any) {
-        return ApiApiFp(this.configuration).retrieveOpenDataFood(id, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {string} id A unique integer value identifying this open data property.
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public retrieveOpenDataProperty(id: string, options?: any) {
-        return ApiApiFp(this.configuration).retrieveOpenDataProperty(id, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {string} id A unique integer value identifying this open data store.
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public retrieveOpenDataStore(id: string, options?: any) {
-        return ApiApiFp(this.configuration).retrieveOpenDataStore(id, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {string} id A unique integer value identifying this open data unit.
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public retrieveOpenDataUnit(id: string, options?: any) {
-        return ApiApiFp(this.configuration).retrieveOpenDataUnit(id, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {string} id A unique integer value identifying this open data version.
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public retrieveOpenDataVersion(id: string, options?: any) {
-        return ApiApiFp(this.configuration).retrieveOpenDataVersion(id, options).then((request) => request(this.axios, this.basePath));
-    }
-
     /**
      * 
      * @param {string} id A unique integer value identifying this property.
@@ -22950,90 +19423,6 @@ export class ApiApi extends BaseAPI {
         return ApiApiFp(this.configuration).updateMealType(id, mealType, options).then((request) => request(this.axios, this.basePath));
     }
 
-    /**
-     * 
-     * @param {string} id A unique integer value identifying this open data category.
-     * @param {OpenDataCategory} [openDataCategory] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public updateOpenDataCategory(id: string, openDataCategory?: OpenDataCategory, options?: any) {
-        return ApiApiFp(this.configuration).updateOpenDataCategory(id, openDataCategory, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {string} id A unique integer value identifying this open data conversion.
-     * @param {OpenDataConversion} [openDataConversion] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public updateOpenDataConversion(id: string, openDataConversion?: OpenDataConversion, options?: any) {
-        return ApiApiFp(this.configuration).updateOpenDataConversion(id, openDataConversion, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {string} id A unique integer value identifying this open data food.
-     * @param {OpenDataFood} [openDataFood] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public updateOpenDataFood(id: string, openDataFood?: OpenDataFood, options?: any) {
-        return ApiApiFp(this.configuration).updateOpenDataFood(id, openDataFood, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {string} id A unique integer value identifying this open data property.
-     * @param {OpenDataProperty} [openDataProperty] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public updateOpenDataProperty(id: string, openDataProperty?: OpenDataProperty, options?: any) {
-        return ApiApiFp(this.configuration).updateOpenDataProperty(id, openDataProperty, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {string} id A unique integer value identifying this open data store.
-     * @param {OpenDataStore} [openDataStore] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public updateOpenDataStore(id: string, openDataStore?: OpenDataStore, options?: any) {
-        return ApiApiFp(this.configuration).updateOpenDataStore(id, openDataStore, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {string} id A unique integer value identifying this open data unit.
-     * @param {OpenDataUnit} [openDataUnit] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public updateOpenDataUnit(id: string, openDataUnit?: OpenDataUnit, options?: any) {
-        return ApiApiFp(this.configuration).updateOpenDataUnit(id, openDataUnit, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @param {string} id A unique integer value identifying this open data version.
-     * @param {OpenDataVersion} [openDataVersion] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public updateOpenDataVersion(id: string, openDataVersion?: OpenDataVersion, options?: any) {
-        return ApiApiFp(this.configuration).updateOpenDataVersion(id, openDataVersion, options).then((request) => request(this.axios, this.basePath));
-    }
-
     /**
      * 
      * @param {string} id A unique integer value identifying this property.

From dc81ca19b973ee00604917dde508e543d37bfa7d Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Tue, 16 Jan 2024 08:06:37 +0800
Subject: [PATCH 46/95] fixed old migrations in shopping tree

---
 .../migrations/0159_add_shoppinglistentry_fields.py    |  3 ++-
 .../migrations/0160_delete_shoppinglist_orphans.py     | 10 ++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/cookbook/migrations/0159_add_shoppinglistentry_fields.py b/cookbook/migrations/0159_add_shoppinglistentry_fields.py
index 9246c9b0..ca7ead35 100644
--- a/cookbook/migrations/0159_add_shoppinglistentry_fields.py
+++ b/cookbook/migrations/0159_add_shoppinglistentry_fields.py
@@ -6,11 +6,12 @@ from django.conf import settings
 from django.db import migrations, models
 from django_scopes import scopes_disabled
 
-from cookbook.models import PermissionModelMixin, ShoppingListEntry
+from cookbook.models import PermissionModelMixin
 
 
 def copy_values_to_sle(apps, schema_editor):
     with scopes_disabled():
+        ShoppingListEntry = apps.get_model('cookbook', 'ShoppingListEntry')
         entries = ShoppingListEntry.objects.all()
         for entry in entries:
             if entry.shoppinglist_set.first():
diff --git a/cookbook/migrations/0160_delete_shoppinglist_orphans.py b/cookbook/migrations/0160_delete_shoppinglist_orphans.py
index 26e08656..6966eae6 100644
--- a/cookbook/migrations/0160_delete_shoppinglist_orphans.py
+++ b/cookbook/migrations/0160_delete_shoppinglist_orphans.py
@@ -1,25 +1,22 @@
 # Generated by Django 3.2.7 on 2021-10-01 22:34
 
-import datetime
 from datetime import timedelta
 
-import django.db.models.deletion
 from django.conf import settings
-from django.db import migrations, models
+from django.db import migrations
 from django.utils import timezone
-from django.utils.timezone import utc
 from django_scopes import scopes_disabled
 
-from cookbook.models import FoodInheritField, ShoppingListEntry
-
 
 def delete_orphaned_sle(apps, schema_editor):
+    ShoppingListEntry = apps.get_model('cookbook', 'ShoppingListEntry')
     with scopes_disabled():
         # shopping list entry is orphaned - delete it
         ShoppingListEntry.objects.filter(shoppinglist=None).delete()
 
 
 def create_inheritfields(apps, schema_editor):
+    FoodInheritField = apps.get_model('cookbook', 'FoodInheritField')
     FoodInheritField.objects.create(name='Supermarket Category', field='supermarket_category')
     FoodInheritField.objects.create(name='On Hand', field='food_onhand')
     FoodInheritField.objects.create(name='Diet', field='diet')
@@ -29,6 +26,7 @@ def create_inheritfields(apps, schema_editor):
 
 
 def set_completed_at(apps, schema_editor):
+    ShoppingListEntry = apps.get_model('cookbook', 'ShoppingListEntry')
     today_start = timezone.now().replace(hour=0, minute=0, second=0)
     # arbitrary - keeping all of the closed shopping list items out of the 'recent' view
     month_ago = today_start - timedelta(days=30)

From 764cd7dba0cf73ead65f9099a13c6841d6578dd8 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Wed, 17 Jan 2024 22:32:34 +0800
Subject: [PATCH 47/95] SLE bulk permission and tests

---
 .../tests/api/test_api_shopping_list_entry.py | 31 +++++++++++++++++--
 cookbook/views/api.py                         |  1 +
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/cookbook/tests/api/test_api_shopping_list_entry.py b/cookbook/tests/api/test_api_shopping_list_entry.py
index 0ea9a2d8..06319bf6 100644
--- a/cookbook/tests/api/test_api_shopping_list_entry.py
+++ b/cookbook/tests/api/test_api_shopping_list_entry.py
@@ -13,7 +13,9 @@ DETAIL_URL = 'api:shoppinglistentry-detail'
 
 @pytest.fixture()
 def obj_1(space_1, u1_s1):
-    e = ShoppingListEntry.objects.create(created_by=auth.get_user(u1_s1), food=Food.objects.get_or_create(name='test 1', space=space_1)[0], space=space_1)
+    e = ShoppingListEntry.objects.create(created_by=auth.get_user(u1_s1),
+                                         food=Food.objects.get_or_create(name='test 1', space=space_1)[0],
+                                         space=space_1)
     s = ShoppingList.objects.create(created_by=auth.get_user(u1_s1), space=space_1, )
     s.entries.add(e)
     return e
@@ -21,7 +23,9 @@ def obj_1(space_1, u1_s1):
 
 @pytest.fixture
 def obj_2(space_1, u1_s1):
-    e = ShoppingListEntry.objects.create(created_by=auth.get_user(u1_s1), food=Food.objects.get_or_create(name='test 2', space=space_1)[0], space=space_1)
+    e = ShoppingListEntry.objects.create(created_by=auth.get_user(u1_s1),
+                                         food=Food.objects.get_or_create(name='test 2', space=space_1)[0],
+                                         space=space_1)
     s = ShoppingList.objects.create(created_by=auth.get_user(u1_s1), space=space_1, )
     s.entries.add(e)
     return e
@@ -79,6 +83,29 @@ def test_update(arg, request, obj_1):
         assert response['amount'] == 2
 
 
+@pytest.mark.parametrize("arg", [
+    ['a_u', 403],
+    ['g1_s1', 403],
+    ['u1_s1', 200],
+    ['a1_s1', 200],
+    ['g1_s2', 403],
+    ['u1_s2', 200],
+    ['a1_s2', 200],
+])
+def test_bulk_update(arg, request, obj_1, obj_2):
+    c = request.getfixturevalue(arg[0])
+    r = c.post(
+        reverse(LIST_URL, ) + 'bulk/',
+        {'ids': [obj_1.id, obj_2.id], 'checked': True},
+        content_type='application/json'
+    )
+    assert r.status_code == arg[1]
+    assert r
+    if r.status_code == 200:
+        obj_1.refresh_from_db()
+        assert obj_1.checked == (arg[0] == 'u1_s1')
+
+
 @pytest.mark.parametrize("arg", [
     ['a_u', 403],
     ['g1_s1', 201],
diff --git a/cookbook/views/api.py b/cookbook/views/api.py
index 60105472..3ee29591 100644
--- a/cookbook/views/api.py
+++ b/cookbook/views/api.py
@@ -1180,6 +1180,7 @@ class ShoppingListEntryViewSet(viewsets.ModelViewSet):
         detail=False,
         methods=['POST'],
         serializer_class=ShoppingListEntryBulkSerializer,
+        permission_classes=[CustomIsUser]
     )
     def bulk(self, request):
         serializer = self.serializer_class(data=request.data)

From eae409da677a97121078363ee6960bf4d1ae4d67 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Fri, 19 Jan 2024 19:36:34 +0800
Subject: [PATCH 48/95] prevent auto sync from running mulitple time

---
 .../ShoppingListView/ShoppingListView.vue     | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 0dbb8fe6..4db5b9b8 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -34,8 +34,9 @@
             <!-- shopping list tab -->
             <b-tab active>
                 <template #title>
-                    <i v-if="!shopping_list_store.currently_updating"
+                    <i v-if="!shopping_list_store.currently_updating && useShoppingListStore().autosync_has_focus"
                        class="fas fa-shopping-cart fa-fw"></i>
+                    <i v-if="!shopping_list_store.currently_updating && !useShoppingListStore().autosync_has_focus" class="fas fa-eye-slash"></i>
                     <b-spinner v-if="shopping_list_store.currently_updating" type="border" small
                                style="width: 1.25em!important; height: 1.25em!important;"></b-spinner>
                     <span class="d-none d-md-inline-block ml-1">
@@ -574,7 +575,7 @@ export default {
         this.shopping_list_store.refreshFromAPI()
         useUserPreferenceStore().loadUserSettings()
         useUserPreferenceStore().loadDeviceSettings()
-        this.setupAutoSync()
+        this.autoSyncLoop()
         this.setupFocusMonitor()
 
     },
@@ -582,25 +583,29 @@ export default {
         useUserPreferenceStore,
         useShoppingListStore,
 
+        /**
+         * setup interval checking for focus every 1000ms and updating the store variable
+         */
         setupFocusMonitor: function () {
             setInterval(() => {
                 useShoppingListStore().autosync_has_focus = document.hasFocus()
             }, 1000);
 
         },
-
-        setupAutoSync: function () {
-            // prevent setting up multiple loops on accident
-            // TODO should this just raise an error?
-            clearInterval(this.autosync_id)
+        /**
+         * recursive function calling autosync after set amount of time has passed
+         */
+        autoSyncLoop: function () {
+            // this should not happen in production but sometimes in development with HMR
+            clearTimeout(this.autosync_id)
             this.autosync_id = undefined
 
             let timeout = Math.max(this.user_preference_store.user_settings.shopping_auto_sync, 1) * 1000 // if disabled (shopping_auto_sync=0) check again after 1 second if enabled
 
-            this.autosync_id = setInterval(() => { //TODO does setInterval automatically loop (because it kind of did)
+            this.autosync_id = setTimeout(() => {
                 if (this.online && this.user_preference_store.user_settings.shopping_auto_sync > 0) {
                     this.shopping_list_store.autosync()
-                    this.setupAutoSync()
+                    this.autoSyncLoop()
                 }
             }, timeout)
         },

From c8a070f4732afd31c7a4811e995d7731e4f868d4 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Fri, 19 Jan 2024 19:42:03 +0800
Subject: [PATCH 49/95] properly display item counter

---
 vue/src/apps/ShoppingListView/ShoppingListView.vue |  4 ++--
 vue/src/stores/ShoppingListStore.js                | 14 ++++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 4db5b9b8..8d31b8e2 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -40,8 +40,8 @@
                     <b-spinner v-if="shopping_list_store.currently_updating" type="border" small
                                style="width: 1.25em!important; height: 1.25em!important;"></b-spinner>
                     <span class="d-none d-md-inline-block ml-1">
-                        {{ $t('Shopping_list') + ` (${Object.keys(shopping_list_store.entries).length})` }}
-                    </span> <!-- TODO properly count only checked -->
+                        {{ $t('Shopping_list') + ` (${shopping_list_store.total_unchecked_food})` }}
+                    </span>
 
                 </template>
 
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index be163cb5..715fa6a4 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -18,6 +18,11 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
         supermarket_categories: [],
         supermarkets: [],
 
+        total_unchecked:0,
+        total_checked:0,
+        total_unchecked_food:0,
+        total_checked_food:0,
+
         // internal
         currently_updating: false,
         last_autosync: null,
@@ -85,10 +90,11 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                 total_unchecked_food += count_unchecked_food
                 total_checked_food += count_checked_food
             }
-            // Vue.set(structure, 'count_unchecked', total_unchecked)
-            // Vue.set(structure, 'count_checked', total_checked)
-            // Vue.set(structure, 'count_unchecked_food', total_unchecked_food)
-            // Vue.set(structure, 'count_checked_food', total_checked_food)
+
+            this.total_unchecked = total_unchecked
+            this.total_checked = total_checked
+            this.total_unchecked_food = total_unchecked_food
+            this.total_checked_food = total_checked_food
 
             // ordering
             if (useUserPreferenceStore().device_settings.shopping_selected_grouping === this.GROUP_CATEGORY && useUserPreferenceStore().device_settings.shopping_selected_supermarket !== null) {

From 05cf7cc081e112dbb9fcb4fd4d116dcbb04343e0 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Fri, 19 Jan 2024 19:55:59 +0800
Subject: [PATCH 50/95] autosync new entries

---
 vue/src/stores/ShoppingListStore.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index 715fa6a4..d4e3d8e3 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -183,7 +183,8 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                 }).then((r) => {
                     r.data.forEach((e) => {
                         // dont update stale client data
-                        if (Date.parse(this.entries[e.id].updated_at) <= Date.parse(e.updated_at)) { //TODO validate the django datetime can be parsed in all browsers
+                         //TODO validate the django datetime can be parsed in all browsers
+                        if (!(e.id in this.entries) || Date.parse(this.entries[e.id].updated_at) <= Date.parse(e.updated_at)) {
                             console.log('updating entry ', e)
                             Vue.set(this.entries, e.id, e)
                         }

From 57100baf7cc33bbe0cda54c2be4f93aee2a93b8a Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Fri, 19 Jan 2024 20:09:46 +0800
Subject: [PATCH 51/95] improved document visibility handling

---
 vue/src/apps/ShoppingListView/ShoppingListView.vue | 14 ++------------
 vue/src/stores/ShoppingListStore.js                |  2 +-
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 8d31b8e2..34debb2c 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -570,28 +570,18 @@ export default {
         window.addEventListener("online", this.updateOnlineStatus)
         window.addEventListener("offline", this.updateOnlineStatus)
 
+        addEventListener("visibilitychange", (event) => {useShoppingListStore().autosync_has_focus = (document.visibilityState === 'visible')});
+
         this.$i18n.locale = window.CUSTOM_LOCALE
 
         this.shopping_list_store.refreshFromAPI()
         useUserPreferenceStore().loadUserSettings()
         useUserPreferenceStore().loadDeviceSettings()
         this.autoSyncLoop()
-        this.setupFocusMonitor()
-
     },
     methods: {
         useUserPreferenceStore,
         useShoppingListStore,
-
-        /**
-         * setup interval checking for focus every 1000ms and updating the store variable
-         */
-        setupFocusMonitor: function () {
-            setInterval(() => {
-                useShoppingListStore().autosync_has_focus = document.hasFocus()
-            }, 1000);
-
-        },
         /**
          * recursive function calling autosync after set amount of time has passed
          */
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index d4e3d8e3..42631ce7 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -26,8 +26,8 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
         // internal
         currently_updating: false,
         last_autosync: null,
+        autosync_has_focus: true,
         undo_stack: [],
-        autosync_has_focus: false,
 
         // constants
         GROUP_CATEGORY: 'food.supermarket_category.name',

From 12db67bd9604cfba8f5dbc1373e950cfe3bbd218 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Fri, 19 Jan 2024 20:48:48 +0800
Subject: [PATCH 52/95] removed unused vars and improved auto sync conditions

---
 .../ShoppingListView/ShoppingListView.vue     | 90 +------------------
 vue/src/stores/ShoppingListStore.js           |  8 +-
 2 files changed, 7 insertions(+), 91 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 34debb2c..546af26c 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -61,7 +61,7 @@
                     </b-col>
                 </b-row>
 
-                <!-- shopping list table -->
+                <!-- --------------------------------------- shopping list table -->
                 <b-row v-for="c in shopping_list_store.get_entries_by_group" v-bind:key="c.id" class="pr-1 pl-1">
                     <b-col cols="12"
                            v-if="c.count_unchecked > 0 || user_preference_store.device_settings.shopping_show_checked_entries && (c.count_unchecked + c.count_checked) > 0">
@@ -88,7 +88,7 @@
                 </b-row>
 
             </b-tab>
-            <!-- recipe tab -->
+            <!-- --------------------------------------- recipe tab -->
             <b-tab :title="$t('Recipes')">
                 <template #title>
                     <i class="fas fa-book fa-fw"></i>
@@ -126,7 +126,7 @@
                     </b-col>
                 </b-row>
             </b-tab>
-            <!-- supermarkets tab -->
+            <!-- --------------------------------------- supermarkets tab -->
             <b-tab>
                 <template #title>
                     <i class="fas fa-store-alt fa-fw"></i>
@@ -328,7 +328,7 @@
                     </div>
                 </div>
             </b-tab>
-            <!-- settings tab -->
+            <!-- --------------------------------------- settings tab -->
             <b-tab>
                 <template #title>
                     <i class="fas fa-user-cog fa-fw"></i>
@@ -502,44 +502,19 @@ export default {
 
     data() {
         return {
-            // this.Models and this.Actions inherited from ApiMixin
-            items: [],
             current_tab: 0,
 
-            supermarkets: [],
-            shopping_categories: [],
-            show_undefined_categories: true,
-            supermarket_categories_only: false,
-            shopcat: null,
-            delay: 0,
-            generic_action: null,
-            generic_model: null,
-            ui: {
-                entry_mode_simple: true,
-                selected_supermarket: undefined,
-            },
-
             user_id: parseInt(localStorage.getItem('USER_ID')),
             editing_supermarket_categories: [],
             editing_supermarket: null,
             new_supermarket: {entrymode: false, value: undefined, editmode: undefined},
             new_category: {entrymode: false, value: undefined},
             autosync_id: undefined,
-            auto_sync_running: false, // track to not start a new sync before old one was finished
-            auto_sync_blocked: false, // blocking auto sync while request to check item is still running
-            show_delay: false,
-            drag: false,
-            show_modal: false,
-            fields: ["checked", "amount", "category", "unit", "food", "recipe", "details"],
-            loading: true,
-            entrymode: false,
             new_item: {amount: 1, unit: undefined, food: undefined, ingredient: undefined},
             online: true,
             new_recipe: {
                 id: undefined,
             },
-            add_recipe_servings: 1,
-            shopping_list_height: '60vh',
 
             shopping_list_store: useShoppingListStore(),
             user_preference_store: useUserPreferenceStore(),
@@ -658,63 +633,6 @@ export default {
                 StandardToasts.makeStandardToast(this, StandardToasts.FAIL_DELETE, err)
             })
         },
-        getShoppingList: function (autosync = false) {
-            let params = {}
-            params.supermarket = this.ui.selected_supermarket
-
-            params.options = {query: {recent: 1}}
-            if (autosync) {
-                params.options.query["autosync"] = 1
-            } else {
-                this.loading = true
-            }
-            // this.genericAPI(this.Models.SHOPPING_LIST, this.Actions.LIST, params).then((results) => {
-            //     if (!autosync) {
-            //         if (results.data?.length) {
-            //             this.items = results.data
-            //         } else {
-            //             console.log("no data returned")
-            //         }
-            //         this.loading = false
-            //     } else {
-            //         if (!this.auto_sync_blocked) {
-            //             this.getSyncQueueLength().then((r) => {
-            //                 if (r === 0) {
-            //                     this.mergeShoppingList(results.data)
-            //                 } else {
-            //                     this.auto_sync_running = false
-            //                     this.replaySyncQueue()
-            //                 }
-            //             })
-            //         }
-            //     }
-            // })
-            //     .catch((err) => {
-            //         if (!autosync) {
-            //             StandardToasts.makeStandardToast(this, StandardToasts.FAIL_FETCH, err)
-            //         }
-            //     })
-        },
-        mergeShoppingList: function (data) {
-            this.items.map((x) =>
-                data.map((y) => {
-                    if (y.id === x.id) {
-                        x.checked = y.checked
-                        return x
-                    }
-                })
-            )
-            this.auto_sync_running = false
-            let new_entries = data.map((x) => x.id).filter((y) => !this.items.map((z) => z.id).includes(y))
-            if (new_entries.length > 0) {
-                let api = new ApiApiFactory()
-                new_entries.forEach((new_id) => {
-                    api.retrieveShoppingListEntry(new_id).then((result) => {
-                        this.items.push(result.data)
-                    })
-                })
-            }
-        },
 
         onHand: function (item) {
             let api = new ApiApiFactory()
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index 42631ce7..1bd24dd1 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -171,7 +171,6 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
         },
         autosync() {
             if (!this.currently_updating && this.autosync_has_focus) {
-                console.log('running autosync')
                 this.currently_updating = true
 
                 let previous_autosync = this.last_autosync
@@ -183,15 +182,14 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                 }).then((r) => {
                     r.data.forEach((e) => {
                         // dont update stale client data
-                         //TODO validate the django datetime can be parsed in all browsers
-                        if (!(e.id in this.entries) || Date.parse(this.entries[e.id].updated_at) <= Date.parse(e.updated_at)) {
-                            console.log('updating entry ', e)
+                        if (!(Object.keys(this.entries).includes(e.id.toString())) || Date.parse(this.entries[e.id].updated_at) < Date.parse(e.updated_at)) {
+                            console.log('auto sync updating entry ', e)
                             Vue.set(this.entries, e.id, e)
                         }
                     })
                     this.currently_updating = false
                 }).catch((err) => {
-                    console.log('auto sync failed')
+                    console.warn('auto sync failed')
                     this.currently_updating = false
                 })
             }

From e321c80dd6fb048a75416d555bbce1368365f1fb Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Fri, 19 Jan 2024 21:42:48 +0800
Subject: [PATCH 53/95] debugging

---
 vue/src/apps/ShoppingListView/ShoppingListView.vue | 5 +++++
 vue/src/stores/UserPreferenceStore.js              | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 546af26c..28b30986 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -553,6 +553,10 @@ export default {
         useUserPreferenceStore().loadUserSettings()
         useUserPreferenceStore().loadDeviceSettings()
         this.autoSyncLoop()
+
+        setInterval(() => {
+            this.getSyncQueueLength()
+        },1000)
     },
     methods: {
         useUserPreferenceStore,
@@ -594,6 +598,7 @@ export default {
             const wb = new Workbox('/service-worker.js');
             wb.register();
             return wb.messageSW({type: 'BGSYNC_COUNT_QUEUE'}).then((r) => {
+                console.log('sync que length :', r)
                 return r
             })
         },
diff --git a/vue/src/stores/UserPreferenceStore.js b/vue/src/stores/UserPreferenceStore.js
index 8328c3d0..b358ff83 100644
--- a/vue/src/stores/UserPreferenceStore.js
+++ b/vue/src/stores/UserPreferenceStore.js
@@ -94,10 +94,10 @@ export const useUserPreferenceStore = defineStore(_STORE_ID, {
                 for (s in settings) {
                     Vue.set(this.user_settings, s, settings[s])
                 }
-                console.log(`loaded local user settings age ${((new Date().getTime()) - this.user_settings.locally_updated_at) / 1000} `)
+                //console.log(`loaded local user settings age ${((new Date().getTime()) - this.user_settings.locally_updated_at) / 1000} `)
             }
             if (((new Date().getTime()) - this.user_settings.locally_updated_at) > _STALE_TIME_IN_MS) {
-                console.log('refreshing user settings from API')
+                //console.log('refreshing user settings from API')
                 let apiClient = new ApiApiFactory()
                 apiClient.retrieveUserPreference(localStorage.getItem('USER_ID')).then(r => {
                     for (s in r.data) {

From ff77aa7268b8552276ce1b66d95c8a65a4cc61b0 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Fri, 19 Jan 2024 21:59:49 +0800
Subject: [PATCH 54/95] added method descirption

---
 vue/src/stores/ShoppingListStore.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index 1bd24dd1..a008babb 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -169,6 +169,10 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                 })
             }
         },
+        /**
+         * perform auto sync request to special endpoint returning only entries changed since last auto sync
+         * only updates local entries that are older than the server version
+         */
         autosync() {
             if (!this.currently_updating && this.autosync_has_focus) {
                 this.currently_updating = true

From 71ea67dc3002aa2f4ccee3a0470d9074ae151fc5 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sat, 20 Jan 2024 00:18:45 +0800
Subject: [PATCH 55/95] sync check items in background

---
 .../ShoppingListView/ShoppingListView.vue     | 31 +------
 vue/src/locales/en.json                       |  1 +
 vue/src/stores/ShoppingListStore.js           | 84 +++++++++++++++++--
 3 files changed, 79 insertions(+), 37 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 28b30986..14a1612d 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -1,6 +1,8 @@
 <template>
     <div id="app">
-        <b-alert :show="!online" dismissible class="small float-up" variant="warning">{{ $t("OfflineAlert") }}</b-alert>
+        <b-alert :show="shopping_list_store.has_failed_items" dismissible class="float-up mt-2" variant="warning">
+            {{$t('ShoppingBackgroundSyncWarning')}}
+        </b-alert>
 
 
         <div class="row float-top w-100">
@@ -578,33 +580,6 @@ export default {
                 }
             }, timeout)
         },
-        /**
-         * failed requests to sync entry check events are automatically re-queued by the service worker for sync
-         * this command allows to manually force replaying those events before re-enabling automatic sync
-         */
-        replaySyncQueue: function () {
-            const wb = new Workbox('/service-worker.js');
-            wb.register();
-            wb.messageSW({type: 'BGSYNC_REPLAY_REQUESTS'}).then((r) => {
-                console.log('Background sync queue replayed!', r);
-            })
-        },
-        /**
-         * get the number of entries left in the sync queue for entry check events
-         * @returns {Promise<Number>} promise resolving to the number of entries left
-         */
-        //TODO maybe show this somewhere if efficient enough to run often
-        getSyncQueueLength: function () {
-            const wb = new Workbox('/service-worker.js');
-            wb.register();
-            return wb.messageSW({type: 'BGSYNC_COUNT_QUEUE'}).then((r) => {
-                console.log('sync que length :', r)
-                return r
-            })
-        },
-        setFocus() {
-            this.$refs['amount_input_simple'].focus()
-        },
         /**
          * get ingredient from input string and create new shopping list entry using it
          */
diff --git a/vue/src/locales/en.json b/vue/src/locales/en.json
index 022e5d60..35f9ed5c 100644
--- a/vue/src/locales/en.json
+++ b/vue/src/locales/en.json
@@ -303,6 +303,7 @@
 	"ShowRecentlyCompleted": "Show recently completed items",
 	"Completed": "Completed",
 	"OfflineAlert": "You are offline, shopping list may not syncronize.",
+	"ShoppingBackgroundSyncWarning": "Due to bad connectivity some changes could not be synchronized. Automatically retrying when connection becomes available.",
 	"shopping_share": "Share Shopping List",
 	"shopping_auto_sync": "Autosync",
 	"one_url_per_line": "One URL per line",
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index a008babb..1a0fca25 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -18,10 +18,10 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
         supermarket_categories: [],
         supermarkets: [],
 
-        total_unchecked:0,
-        total_checked:0,
-        total_unchecked_food:0,
-        total_checked_food:0,
+        total_unchecked: 0,
+        total_checked: 0,
+        total_unchecked_food: 0,
+        total_checked_food: 0,
 
         // internal
         currently_updating: false,
@@ -29,6 +29,9 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
         autosync_has_focus: true,
         undo_stack: [],
 
+        queue_timeout_id: undefined,
+        item_check_sync_queue: {},
+
         // constants
         GROUP_CATEGORY: 'food.supermarket_category.name',
         GROUP_CREATED_BY: 'created_by.display_name',
@@ -135,6 +138,17 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                 'translatable_label': 'Recipe'
             }]
         },
+        /**
+         * checks if failed items are contained in the sync queue
+         */
+        has_failed_items: function () {
+            for (let i in this.item_check_sync_queue) {
+                if (this.item_check_sync_queue[i]['status'] === 'syncing_failed_before' || this.item_check_sync_queue[i]['status'] === 'waiting_failed_before') {
+                    return true
+                }
+            }
+            return false
+        }
     },
     actions: {
         /**
@@ -315,12 +329,64 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                 entry_id_list.push(i)
             }
 
-            let apiClient = new ApiApiFactory()
-            apiClient.bulkShoppingListEntry({'ids': entry_id_list, 'checked': checked}).then((r) => {
-
-            }).catch((err) => {
-                StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
+            this.item_check_sync_queue
+            Vue.set(this.item_check_sync_queue, Math.random(), {
+                'ids': entry_id_list,
+                'checked': checked,
+                'status': 'waiting'
             })
+            this.runSyncQueue(5)
+        },
+        /**
+         * go through the list of queued requests and try to run them
+         * add request back to queue if it fails due to offline or timeout
+         * Do NOT call this method directly, always call using runSyncQueue method to prevent simultaneous runs
+         * @private
+         */
+        _replaySyncQueue() {
+            if (navigator.onLine || document.location.href.includes('localhost')) {
+                let apiClient = new ApiApiFactory()
+                let promises = []
+                //TODO merge entries with same checked state before updating?
+
+                for (let i in this.item_check_sync_queue) {
+                    let entry = this.item_check_sync_queue[i]
+                    Vue.set(entry, 'status', ((entry['status'] === 'waiting') ? 'syncing' : 'syncing_failed_before'))
+                    Vue.set(this.item_check_sync_queue, i, entry)
+
+                    let p = apiClient.bulkShoppingListEntry(entry, {timeout: 15000}).then((r) => {
+                        Vue.delete(this.item_check_sync_queue, i)
+                    }).catch((err) => {
+                        if (err.code === "ERR_NETWORK" || err.code === "ECONNABORTED") {
+                            Vue.set(entry, 'status', 'waiting_failed_before')
+                            Vue.set(this.item_check_sync_queue, i, entry)
+                        } else {
+                            Vue.delete(this.item_check_sync_queue, i)
+                            console.error('Failed API call for entry ', entry)
+                            StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
+                        }
+                    })
+                    promises.push(p)
+                }
+
+                Promise.allSettled(promises).finally(r => {
+                    this.runSyncQueue(500)
+                })
+            } else {
+                this.runSyncQueue(5000)
+            }
+        },
+        /**
+         * manages running the replaySyncQueue function after the given timeout
+         * calling this function might cancel a previously created timeout
+         * @param timeout time in ms after which to run the replaySyncQueue function
+         */
+        runSyncQueue(timeout) {
+            clearTimeout(this.queue_timeout_id)
+
+            this.queue_timeout_id = setTimeout(() => {
+                this._replaySyncQueue()
+            }, timeout)
         },
         /**
          * function to handle user "delaying" and "undelaying" shopping entries

From 7de9758ee19cb10876484c2a60c6b49a65f698fa Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sat, 20 Jan 2024 02:17:48 +0800
Subject: [PATCH 56/95] auto sync proper data merging

---
 cookbook/serializer.py                             |  2 +-
 cookbook/views/api.py                              |  8 ++++++--
 vue/src/apps/ShoppingListView/ShoppingListView.vue |  7 +------
 vue/src/stores/ShoppingListStore.js                | 10 ++++++++--
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/cookbook/serializer.py b/cookbook/serializer.py
index eb91081d..d0ad0bfa 100644
--- a/cookbook/serializer.py
+++ b/cookbook/serializer.py
@@ -1152,7 +1152,7 @@ class ShoppingListEntrySerializer(WritableNestedModelSerializer):
             'recipe_mealplan',
             'created_by', 'created_at', 'updated_at', 'completed_at', 'delay_until'
         )
-        read_only_fields = ('id', 'created_by', 'created_at',)
+        read_only_fields = ('id', 'created_by', 'created_at','updated_at',)
 
 
 class ShoppingListEntryBulkSerializer(serializers.Serializer):
diff --git a/cookbook/views/api.py b/cookbook/views/api.py
index 3ee29591..d0d82fa8 100644
--- a/cookbook/views/api.py
+++ b/cookbook/views/api.py
@@ -1168,7 +1168,8 @@ class ShoppingListEntryViewSet(viewsets.ModelViewSet):
         try:
             last_autosync = self.request.query_params.get('last_autosync', None)
             if last_autosync:
-                last_autosync = make_aware(datetime.datetime.fromtimestamp(int(last_autosync) / 1000))
+
+                last_autosync = datetime.datetime.fromtimestamp(int(last_autosync) / 1000, datetime.timezone.utc)
                 self.queryset = self.queryset.filter(updated_at__gte=last_autosync)
         except:
             traceback.print_exc()
@@ -1189,7 +1190,10 @@ class ShoppingListEntryViewSet(viewsets.ModelViewSet):
                 Q(created_by=self.request.user)
                 | Q(shoppinglist__shared=self.request.user)
                 | Q(created_by__in=list(self.request.user.get_shopping_share()))
-            ).filter(space=request.space, id__in=serializer.validated_data['ids']).update(checked=serializer.validated_data['checked'])
+            ).filter(space=request.space, id__in=serializer.validated_data['ids']).update(
+                checked=serializer.validated_data['checked'],
+                updated_at=timezone.now(),
+            )
             return Response(serializer.data)
         else:
             return Response(serializer.errors, 400)
diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 14a1612d..f2b37a86 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -1,10 +1,9 @@
 <template>
     <div id="app">
-        <b-alert :show="shopping_list_store.has_failed_items" dismissible class="float-up mt-2" variant="warning">
+        <b-alert :show="shopping_list_store.has_failed_items" class="float-up mt-2" variant="warning">
             {{$t('ShoppingBackgroundSyncWarning')}}
         </b-alert>
 
-
         <div class="row float-top w-100">
             <div class="col-auto no-gutter ml-auto">
                 <b-button variant="link" @click="useShoppingListStore().undoChange()"><i class="fas fa-undo"></i>
@@ -555,10 +554,6 @@ export default {
         useUserPreferenceStore().loadUserSettings()
         useUserPreferenceStore().loadDeviceSettings()
         this.autoSyncLoop()
-
-        setInterval(() => {
-            this.getSyncQueueLength()
-        },1000)
     },
     methods: {
         useUserPreferenceStore,
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index 1a0fca25..c4791f1a 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -157,6 +157,8 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
         refreshFromAPI() {
             if (!this.currently_updating) {
                 this.currently_updating = true
+                this.last_autosync = new Date().getTime();
+
                 let apiClient = new ApiApiFactory()
                 apiClient.listShoppingListEntrys().then((r) => {
                     this.entries = {}
@@ -189,6 +191,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
          */
         autosync() {
             if (!this.currently_updating && this.autosync_has_focus) {
+
                 this.currently_updating = true
 
                 let previous_autosync = this.last_autosync
@@ -200,6 +203,8 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                 }).then((r) => {
                     r.data.forEach((e) => {
                         // dont update stale client data
+                        console.log('new: ', !(Object.keys(this.entries).includes(e.id.toString())), ' updated at ', Date.parse(this.entries[e.id].updated_at) < Date.parse(e.updated_at))
+                        console.log('client updated at ', this.entries[e.id].updated_at,Date.parse(this.entries[e.id].updated_at), ' server updated at ', e.updated_at,Date.parse(e.updated_at))
                         if (!(Object.keys(this.entries).includes(e.id.toString())) || Date.parse(this.entries[e.id].updated_at) < Date.parse(e.updated_at)) {
                             console.log('auto sync updating entry ', e)
                             Vue.set(this.entries, e.id, e)
@@ -242,7 +247,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
             let apiClient = new ApiApiFactory()
             // sets the update_at timestamp on the client to prevent auto sync from overriding with older changes
             // moment().format() yields locale aware datetime without ms 2024-01-04T13:39:08.607238+01:00
-            Vue.set(object, 'update_at', moment().format())
+            Vue.set(object, 'updated_at', moment().format())
 
             return apiClient.updateShoppingListEntry(object.id, object).then((r) => {
                 Vue.set(this.entries, r.data.id, r.data)
@@ -321,11 +326,12 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
             if (undo) {
                 this.registerChange((checked ? 'CHECKED' : 'UNCHECKED'), entries)
             }
+            console.log('entry changed at ', Date.now(), ' setting to ', moment().format())
 
             let entry_id_list = []
             for (let i in entries) {
                 Vue.set(this.entries[i], 'checked', checked)
-                Vue.set(this.entries[i], 'update_at', moment().format())
+                Vue.set(this.entries[i], 'updated_at', moment().format())
                 entry_id_list.push(i)
             }
 

From 7d749798594729d1f14108efd71258732da7ad98 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sat, 20 Jan 2024 02:37:28 +0800
Subject: [PATCH 57/95] properly edit settings

---
 .../ShoppingListView/ShoppingListView.vue     | 34 +++-----
 .../Settings/ShoppingSettingsComponent.vue    | 77 +++++++------------
 vue/src/stores/ShoppingListStore.js           |  4 +-
 vue/src/stores/UserPreferenceStore.js         |  7 +-
 4 files changed, 46 insertions(+), 76 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index f2b37a86..396b0f21 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -1,7 +1,7 @@
 <template>
     <div id="app">
         <b-alert :show="shopping_list_store.has_failed_items" class="float-up mt-2" variant="warning">
-            {{$t('ShoppingBackgroundSyncWarning')}}
+            {{ $t('ShoppingBackgroundSyncWarning') }}
         </b-alert>
 
         <div class="row float-top w-100">
@@ -37,7 +37,8 @@
                 <template #title>
                     <i v-if="!shopping_list_store.currently_updating && useShoppingListStore().autosync_has_focus"
                        class="fas fa-shopping-cart fa-fw"></i>
-                    <i v-if="!shopping_list_store.currently_updating && !useShoppingListStore().autosync_has_focus" class="fas fa-eye-slash"></i>
+                    <i v-if="!shopping_list_store.currently_updating && !useShoppingListStore().autosync_has_focus"
+                       class="fas fa-eye-slash"></i>
                     <b-spinner v-if="shopping_list_store.currently_updating" type="border" small
                                style="width: 1.25em!important; height: 1.25em!important;"></b-spinner>
                     <span class="d-none d-md-inline-block ml-1">
@@ -337,8 +338,7 @@
                 </template>
                 <div class="row justify-content-center">
                     <div class="col-12 col-md-8">
-                        <shopping-settings-component @updated="user_preference_store.updateUserSettings()"
-                                                     :user_id="user_id"></shopping-settings-component>
+                        <shopping-settings-component></shopping-settings-component>
                     </div>
                 </div>
             </b-tab>
@@ -512,7 +512,6 @@ export default {
             new_category: {entrymode: false, value: undefined},
             autosync_id: undefined,
             new_item: {amount: 1, unit: undefined, food: undefined, ingredient: undefined},
-            online: true,
             new_recipe: {
                 id: undefined,
             },
@@ -543,15 +542,14 @@ export default {
     },
     watch: {},
     mounted() {
-        window.addEventListener("online", this.updateOnlineStatus)
-        window.addEventListener("offline", this.updateOnlineStatus)
-
-        addEventListener("visibilitychange", (event) => {useShoppingListStore().autosync_has_focus = (document.visibilityState === 'visible')});
+        addEventListener("visibilitychange", (event) => {
+            useShoppingListStore().autosync_has_focus = (document.visibilityState === 'visible')
+        });
 
         this.$i18n.locale = window.CUSTOM_LOCALE
 
         this.shopping_list_store.refreshFromAPI()
-        useUserPreferenceStore().loadUserSettings()
+        useUserPreferenceStore().loadUserSettings(true)
         useUserPreferenceStore().loadDeviceSettings()
         this.autoSyncLoop()
     },
@@ -567,12 +565,12 @@ export default {
             this.autosync_id = undefined
 
             let timeout = Math.max(this.user_preference_store.user_settings.shopping_auto_sync, 1) * 1000 // if disabled (shopping_auto_sync=0) check again after 1 second if enabled
-
+            console.log('setting', this.user_preference_store.user_settings.shopping_auto_sync, 'timeout ', timeout)
             this.autosync_id = setTimeout(() => {
-                if (this.online && this.user_preference_store.user_settings.shopping_auto_sync > 0) {
+                if (this.user_preference_store.user_settings.shopping_auto_sync > 0) {
                     this.shopping_list_store.autosync()
-                    this.autoSyncLoop()
                 }
+                this.autoSyncLoop()
             }, timeout)
         },
         /**
@@ -659,7 +657,7 @@ export default {
         checkGroup(group, checked_state) {
             let all_entries = {}
             for (let f in group.foods) {
-                all_entries = Object.assign({},all_entries, group.foods[f].entries)
+                all_entries = Object.assign({}, all_entries, group.foods[f].entries)
             }
             useShoppingListStore().setEntriesCheckedState(all_entries, checked_state, true)
         },
@@ -881,14 +879,6 @@ export default {
                 })
             }
         },
-        updateOnlineStatus(e) {
-            const {type} = e
-            this.online = type === "online"
-        },
-        beforeDestroy() {
-            window.removeEventListener("online", this.updateOnlineStatus)
-            window.removeEventListener("offline", this.updateOnlineStatus)
-        },
         /**
          * open standard shopping modal to add selected recipe to shopping list
          * @param recipe recipe object to add to shopping
diff --git a/vue/src/components/Settings/ShoppingSettingsComponent.vue b/vue/src/components/Settings/ShoppingSettingsComponent.vue
index dfa96319..945e0866 100644
--- a/vue/src/components/Settings/ShoppingSettingsComponent.vue
+++ b/vue/src/components/Settings/ShoppingSettingsComponent.vue
@@ -1,10 +1,10 @@
 <template>
-    <div v-if="user_preferences !== undefined">
+    <div v-if="useUserPreferenceStore().user_settings !== undefined">
         <b-form-group :label="$t('shopping_share')" :description="$t('shopping_share_desc')">
             <generic-multiselect
-                @change="user_preferences.shopping_share = $event.val; updateSettings(false)"
+                @change="useUserPreferenceStore().user_settings.shopping_share = $event.val; updateSettings(false)"
                 :model="Models.USER"
-                :initial_selection="user_preferences.shopping_share"
+                :initial_selection="useUserPreferenceStore().user_settings.shopping_share"
                 label="display_name"
                 :multiple="true"
                 :placeholder="$t('User')"
@@ -12,101 +12,95 @@
         </b-form-group>
 
         <b-form-group :label="$t('shopping_auto_sync')" :description="$t('shopping_auto_sync_desc')">
-            <b-form-input type="range" :min="SHOPPING_MIN_AUTOSYNC_INTERVAL" max="60" step="1" v-model="user_preferences.shopping_auto_sync"
+            <b-form-input type="range" :min="SHOPPING_MIN_AUTOSYNC_INTERVAL" max="60" step="1" v-model="useUserPreferenceStore().user_settings.shopping_auto_sync"
                           @change="updateSettings(false)"></b-form-input>
             <div class="text-center">
-                <span v-if="user_preferences.shopping_auto_sync > 0">
-                    {{ Math.round(user_preferences.shopping_auto_sync) }}
-                    <span v-if="user_preferences.shopping_auto_sync === 1">{{ $t('Second') }}</span>
+                <span v-if="useUserPreferenceStore().user_settings.shopping_auto_sync > 0">
+                    {{ Math.round(useUserPreferenceStore().user_settings.shopping_auto_sync) }}
+                    <span v-if="useUserPreferenceStore().user_settings.shopping_auto_sync === 1">{{ $t('Second') }}</span>
                     <span v-else> {{ $t('Seconds') }}</span>
                 </span>
 
-                <span v-if="user_preferences.shopping_auto_sync < 1">{{ $t('Disable') }}</span>
+                <span v-if="useUserPreferenceStore().user_settings.shopping_auto_sync < 1">{{ $t('Disable') }}</span>
             </div>
             <br/>
-                <b-button class="btn btn-sm" @click="user_preferences.shopping_auto_sync = 0; updateSettings(false)">{{ $t('Disabled') }}</b-button>
+                <b-button class="btn btn-sm" @click="useUserPreferenceStore().user_settings.shopping_auto_sync = 0; updateSettings(false)">{{ $t('Disabled') }}</b-button>
         </b-form-group>
 
         <b-form-group :description="$t('mealplan_autoadd_shopping_desc')">
-            <b-form-checkbox v-model="user_preferences.mealplan_autoadd_shopping"
+            <b-form-checkbox v-model="useUserPreferenceStore().user_settings.mealplan_autoadd_shopping"
                              @change="updateSettings(false)">{{ $t('mealplan_autoadd_shopping') }}
             </b-form-checkbox>
         </b-form-group>
 
         <b-form-group :description="$t('mealplan_autoexclude_onhand_desc')">
-            <b-form-checkbox v-model="user_preferences.mealplan_autoexclude_onhand"
+            <b-form-checkbox v-model="useUserPreferenceStore().user_settings.mealplan_autoexclude_onhand"
                              @change="updateSettings(false)">{{ $t('mealplan_autoexclude_onhand') }}
             </b-form-checkbox>
         </b-form-group>
 
         <b-form-group :description="$t('mealplan_autoinclude_related_desc')">
-            <b-form-checkbox v-model="user_preferences.mealplan_autoinclude_related"
+            <b-form-checkbox v-model="useUserPreferenceStore().user_settings.mealplan_autoinclude_related"
                              @change="updateSettings(false)">{{ $t('mealplan_autoinclude_related') }}
             </b-form-checkbox>
         </b-form-group>
 
         <b-form-group :description="$t('shopping_add_onhand_desc')">
-            <b-form-checkbox v-model="user_preferences.shopping_add_onhand"
+            <b-form-checkbox v-model="useUserPreferenceStore().user_settings.shopping_add_onhand"
                              @change="updateSettings(false)">{{ $t('shopping_add_onhand') }}
             </b-form-checkbox>
         </b-form-group>
 
         <b-form-group :label="$t('default_delay')" :description="$t('default_delay_desc')">
-            <b-form-input type="range" min="1" max="72" step="1" v-model="user_preferences.default_delay"
+            <b-form-input type="range" min="1" max="72" step="1" v-model="useUserPreferenceStore().user_settings.default_delay"
                           @change="updateSettings(false)"></b-form-input>
             <div class="text-center">
-                <span>{{ Math.round(user_preferences.default_delay) }}
-                    <span v-if="user_preferences.default_delay === 1">{{ $t('Hour') }}</span>
+                <span>{{ Math.round(useUserPreferenceStore().user_settings.default_delay) }}
+                    <span v-if="useUserPreferenceStore().user_settings.default_delay === 1">{{ $t('Hour') }}</span>
                     <span v-else> {{ $t('Hours') }}</span>
                 </span>
             </div>
         </b-form-group>
 
         <b-form-group :description="$t('filter_to_supermarket_desc')">
-            <b-form-checkbox v-model="user_preferences.filter_to_supermarket"
+            <b-form-checkbox v-model="useUserPreferenceStore().user_settings.filter_to_supermarket"
                              @change="updateSettings(false)">{{ $t('filter_to_supermarket') }}
             </b-form-checkbox>
         </b-form-group>
 
         <b-form-group :label="$t('shopping_recent_days')" :description="$t('shopping_recent_days_desc')">
-            <b-form-input type="range" min="0" max="14" step="1" v-model="user_preferences.shopping_recent_days"
+            <b-form-input type="range" min="0" max="14" step="1" v-model="useUserPreferenceStore().user_settings.shopping_recent_days"
                           @change="updateSettings(false)"></b-form-input>
             <div class="text-center">
-                <span>{{ Math.round(user_preferences.shopping_recent_days) }}
-                    <span v-if="user_preferences.shopping_recent_days === 1">{{ $t('Day') }}</span>
+                <span>{{ Math.round(useUserPreferenceStore().user_settings.shopping_recent_days) }}
+                    <span v-if="useUserPreferenceStore().user_settings.shopping_recent_days === 1">{{ $t('Day') }}</span>
                     <span v-else> {{ $t('Days') }}</span>
                 </span>
             </div>
         </b-form-group>
 
         <b-form-group :label="$t('csv_delim_label')" :description="$t('csv_delim_help')">
-            <b-form-input v-model="user_preferences.csv_delim" @change="updateSettings(false)"></b-form-input>
+            <b-form-input v-model="useUserPreferenceStore().user_settings.csv_delim" @change="updateSettings(false)"></b-form-input>
         </b-form-group>
 
         <b-form-group :label="$t('csv_prefix_label')" :description="$t('csv_prefix_help')">
-            <b-form-input v-model="user_preferences.csv_prefix" @change="updateSettings(false)"></b-form-input>
+            <b-form-input v-model="useUserPreferenceStore().user_settings.csv_prefix" @change="updateSettings(false)"></b-form-input>
         </b-form-group>
 
     </div>
 </template>
 
 <script>
-import {ApiApiFactory} from "@/utils/openapi/api";
 import {ApiMixin, StandardToasts} from "@/utils/utils";
 
-import axios from "axios";
 import GenericMultiselect from "@/components/GenericMultiselect";
-
-axios.defaults.xsrfCookieName = 'csrftoken'
-axios.defaults.xsrfHeaderName = "X-CSRFTOKEN"
+import {useUserPreferenceStore} from "@/stores/UserPreferenceStore";
 
 export default {
     name: "ShoppingSettingsComponent",
     mixins: [ApiMixin],
     components: {GenericMultiselect},
-    props: {
-        user_id: Number,
-    },
+    props: { },
     data() {
         return {
             user_preferences: undefined,
@@ -115,30 +109,15 @@ export default {
         }
     },
     mounted() {
-        this.user_preferences = this.preferences
         this.languages = window.AVAILABLE_LANGUAGES
-        this.loadSettings()
+
+        useUserPreferenceStore().loadUserSettings(false)
     },
     methods: {
-        loadSettings: function () {
-            let apiFactory = new ApiApiFactory()
-            apiFactory.retrieveUserPreference(this.user_id.toString()).then(result => {
-                this.user_preferences = result.data
-            }).catch(err => {
-                StandardToasts.makeStandardToast(this, StandardToasts.FAIL_FETCH, err)
-            })
-        },
+        useUserPreferenceStore,
         updateSettings: function (reload) {
-            let apiFactory = new ApiApiFactory()
             this.$emit('updated', this.user_preferences)
-            apiFactory.partialUpdateUserPreference(this.user_id.toString(), this.user_preferences).then(result => {
-                StandardToasts.makeStandardToast(this, StandardToasts.SUCCESS_UPDATE)
-                if (reload) {
-                    location.reload()
-                }
-            }).catch(err => {
-                StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
-            })
+            useUserPreferenceStore().updateUserSettings()
         },
     }
 }
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index c4791f1a..732298d0 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -191,6 +191,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
          */
         autosync() {
             if (!this.currently_updating && this.autosync_has_focus) {
+                console.log('running autosync')
 
                 this.currently_updating = true
 
@@ -203,8 +204,6 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                 }).then((r) => {
                     r.data.forEach((e) => {
                         // dont update stale client data
-                        console.log('new: ', !(Object.keys(this.entries).includes(e.id.toString())), ' updated at ', Date.parse(this.entries[e.id].updated_at) < Date.parse(e.updated_at))
-                        console.log('client updated at ', this.entries[e.id].updated_at,Date.parse(this.entries[e.id].updated_at), ' server updated at ', e.updated_at,Date.parse(e.updated_at))
                         if (!(Object.keys(this.entries).includes(e.id.toString())) || Date.parse(this.entries[e.id].updated_at) < Date.parse(e.updated_at)) {
                             console.log('auto sync updating entry ', e)
                             Vue.set(this.entries, e.id, e)
@@ -326,7 +325,6 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
             if (undo) {
                 this.registerChange((checked ? 'CHECKED' : 'UNCHECKED'), entries)
             }
-            console.log('entry changed at ', Date.now(), ' setting to ', moment().format())
 
             let entry_id_list = []
             for (let i in entries) {
diff --git a/vue/src/stores/UserPreferenceStore.js b/vue/src/stores/UserPreferenceStore.js
index b358ff83..4dc9b2d5 100644
--- a/vue/src/stores/UserPreferenceStore.js
+++ b/vue/src/stores/UserPreferenceStore.js
@@ -3,6 +3,7 @@ import {defineStore} from 'pinia'
 
 import {ApiApiFactory, UserPreference} from "@/utils/openapi/api";
 import Vue from "vue";
+import {StandardToasts} from "@/utils/utils";
 
 const _STALE_TIME_IN_MS = 1000 * 30
 const _STORE_ID = 'user_preference_store'
@@ -87,7 +88,7 @@ export const useUserPreferenceStore = defineStore(_STORE_ID, {
             localStorage.setItem(_LS_DEVICE_SETTINGS, JSON.stringify(this.device_settings))
         },
         // ---------------- new methods for user settings
-        loadUserSettings: function () {
+        loadUserSettings: function (allow_cached_results) {
             let s = localStorage.getItem(_LS_USER_SETTINGS)
             if (!(s === null || s === {})) {
                 let settings = JSON.parse(s)
@@ -96,7 +97,7 @@ export const useUserPreferenceStore = defineStore(_STORE_ID, {
                 }
                 //console.log(`loaded local user settings age ${((new Date().getTime()) - this.user_settings.locally_updated_at) / 1000} `)
             }
-            if (((new Date().getTime()) - this.user_settings.locally_updated_at) > _STALE_TIME_IN_MS) {
+            if (((new Date().getTime()) - this.user_settings.locally_updated_at) > _STALE_TIME_IN_MS || !allow_cached_results) {
                 //console.log('refreshing user settings from API')
                 let apiClient = new ApiApiFactory()
                 apiClient.retrieveUserPreference(localStorage.getItem('USER_ID')).then(r => {
@@ -122,8 +123,10 @@ export const useUserPreferenceStore = defineStore(_STORE_ID, {
                 this.user_settings = r.data
                 Vue.set(this.user_settings, 'locally_updated_at', new Date().getTime())
                 localStorage.setItem(_LS_USER_SETTINGS, JSON.stringify(this.user_settings))
+                StandardToasts.makeStandardToast(this, StandardToasts.SUCCESS_UPDATE)
             }).catch(err => {
                 this.currently_updating = false
+                StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
             })
         },
         // ----------------

From 2b9c294c2a0e76832668a34aa41a2d19f5cc995c Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sat, 20 Jan 2024 02:51:23 +0800
Subject: [PATCH 58/95] undefined always first

---
 .../ShoppingListView/ShoppingListView.vue     |  1 -
 vue/src/stores/ShoppingListStore.js           | 22 +++++++++----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 396b0f21..6c0550df 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -565,7 +565,6 @@ export default {
             this.autosync_id = undefined
 
             let timeout = Math.max(this.user_preference_store.user_settings.shopping_auto_sync, 1) * 1000 // if disabled (shopping_auto_sync=0) check again after 1 second if enabled
-            console.log('setting', this.user_preference_store.user_settings.shopping_auto_sync, 'timeout ', timeout)
             this.autosync_id = setTimeout(() => {
                 if (this.user_preference_store.user_settings.shopping_auto_sync > 0) {
                     this.shopping_list_store.autosync()
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index 732298d0..b06617f2 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -100,12 +100,12 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
             this.total_checked_food = total_checked_food
 
             // ordering
-            if (useUserPreferenceStore().device_settings.shopping_selected_grouping === this.GROUP_CATEGORY && useUserPreferenceStore().device_settings.shopping_selected_supermarket !== null) {
-                if (this.UNDEFINED_CATEGORY in structure) {
-                    ordered_structure.push(structure[this.UNDEFINED_CATEGORY])
-                    Vue.delete(structure, this.UNDEFINED_CATEGORY)
-                }
+             if (this.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) {
                 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])
@@ -130,13 +130,11 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
          * @return {[{id: *, translatable_label: string},{id: *, translatable_label: string},{id: *, translatable_label: string}]}
          */
         grouping_options: function () {
-            return [{'id': this.GROUP_CATEGORY, 'translatable_label': 'Category'}, {
-                'id': this.GROUP_CREATED_BY,
-                'translatable_label': 'created_by'
-            }, {
-                'id': this.GROUP_RECIPE,
-                'translatable_label': 'Recipe'
-            }]
+            return [
+                {'id': this.GROUP_CATEGORY, 'translatable_label': 'Category'},
+                {'id': this.GROUP_CREATED_BY, 'translatable_label': 'created_by'},
+                {'id': this.GROUP_RECIPE, 'translatable_label': 'Recipe'}
+            ]
         },
         /**
          * checks if failed items are contained in the sync queue

From 5842022d0a1e53ba2c0096f01c382aca26279e82 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Tue, 23 Jan 2024 17:49:03 +0100
Subject: [PATCH 59/95] fixed some exports

---
 .../ShoppingListView/ShoppingListView.vue     | 39 +++----------------
 vue/src/stores/ShoppingListStore.js           | 18 ++++++++-
 2 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 6c0550df..ad29b01b 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -16,13 +16,13 @@
                     <div class="dropdown-menu dropdown-menu-right" aria-labelledby="downloadShoppingLink">
                         <DownloadPDF dom="#shoppinglist" name="shopping.pdf" :label="$t('download_pdf')"
                                      icon="far fa-file-pdf"/>
-                        <DownloadCSV :items="csvData" :delim="user_preference_store.user_settings.csv_delim"
+                        <DownloadCSV :items="shopping_list_store.get_flat_entries" :delim="user_preference_store.user_settings.csv_delim"
                                      name="shopping.csv"
                                      :label="$t('download_csv')" icon="fas fa-file-csv"/>
-                        <CopyToClipboard :items="csvData" :settings="user_preference_store.user_settings"
+                        <CopyToClipboard :items="shopping_list_store.get_flat_entries" :settings="user_preference_store.user_settings"
                                          :label="$t('copy_to_clipboard')"
                                          icon="fas fa-clipboard-list"/>
-                        <CopyToClipboard :items="csvData" :settings="user_preference_store.user_settings" format="table"
+                        <CopyToClipboard :items="shopping_list_store.get_flat_entries" :settings="user_preference_store.user_settings" format="table"
                                          :label="$t('copy_markdown_table')" icon="fab fa-markdown"/>
                     </div>
                 </b-button>
@@ -442,12 +442,12 @@
 
                 <DownloadPDF dom="#shoppinglist" name="shopping.pdf" :label="$t('download_pdf')"
                              icon="far fa-file-pdf fa-fw"/>
-                <DownloadCSV :items="csvData" :delim="user_preference_store.user_settings.csv_delim" name="shopping.csv"
+                <DownloadCSV :items="shopping_list_store.get_flat_entries" :delim="user_preference_store.user_settings.csv_delim" name="shopping.csv"
                              :label="$t('download_csv')" icon="fas fa-file-csv fa-fw"/>
-                <CopyToClipboard :items="csvData" :settings="user_preference_store.user_settings"
+                <CopyToClipboard :items="shopping_list_store.get_flat_entries" :settings="user_preference_store.user_settings"
                                  :label="$t('copy_to_clipboard')"
                                  icon="fas fa-clipboard-list fa-fw"/>
-                <CopyToClipboard :items="csvData" :settings="user_preference_store.user_settings" format="table"
+                <CopyToClipboard :items="shopping_list_store.get_flat_entries" :settings="user_preference_store.user_settings" format="table"
                                  :label="$t('copy_markdown_table')" icon="fab fa-markdown fa-fw"/>
 
 
@@ -521,12 +521,6 @@ export default {
         }
     },
     computed: {
-        csvData() {
-            // return this.items.map((x) => {
-            //     return {amount: x.amount, unit: x.unit?.name ?? "", food: x.food?.name ?? ""}
-            // })
-            return []
-        },
         editingSupermarket() {
             return this.shopping_list_store.supermarkets.filter((el) => {
                 return el.editing
@@ -605,27 +599,6 @@ export default {
                 StandardToasts.makeStandardToast(this, StandardToasts.FAIL_DELETE, err)
             })
         },
-
-        onHand: function (item) {
-            let api = new ApiApiFactory()
-            let food = {
-                id: item?.[0]?.food.id ?? item?.food?.id,
-                food_onhand: true,
-            }
-
-            this.updateFood(food, "food_onhand")
-                .then((result) => {
-                    let entries = this.items.filter((x) => x.food.id == food.id).map((x) => x.id)
-                    this.items = this.items.filter((x) => x.food.id !== food.id)
-                    return entries
-                })
-                .then((entries) => {
-                    entries.forEach((x) => {
-                        api.destroyShoppingListEntry(x).then((result) => {
-                        })
-                    })
-                })
-        },
         /**
          * change number of servings of a shopping list recipe
          * backend handles scaling of associated entries
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index b06617f2..d7fcbae0 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -100,7 +100,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
             this.total_checked_food = total_checked_food
 
             // ordering
-             if (this.UNDEFINED_CATEGORY in structure) {
+            if (this.UNDEFINED_CATEGORY in structure) {
                 ordered_structure.push(structure[this.UNDEFINED_CATEGORY])
                 Vue.delete(structure, this.UNDEFINED_CATEGORY)
             }
@@ -125,6 +125,22 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
 
             return ordered_structure
         },
+        get_flat_entries: function () {
+            //{amount: x.amount, unit: x.unit?.name ?? "", food: x.food?.name ?? ""}
+            let items = []
+            for (let i in this.get_entries_by_group) {
+                for (let f in this.get_entries_by_group[i]['foods']) {
+                    for (let e in this.get_entries_by_group[i]['foods'][f]['entries']) {
+                        items.push({
+                            amount: this.get_entries_by_group[i]['foods'][f]['entries'][e].amount,
+                            unit: this.get_entries_by_group[i]['foods'][f]['entries'][e].unit?.name ?? '',
+                            food: this.get_entries_by_group[i]['foods'][f]['entries'][e].food?.name ?? '',
+                        })
+                    }
+                }
+            }
+            return items
+        },
         /**
          * list of options available for grouping entry display
          * @return {[{id: *, translatable_label: string},{id: *, translatable_label: string},{id: *, translatable_label: string}]}

From f431e1833624492343e23a7b7207e1f2c4314289 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Tue, 23 Jan 2024 18:03:31 +0100
Subject: [PATCH 60/95] fixed test

---
 cookbook/tests/api/test_api_shopping_recipe.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cookbook/tests/api/test_api_shopping_recipe.py b/cookbook/tests/api/test_api_shopping_recipe.py
index 473a631c..5001aca2 100644
--- a/cookbook/tests/api/test_api_shopping_recipe.py
+++ b/cookbook/tests/api/test_api_shopping_recipe.py
@@ -7,7 +7,7 @@ from django.contrib import auth
 from django.urls import reverse
 from django_scopes import scopes_disabled
 
-from cookbook.models import Food, Ingredient
+from cookbook.models import Food, Ingredient, ShoppingListRecipe, ShoppingListEntry
 from cookbook.tests.factories import MealPlanFactory, RecipeFactory, StepFactory, UserFactory
 
 if settings.DATABASES['default']['ENGINE'] == 'django.db.backends.postgresql':
@@ -126,7 +126,7 @@ def test_shopping_recipe_edit(request, recipe, sle_count, use_mealplan, u1_s1, u
             u1_s1.put(reverse(SHOPPING_RECIPE_URL, args={recipe.id}))
         r = json.loads(u1_s1.get(reverse(SHOPPING_LIST_URL)).content)
         assert [x['created_by']['id'] for x in r].count(user.id) == sle_count
-        all_ing = [x['ingredient'] for x in r]
+        all_ing = list(ShoppingListEntry.objects.filter(list_recipe__recipe=recipe).all().values_list('ingredient', flat=True))
         keep_ing = all_ing[1:-1]  # remove first and last element
         del keep_ing[int(len(keep_ing) / 2)]  # remove a middle element
         list_recipe = r[0]['list_recipe']

From 64e54ceaec7c445f4318361359c162342b4114dd Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Tue, 23 Jan 2024 18:09:13 +0100
Subject: [PATCH 61/95] added mealplan info to recipes tab

---
 vue/src/apps/ShoppingListView/ShoppingListView.vue | 13 +++++++++++--
 vue/src/components/ShoppingLineItem.vue            |  2 +-
 vue/src/stores/ShoppingListStore.js                |  4 +++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index ad29b01b..15512321 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -115,8 +115,8 @@
                         <b-button-group class="w-100 mt-2">
                             <b-button variant="dark" block class="btn btn-block text-left">
                                 <span>{{ r.recipe_name }}</span> <br/>
-                                <span><small class="text-muted">{{ r.recipe_name }}</small></span>
-                                <!-- TODO show meal plan date/type -->
+                                <span v-if="r.mealplan_type"><small class="text-muted">{{ r.mealplan_type }} {{ formatDate(r.mealplan_from_date) }}</small></span>
+
                             </b-button>
                             <b-button variant="danger" @click="deleteRecipe(r.shopping_list_recipe_id)"><i
                                 class="fas fa-trash fa-fw"></i></b-button>
@@ -550,6 +550,15 @@ export default {
     methods: {
         useUserPreferenceStore,
         useShoppingListStore,
+        // TODO move to utils
+        formatDate: function (datetime) {
+            if (!datetime) {
+                return
+            }
+            return Intl.DateTimeFormat(window.navigator.language, {
+                dateStyle: "short",
+            }).format(Date.parse(datetime))
+        },
         /**
          * recursive function calling autosync after set amount of time has passed
          */
diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index 911b1a3e..09c79d44 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -247,7 +247,7 @@ export default {
         useUserPreferenceStore,
         useShoppingListStore,
         resolveDjangoUrl,
-
+        // TODO move to utils
         formatDate: function (datetime) {
             if (!datetime) {
                 return
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index d7fcbae0..fd805a7e 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -294,7 +294,9 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                         'shopping_list_recipe_id': e.list_recipe,
                         'recipe_id': e.recipe_mealplan.recipe,
                         'recipe_name': e.recipe_mealplan.recipe_name,
-                        'servings': e.recipe_mealplan.servings
+                        'servings': e.recipe_mealplan.servings,
+                        'mealplan_from_date': e.recipe_mealplan.mealplan_from_date,
+                        'mealplan_type': e.recipe_mealplan.mealplan_type,
                     })
                 }
             }

From 7673e794bfb7a21b4489c2178bdd4ee8ff6d74ca Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Tue, 23 Jan 2024 18:25:56 +0100
Subject: [PATCH 62/95] moved date format functions to utilities

---
 .../apps/ShoppingListView/ShoppingListView.vue  | 13 ++-----------
 vue/src/components/ShoppingLineItem.vue         | 13 ++-----------
 vue/src/utils/utils.js                          | 17 +++++++++++++++++
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 15512321..bf148da4 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -471,7 +471,7 @@ import CopyToClipboard from "@/components/Buttons/CopyToClipboard"
 import GenericMultiselect from "@/components/GenericMultiselect"
 import ShoppingModal from "@/components/Modals/ShoppingModal"
 
-import {ApiMixin, getUserPreference, StandardToasts, makeToast, ResolveUrlMixin} from "@/utils/utils"
+import {ApiMixin, getUserPreference, StandardToasts, makeToast, ResolveUrlMixin, FormatMixin} from "@/utils/utils"
 import {ApiApiFactory} from "@/utils/openapi/api"
 import ShoppingSettingsComponent from "@/components/Settings/ShoppingSettingsComponent";
 
@@ -486,7 +486,7 @@ import NumberScalerComponent from "@/components/NumberScalerComponent.vue";
 
 export default {
     name: "ShoppingListView",
-    mixins: [ApiMixin, ResolveUrlMixin],
+    mixins: [ApiMixin, ResolveUrlMixin, FormatMixin],
     components: {
         NumberScalerComponent,
 
@@ -550,15 +550,6 @@ export default {
     methods: {
         useUserPreferenceStore,
         useShoppingListStore,
-        // TODO move to utils
-        formatDate: function (datetime) {
-            if (!datetime) {
-                return
-            }
-            return Intl.DateTimeFormat(window.navigator.language, {
-                dateStyle: "short",
-            }).format(Date.parse(datetime))
-        },
         /**
          * recursive function calling autosync after set amount of time has passed
          */
diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index 09c79d44..adbc6639 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -116,7 +116,7 @@
 import Vue from "vue"
 import {BootstrapVue} from "bootstrap-vue"
 import "bootstrap-vue/dist/bootstrap-vue.css"
-import {ApiMixin, resolveDjangoUrl, StandardToasts} from "@/utils/utils"
+import {ApiMixin, FormatMixin, resolveDjangoUrl, StandardToasts} from "@/utils/utils"
 import {useMealPlanStore} from "@/stores/MealPlanStore";
 import {useShoppingListStore} from "@/stores/ShoppingListStore";
 import {ApiApiFactory} from "@/utils/openapi/api";
@@ -129,7 +129,7 @@ Vue.use(BootstrapVue)
 
 export default {
     name: "ShoppingLineItem",
-    mixins: [ApiMixin],
+    mixins: [ApiMixin, FormatMixin],
     components: {GenericModalForm, NumberScalerComponent},
     props: {
         entries: {type: Object,},
@@ -247,15 +247,6 @@ export default {
         useUserPreferenceStore,
         useShoppingListStore,
         resolveDjangoUrl,
-        // TODO move to utils
-        formatDate: function (datetime) {
-            if (!datetime) {
-                return
-            }
-            return Intl.DateTimeFormat(window.navigator.language, {
-                dateStyle: "short",
-            }).format(Date.parse(datetime))
-        },
         /**
          * update the food after the category was changed
          * handle changing category to category ID as a workaround
diff --git a/vue/src/utils/utils.js b/vue/src/utils/utils.js
index 00cc3735..b34396d4 100644
--- a/vue/src/utils/utils.js
+++ b/vue/src/utils/utils.js
@@ -365,6 +365,23 @@ export function energyHeading() {
     }
 }
 
+export const FormatMixin = {
+    name: "FormatMixin",
+    methods: {
+        /**
+         * format short date from datetime
+         * @param datetime any string that can be parsed by Date.parse()
+         * @return {string}
+         */
+        formatDate: function (datetime) {
+            return Intl.DateTimeFormat(window.navigator.language, {
+                dateStyle: "short",
+            }).format(Date.parse(datetime))
+        },
+    },
+}
+
+
 axios.defaults.xsrfCookieName = "csrftoken"
 axios.defaults.xsrfHeaderName = "X-CSRFTOKEN"
 

From 8e4c8821dc9c1e30ed44c293c0a59f7d77b4bc79 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Tue, 23 Jan 2024 18:48:29 +0100
Subject: [PATCH 63/95] recipe list and detail modal background

---
 cookbook/static/themes/tandoor.min.css        |  2 +-
 .../ShoppingListView/ShoppingListView.vue     | 16 +++++++++-----
 vue/src/components/NumberScalerComponent.vue  | 10 ++++-----
 vue/src/components/ShoppingLineItem.vue       | 22 ++++++++++---------
 4 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/cookbook/static/themes/tandoor.min.css b/cookbook/static/themes/tandoor.min.css
index 5744a8d8..36abfb42 100644
--- a/cookbook/static/themes/tandoor.min.css
+++ b/cookbook/static/themes/tandoor.min.css
@@ -480,7 +480,7 @@ hr {
     margin-top: 1rem;
     margin-bottom: 1rem;
     border: 0;
-    border-top: 1px solid rgba(0, 0, 0, .1)
+    border-top: 1px solid #ced4da;
 }
 
 .small, small {
diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index bf148da4..2d170274 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -112,20 +112,24 @@
                 <b-row v-for="r in shopping_list_store.getAssociatedRecipes()" :key="r.shopping_list_recipe_id"
                        class="pr-1 pl-1">
                     <b-col cols="12">
-                        <b-button-group class="w-100 mt-2">
-                            <b-button variant="dark" block class="btn btn-block text-left">
-                                <span>{{ r.recipe_name }}</span> <br/>
-                                <span v-if="r.mealplan_type"><small class="text-muted">{{ r.mealplan_type }} {{ formatDate(r.mealplan_from_date) }}</small></span>
 
-                            </b-button>
+                        <b-button-group class="w-100 mt-2">
+
+                            <div class="card flex-grow-1 btn-block p-2">
+                                <span>{{ r.recipe_name }}</span>
+                                <span v-if="r.mealplan_type"><small class="text-muted">{{ r.mealplan_type }} {{ formatDate(r.mealplan_from_date) }}</small></span>
+                            </div>
+
+
                             <b-button variant="danger" @click="deleteRecipe(r.shopping_list_recipe_id)"><i
                                 class="fas fa-trash fa-fw"></i></b-button>
                         </b-button-group>
 
                         <number-scaler-component :number="r.servings" @change="updateServings(r, $event)"
                                                  :disable="useShoppingListStore().currently_updating"></number-scaler-component>
-
+                        <hr class="m-2"/>
                     </b-col>
+
                 </b-row>
             </b-tab>
             <!-- --------------------------------------- supermarkets tab -->
diff --git a/vue/src/components/NumberScalerComponent.vue b/vue/src/components/NumberScalerComponent.vue
index 8e9c9579..f9cb5eab 100644
--- a/vue/src/components/NumberScalerComponent.vue
+++ b/vue/src/components/NumberScalerComponent.vue
@@ -1,20 +1,20 @@
 <template>
     <div>
         <b-button-group class="w-100 mt-1">
-            <b-button @click="updateNumber( 'half')"
+            <b-button @click="updateNumber( 'half')" variant="outline-info"
                       :disabled="disable"><i class="fas fa-divide"></i> 2
             </b-button>
-            <b-button variant="info" @click="updateNumber( 'sub')"
+            <b-button variant="outline-info" @click="updateNumber( 'sub')"
                       :disabled="disable"><i class="fas fa-minus"></i>
             </b-button>
-            <b-button variant="info" @click="updateNumber('prompt')"
+            <b-button variant="outline-info" @click="updateNumber('prompt')"
                       :disabled="disable">
                 {{ number }}
             </b-button>
-            <b-button variant="info" @click="updateNumber( 'add')"
+            <b-button variant="outline-info" @click="updateNumber( 'add')"
                       :disabled="disable"><i class="fas fa-plus"></i>
             </b-button>
-            <b-button @click="updateNumber('multiply')"
+            <b-button @click="updateNumber('multiply')" variant="outline-info"
                       :disabled="disable"><i class="fas fa-times"></i> 2
             </b-button>
         </b-button-group>
diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index adbc6639..5ac7bab3 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -10,7 +10,7 @@
             <b-button variant="primary" v-if="is_delayed">
                 <i class="fa-fw fas fa-hourglass-half"></i>
             </b-button>
-            <div class="card flex-grow-1 btn-block p-1" @click="detail_modal_visible = true">
+            <div class="card flex-grow-1 btn-block p-2" @click="detail_modal_visible = true">
                 <div class="d-flex">
                     <div class="d-flex flex-column pr-2" v-if="Object.keys(amounts).length> 0">
                         <span v-for="a in amounts" v-bind:key="a.id">{{ a.amount }} {{ a.unit }}<br/></span>
@@ -61,17 +61,14 @@
 
                 <h6 class="mt-2">{{ $t('Entries') }}</h6>
 
-                <b-button variant="danger" block
-                          @click="detail_modal_visible = false;useShoppingListStore().deleteEntries(entries)">
-                    {{ $t('Delete_All') }}
-                </b-button>
 
                 <b-row v-for="e in entries" v-bind:key="e.id">
                     <b-col cold="12">
-                        <b-button-group class="mt-1 w-100">
-                            <b-button variant="dark" block class="btn btn-block text-left">
+
+                        <b-button-group class="w-100">
+                            <div class="card flex-grow-1 btn-block p-2">
                                 <span><span v-if="e.amount > 0">{{ e.amount }}</span> {{ e.unit?.name }} {{ food.name }}</span>
-                                <span><br/><small class="text-muted">
+                                <span><small class="text-muted">
                                     <span v-if="e.recipe_mealplan && e.recipe_mealplan.recipe_name !== ''">
                                         <a :href="resolveDjangoUrl('view_recipe', e.recipe_mealplan.recipe)"> {{
                                                 e.recipe_mealplan.recipe_name
@@ -87,7 +84,7 @@
                                     {{ e.created_by.display_name }} {{ formatDate(e.created_at) }}<br/>
                                 </small></span>
 
-                            </b-button>
+                            </div>
                             <b-button variant="warning"
                                       @click="detail_modal_visible = false; useShoppingListStore().deleteObject(e)"><i
                                 class="fas fa-trash"></i></b-button> <!-- TODO implement -->
@@ -96,9 +93,14 @@
                         <number-scaler-component :number="e.amount"
                                                  @change="e.amount = $event; useShoppingListStore().updateObject(e)"
                                                  v-if="e.recipe_mealplan === null"></number-scaler-component>
-
+                        <hr class="m-2"/>
                     </b-col>
                 </b-row>
+
+                <b-button variant="danger" block class="mt-2"
+                          @click="detail_modal_visible = false;useShoppingListStore().deleteEntries(entries)">
+                    {{ $t('Delete_All') }}
+                </b-button>
             </template>
 
             <template #modal-footer>

From 6e6af47d8cc07986bad32056e69b8619bc22c328 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sun, 28 Jan 2024 11:06:38 +0100
Subject: [PATCH 64/95] fixed migration order

---
 ...try_updated_at.py => 0210_shoppinglistentry_updated_at.py} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename cookbook/migrations/{0209_shoppinglistentry_updated_at.py => 0210_shoppinglistentry_updated_at.py} (71%)

diff --git a/cookbook/migrations/0209_shoppinglistentry_updated_at.py b/cookbook/migrations/0210_shoppinglistentry_updated_at.py
similarity index 71%
rename from cookbook/migrations/0209_shoppinglistentry_updated_at.py
rename to cookbook/migrations/0210_shoppinglistentry_updated_at.py
index 57bcb95f..28c2a135 100644
--- a/cookbook/migrations/0209_shoppinglistentry_updated_at.py
+++ b/cookbook/migrations/0210_shoppinglistentry_updated_at.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.7 on 2024-01-03 14:12
+# Generated by Django 4.2.7 on 2024-01-28 10:06
 
 from django.db import migrations, models
 
@@ -6,7 +6,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('cookbook', '0208_space_app_name_userpreference_max_owned_spaces'),
+        ('cookbook', '0209_remove_space_use_plural'),
     ]
 
     operations = [

From f0853ee11c7e6bd598624caf951172f014bf618d Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sun, 28 Jan 2024 11:19:06 +0100
Subject: [PATCH 65/95] not full width on large screens

---
 .../ShoppingListView/ShoppingListView.vue     | 657 +++++++++---------
 1 file changed, 331 insertions(+), 326 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 2d170274..bcaa58da 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -4,349 +4,354 @@
             {{ $t('ShoppingBackgroundSyncWarning') }}
         </b-alert>
 
-        <div class="row float-top w-100">
-            <div class="col-auto no-gutter ml-auto">
-                <b-button variant="link" @click="useShoppingListStore().undoChange()"><i class="fas fa-undo"></i>
-                </b-button>
+        <div class="row">
+            <div class="col-12 col-xl-8 offset-xl-2">
+                <div class="row float-top w-100">
+                    <div class="col-auto no-gutter ml-auto">
+                        <b-button variant="link" @click="useShoppingListStore().undoChange()"><i class="fas fa-undo"></i>
+                        </b-button>
 
-                <b-button variant="link" class="px-1 pt-0 pb-1 d-none d-md-inline-block">
-                    <i class="fas fa-download fa-lg nav-link dropdown-toggle text-primary px-1"
-                       id="downloadShoppingLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></i>
+                        <b-button variant="link" class="px-1 pt-0 pb-1 d-none d-md-inline-block">
+                            <i class="fas fa-download fa-lg nav-link dropdown-toggle text-primary px-1"
+                               id="downloadShoppingLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></i>
 
-                    <div class="dropdown-menu dropdown-menu-right" aria-labelledby="downloadShoppingLink">
-                        <DownloadPDF dom="#shoppinglist" name="shopping.pdf" :label="$t('download_pdf')"
-                                     icon="far fa-file-pdf"/>
-                        <DownloadCSV :items="shopping_list_store.get_flat_entries" :delim="user_preference_store.user_settings.csv_delim"
-                                     name="shopping.csv"
-                                     :label="$t('download_csv')" icon="fas fa-file-csv"/>
-                        <CopyToClipboard :items="shopping_list_store.get_flat_entries" :settings="user_preference_store.user_settings"
-                                         :label="$t('copy_to_clipboard')"
-                                         icon="fas fa-clipboard-list"/>
-                        <CopyToClipboard :items="shopping_list_store.get_flat_entries" :settings="user_preference_store.user_settings" format="table"
-                                         :label="$t('copy_markdown_table')" icon="fab fa-markdown"/>
+                            <div class="dropdown-menu dropdown-menu-right" aria-labelledby="downloadShoppingLink">
+                                <DownloadPDF dom="#shoppinglist" name="shopping.pdf" :label="$t('download_pdf')"
+                                             icon="far fa-file-pdf"/>
+                                <DownloadCSV :items="shopping_list_store.get_flat_entries" :delim="user_preference_store.user_settings.csv_delim"
+                                             name="shopping.csv"
+                                             :label="$t('download_csv')" icon="fas fa-file-csv"/>
+                                <CopyToClipboard :items="shopping_list_store.get_flat_entries" :settings="user_preference_store.user_settings"
+                                                 :label="$t('copy_to_clipboard')"
+                                                 icon="fas fa-clipboard-list"/>
+                                <CopyToClipboard :items="shopping_list_store.get_flat_entries" :settings="user_preference_store.user_settings" format="table"
+                                                 :label="$t('copy_markdown_table')" icon="fab fa-markdown"/>
+                            </div>
+                        </b-button>
+                        <i id="id_filters_button" class="fas fa-filter fa-fw mt-1" style="font-size: 16px; cursor: pointer"
+                        />
                     </div>
-                </b-button>
-                <i id="id_filters_button" class="fas fa-filter fa-fw mt-1" style="font-size: 16px; cursor: pointer"
-                />
-            </div>
-        </div>
+                </div>
 
-        <b-tabs content-class="mt-2" v-model="current_tab" class="mt-md-1" style="margin-top: 22px;">
-            <!-- shopping list tab -->
-            <b-tab active>
-                <template #title>
-                    <i v-if="!shopping_list_store.currently_updating && useShoppingListStore().autosync_has_focus"
-                       class="fas fa-shopping-cart fa-fw"></i>
-                    <i v-if="!shopping_list_store.currently_updating && !useShoppingListStore().autosync_has_focus"
-                       class="fas fa-eye-slash"></i>
-                    <b-spinner v-if="shopping_list_store.currently_updating" type="border" small
-                               style="width: 1.25em!important; height: 1.25em!important;"></b-spinner>
-                    <span class="d-none d-md-inline-block ml-1">
+                <b-tabs content-class="mt-2" v-model="current_tab" class="mt-md-1" style="margin-top: 22px;">
+                    <!-- shopping list tab -->
+                    <b-tab active>
+                        <template #title>
+                            <i v-if="!shopping_list_store.currently_updating && useShoppingListStore().autosync_has_focus"
+                               class="fas fa-shopping-cart fa-fw"></i>
+                            <i v-if="!shopping_list_store.currently_updating && !useShoppingListStore().autosync_has_focus"
+                               class="fas fa-eye-slash"></i>
+                            <b-spinner v-if="shopping_list_store.currently_updating" type="border" small
+                                       style="width: 1.25em!important; height: 1.25em!important;"></b-spinner>
+                            <span class="d-none d-md-inline-block ml-1">
                         {{ $t('Shopping_list') + ` (${shopping_list_store.total_unchecked_food})` }}
                     </span>
 
-                </template>
+                        </template>
 
-                <b-row class="d-lg-block d-print-none d-none pr-1 pl-1 mb-3 mt-3">
-                    <b-col cols="12">
-                        <b-input-group>
-                            <b-form-input type="text" :placeholder="$t('Food')"
-                                          v-model="new_item.ingredient"
-                                          @keyup.enter="addItem"
-                                          ref="amount_input_simple"></b-form-input>
-                            <b-input-group-append>
-                                <b-button variant="success">
-                                    <i class="fas fa-cart-plus fa-fw" @click="addItem"/>
-                                </b-button>
-                            </b-input-group-append>
-                        </b-input-group>
-                    </b-col>
-                </b-row>
+                        <b-row class="d-lg-block d-print-none d-none pr-1 pl-1 mb-3 mt-3">
+                            <b-col cols="12">
+                                <b-input-group>
+                                    <b-form-input type="text" :placeholder="$t('Food')"
+                                                  v-model="new_item.ingredient"
+                                                  @keyup.enter="addItem"
+                                                  ref="amount_input_simple"></b-form-input>
+                                    <b-input-group-append>
+                                        <b-button variant="success">
+                                            <i class="fas fa-cart-plus fa-fw" @click="addItem"/>
+                                        </b-button>
+                                    </b-input-group-append>
+                                </b-input-group>
+                            </b-col>
+                        </b-row>
 
-                <!-- --------------------------------------- shopping list table -->
-                <b-row v-for="c in shopping_list_store.get_entries_by_group" v-bind:key="c.id" class="pr-1 pl-1">
-                    <b-col cols="12"
-                           v-if="c.count_unchecked > 0 || user_preference_store.device_settings.shopping_show_checked_entries && (c.count_unchecked + c.count_checked) > 0">
-                        <b-button-group class="w-100 mt-1"
-                                        :class="{'flex-row-reverse': useUserPreferenceStore().user_settings.left_handed}">
-                            <b-button variant="info" block class="btn btn-block text-left">
+                        <!-- --------------------------------------- shopping list table -->
+                        <b-row v-for="c in shopping_list_store.get_entries_by_group" v-bind:key="c.id" class="pr-1 pl-1">
+                            <b-col cols="12"
+                                   v-if="c.count_unchecked > 0 || user_preference_store.device_settings.shopping_show_checked_entries && (c.count_unchecked + c.count_checked) > 0">
+                                <b-button-group class="w-100 mt-1"
+                                                :class="{'flex-row-reverse': useUserPreferenceStore().user_settings.left_handed}">
+                                    <b-button variant="info" block class="btn btn-block text-left">
                                 <span v-if="c.name === shopping_list_store.UNDEFINED_CATEGORY">{{
                                         $t('Undefined')
                                     }}</span>
-                                <span v-else>{{ c.name }}</span>
-                            </b-button>
-                            <b-button
-                                :class="{'btn-success':(c.count_unchecked > 0), 'btn-warning': (c.count_unchecked <= 0)}"
-                                @click="checkGroup(c, (c.count_unchecked > 0))">
-                                <i class="fas fa-fw"
-                                   :class="{'fa-check':(c.count_unchecked > 0), 'fa-cart-plus':(c.count_unchecked <= 0) }"></i>
-                            </b-button>
-                        </b-button-group>
+                                        <span v-else>{{ c.name }}</span>
+                                    </b-button>
+                                    <b-button
+                                        :class="{'btn-success':(c.count_unchecked > 0), 'btn-warning': (c.count_unchecked <= 0)}"
+                                        @click="checkGroup(c, (c.count_unchecked > 0))">
+                                        <i class="fas fa-fw"
+                                           :class="{'fa-check':(c.count_unchecked > 0), 'fa-cart-plus':(c.count_unchecked <= 0) }"></i>
+                                    </b-button>
+                                </b-button-group>
 
-                        <span v-for="f in c.foods" v-bind:key="f.id">
+                                <span v-for="f in c.foods" v-bind:key="f.id">
                             <shopping-line-item :entries="f['entries']" class="mt-1"/>
                         </span>
-                    </b-col>
-                </b-row>
-
-            </b-tab>
-            <!-- --------------------------------------- recipe tab -->
-            <b-tab :title="$t('Recipes')">
-                <template #title>
-                    <i class="fas fa-book fa-fw"></i>
-                    <span class="d-none d-md-inline-block ml-1">{{
-                            $t('Recipes') + ` (${Object.keys(shopping_list_store.getAssociatedRecipes()).length})`
-                        }}</span>
-                </template>
-
-                <b-row class="d-lg-block d-print-none d-none pr-1 pl-1 mb-3 mt-3">
-                    <b-col cols="12">
-                        <generic-multiselect
-                            :model="Models.RECIPE"
-                            :multiple="false"
-                            @change="addRecipeToShopping($event.val)"
-                        ></generic-multiselect>
-                    </b-col>
-                </b-row>
-
-                <b-row v-for="r in shopping_list_store.getAssociatedRecipes()" :key="r.shopping_list_recipe_id"
-                       class="pr-1 pl-1">
-                    <b-col cols="12">
-
-                        <b-button-group class="w-100 mt-2">
-
-                            <div class="card flex-grow-1 btn-block p-2">
-                                <span>{{ r.recipe_name }}</span>
-                                <span v-if="r.mealplan_type"><small class="text-muted">{{ r.mealplan_type }} {{ formatDate(r.mealplan_from_date) }}</small></span>
-                            </div>
-
-
-                            <b-button variant="danger" @click="deleteRecipe(r.shopping_list_recipe_id)"><i
-                                class="fas fa-trash fa-fw"></i></b-button>
-                        </b-button-group>
-
-                        <number-scaler-component :number="r.servings" @change="updateServings(r, $event)"
-                                                 :disable="useShoppingListStore().currently_updating"></number-scaler-component>
-                        <hr class="m-2"/>
-                    </b-col>
-
-                </b-row>
-            </b-tab>
-            <!-- --------------------------------------- supermarkets tab -->
-            <b-tab>
-                <template #title>
-                    <i class="fas fa-store-alt fa-fw"></i>
-                    <span class="d-none d-md-inline-block ml-1">{{
-                            $t('Supermarkets') + ` (${shopping_list_store.supermarkets.length})`
-                        }}</span>
-                </template>
-                <div class="container p-0">
-                    <div class="row">
-                        <div class="col col-md-12 p-0 p-lg-3">
-                            <b-col role="tablist">
-                                <!-- add to shopping form -->
-                                <div class="container">
-                                    <b-row>
-                                        <b-col cols="12" md="6">
-                                            <h5>{{ $t("Supermarkets") }}
-                                                <span class="float-right text-primary" style="cursor: pointer"><i
-                                                    class="fa fa-plus-circle" v-plus-button
-                                                    @click="addSupermarket"
-                                                    aria-hidden="true"></i
-                                                ></span></h5>
-                                            <b-list-group>
-                                                <b-card no-body class="mt-1 list-group-item p-2"
-                                                        v-for="(supermarket, index) in shopping_list_store.supermarkets"
-                                                        v-hover
-                                                        :key="supermarket.id">
-                                                    <b-card-header class="p-2 border-0">
-                                                        <b-row>
-                                                            <b-col cols="12">
-                                                                <h5 class="mt-1 mb-1">
-                                                                    {{ supermarket.name }}
-                                                                    <span class="float-right text-primary"
-                                                                          style="cursor: pointer"
-                                                                    ><i class="fa"
-                                                                        v-bind:class="{ 'fa-pen': !supermarket.editing, 'fa-save': supermarket.editing }"
-                                                                        @click="editOrSaveSupermarket(index)"
-                                                                        aria-hidden="true"></i
-                                                                    ></span>
-                                                                </h5>
-                                                                <span class="text-muted"
-                                                                      v-if="supermarket.description !== ''">{{
-                                                                        supermarket.description
-                                                                    }}</span>
-                                                            </b-col>
-                                                        </b-row>
-                                                    </b-card-header>
-                                                    <b-card-body class="p-4" v-if="supermarket.editing">
-                                                        <div class="form-group">
-                                                            <label>{{ $t("Name") }}</label>
-                                                            <input class="form-control" :placeholder="$t('Name')"
-                                                                   v-model="supermarket.name"/>
-                                                        </div>
-                                                        <div class="form-group">
-                                                            <label>{{ $t("Description") }}</label>
-                                                            <input class="form-control" :placeholder="$t('Description')"
-                                                                   v-model="supermarket.description"/>
-                                                        </div>
-                                                        <button class="btn btn-danger"
-                                                                @click="deleteSupermarket(index)">
-                                                            {{ $t("Delete") }}
-                                                        </button>
-                                                        <button class="btn btn-primary float-right"
-                                                                @click="editOrSaveSupermarket(index)">
-                                                            {{ $t("Save") }}
-                                                        </button>
-                                                    </b-card-body>
-                                                </b-card>
-                                            </b-list-group>
-                                        </b-col>
-                                        <b-col cols="12" md="6">
-                                            <h5 v-if="editingSupermarket.length > 0">{{ $t("Shopping_Categories") }} -
-                                                {{ editingSupermarket[0].name }}</h5>
-                                            <h5 v-else>{{ $t("Shopping_Categories") }}
-                                                <span class="float-right text-primary" v-plus-button
-                                                      style="cursor: pointer"><i
-                                                    class="fa fa-plus-circle" v-plus-button
-                                                    @click="addSupermarketCategory"
-                                                    aria-hidden="true"></i
-                                                ></span>
-                                            </h5>
-                                            <div v-if="editingSupermarket.length === 0">
-                                                <b-list-group>
-                                                    <b-card no-body class="mt-1 list-group-item p-2"
-                                                            v-for="(category, index) in shopping_list_store.supermarket_categories"
-                                                            v-hover
-                                                            :key="category.id">
-                                                        <b-card-header class="p-2 border-0">
-                                                            <b-row>
-                                                                <b-col cols="12">
-                                                                    <h5 class="mt-1 mb-1">
-                                                                        {{ category.name }}
-                                                                        <span class="float-right text-primary"
-                                                                              style="cursor: pointer"
-                                                                        ><i class="fa"
-                                                                            v-bind:class="{ 'fa-pen': !category.editing, 'fa-save': category.editing }"
-                                                                            @click="editOrSaveSupermarketCategory(index)"
-                                                                            aria-hidden="true"></i
-                                                                        ></span>
-                                                                    </h5>
-                                                                </b-col>
-                                                            </b-row>
-                                                        </b-card-header>
-                                                        <b-card-body class="p-4" v-if="category.editing">
-                                                            <div class="form-group">
-                                                                <label>{{ $t("Name") }}</label>
-                                                                <input class="form-control" :placeholder="$t('Name')"
-                                                                       v-model="category.name"/>
-                                                            </div>
-                                                            <div class="form-group">
-                                                                <label>{{ $t("Description") }}</label>
-                                                                <input class="form-control"
-                                                                       :placeholder="$t('Description')"
-                                                                       v-model="category.description"/>
-                                                            </div>
-                                                            <button class="btn btn-danger"
-                                                                    @click="deleteSupermarketCategory(index)">
-                                                                {{ $t("Delete") }}
-                                                            </button>
-                                                            <button class="btn btn-primary float-right"
-                                                                    @click="editOrSaveSupermarketCategory(index)">
-                                                                {{ $t("Save") }}
-                                                            </button>
-                                                        </b-card-body>
-                                                    </b-card>
-                                                </b-list-group>
-                                            </div>
-                                            <div v-else>
-                                                <draggable :list="editing_supermarket_categories" group="categories"
-                                                           :empty-insert-threshold="10"
-                                                           @change="sortSupermarketCategories"
-                                                           ghost-class="ghost">
-                                                    <b-card no-body class="mt-1 list-group-item p-2"
-                                                            style="cursor: move"
-                                                            v-for="(category, index) in editing_supermarket_categories"
-                                                            v-hover
-                                                            :key="category.id">
-                                                        <b-card-header class="p-2 border-0">
-                                                            <div class="row">
-                                                                <div class="col-2">
-                                                                    <button type="button"
-                                                                            class="btn btn-lg shadow-none"><i
-                                                                        class="fas fa-arrows-alt-v"></i></button>
-                                                                </div>
-                                                                <div class="col-10">
-                                                                    <h5 class="mt-1 mb-1">
-                                                                        <b-badge class="float-left text-white mr-2">
-                                                                            #{{ index + 1 }}
-                                                                        </b-badge>
-                                                                        {{ category.name }}
-                                                                        <span class="float-right text-primary"
-                                                                              style="cursor: pointer"
-                                                                        ><i class="fa fa-minus-circle" v-minus-button
-                                                                            @click="removeSupermarketCategoryRelationAtIndex(index)"
-                                                                            aria-hidden="true"></i
-                                                                        ></span>
-                                                                    </h5>
-                                                                </div>
-                                                            </div>
-                                                        </b-card-header>
-                                                    </b-card>
-                                                </draggable>
-                                                <h5>{{ $t("Available") }}</h5>
-                                                <draggable :list="unusedSupermarketCategories" group="categories"
-                                                           :empty-insert-threshold="10"
-                                                           ghost-class="ghost">
-                                                    <b-card no-body class="mt-1 list-group-item p-2"
-                                                            style="cursor: move"
-                                                            v-for="(category) in unusedSupermarketCategories"
-                                                            v-hover
-                                                            :key="category.id">
-                                                        <b-card-header class="p-2 border-0">
-                                                            <div class="row">
-                                                                <div class="col-2">
-                                                                    <button type="button"
-                                                                            class="btn btn-lg shadow-none"><i
-                                                                        class="fas fa-arrows-alt-v"></i></button>
-                                                                </div>
-                                                                <div class="col-10">
-                                                                    <h5 class="mt-1 mb-1">
-                                                                        {{ category.name }}
-                                                                        <span class="float-right text-primary"
-                                                                              style="cursor: pointer"
-                                                                        ><i class="fa fa-plus-circle" v-plus-button
-                                                                            @click="addSupermarketCategoryRelation(category)"
-                                                                            aria-hidden="true"></i
-                                                                        ></span>
-                                                                    </h5>
-                                                                </div>
-                                                            </div>
-                                                        </b-card-header>
-                                                    </b-card>
-                                                </draggable>
-                                            </div>
-                                        </b-col>
-                                    </b-row>
-                                </div>
                             </b-col>
+                        </b-row>
+
+                    </b-tab>
+                    <!-- --------------------------------------- recipe tab -->
+                    <b-tab :title="$t('Recipes')">
+                        <template #title>
+                            <i class="fas fa-book fa-fw"></i>
+                            <span class="d-none d-md-inline-block ml-1">{{
+                                    $t('Recipes') + ` (${Object.keys(shopping_list_store.getAssociatedRecipes()).length})`
+                                }}</span>
+                        </template>
+
+                        <b-row class="d-lg-block d-print-none d-none pr-1 pl-1 mb-3 mt-3">
+                            <b-col cols="12">
+                                <generic-multiselect
+                                    :model="Models.RECIPE"
+                                    :multiple="false"
+                                    @change="addRecipeToShopping($event.val)"
+                                ></generic-multiselect>
+                            </b-col>
+                        </b-row>
+
+                        <b-row v-for="r in shopping_list_store.getAssociatedRecipes()" :key="r.shopping_list_recipe_id"
+                               class="pr-1 pl-1">
+                            <b-col cols="12">
+
+                                <b-button-group class="w-100 mt-2">
+
+                                    <div class="card flex-grow-1 btn-block p-2">
+                                        <span>{{ r.recipe_name }}</span>
+                                        <span v-if="r.mealplan_type"><small class="text-muted">{{ r.mealplan_type }} {{ formatDate(r.mealplan_from_date) }}</small></span>
+                                    </div>
+
+
+                                    <b-button variant="danger" @click="deleteRecipe(r.shopping_list_recipe_id)"><i
+                                        class="fas fa-trash fa-fw"></i></b-button>
+                                </b-button-group>
+
+                                <number-scaler-component :number="r.servings" @change="updateServings(r, $event)"
+                                                         :disable="useShoppingListStore().currently_updating"></number-scaler-component>
+                                <hr class="m-2"/>
+                            </b-col>
+
+                        </b-row>
+                    </b-tab>
+                    <!-- --------------------------------------- supermarkets tab -->
+                    <b-tab>
+                        <template #title>
+                            <i class="fas fa-store-alt fa-fw"></i>
+                            <span class="d-none d-md-inline-block ml-1">{{
+                                    $t('Supermarkets') + ` (${shopping_list_store.supermarkets.length})`
+                                }}</span>
+                        </template>
+                        <div class="container p-0">
+                            <div class="row">
+                                <div class="col col-md-12 p-0 p-lg-3">
+                                    <b-col role="tablist">
+                                        <!-- add to shopping form -->
+                                        <div class="container">
+                                            <b-row>
+                                                <b-col cols="12" md="6">
+                                                    <h5>{{ $t("Supermarkets") }}
+                                                        <span class="float-right text-primary" style="cursor: pointer"><i
+                                                            class="fa fa-plus-circle" v-plus-button
+                                                            @click="addSupermarket"
+                                                            aria-hidden="true"></i
+                                                        ></span></h5>
+                                                    <b-list-group>
+                                                        <b-card no-body class="mt-1 list-group-item p-2"
+                                                                v-for="(supermarket, index) in shopping_list_store.supermarkets"
+                                                                v-hover
+                                                                :key="supermarket.id">
+                                                            <b-card-header class="p-2 border-0">
+                                                                <b-row>
+                                                                    <b-col cols="12">
+                                                                        <h5 class="mt-1 mb-1">
+                                                                            {{ supermarket.name }}
+                                                                            <span class="float-right text-primary"
+                                                                                  style="cursor: pointer"
+                                                                            ><i class="fa"
+                                                                                v-bind:class="{ 'fa-pen': !supermarket.editing, 'fa-save': supermarket.editing }"
+                                                                                @click="editOrSaveSupermarket(index)"
+                                                                                aria-hidden="true"></i
+                                                                            ></span>
+                                                                        </h5>
+                                                                        <span class="text-muted"
+                                                                              v-if="supermarket.description !== ''">{{
+                                                                                supermarket.description
+                                                                            }}</span>
+                                                                    </b-col>
+                                                                </b-row>
+                                                            </b-card-header>
+                                                            <b-card-body class="p-4" v-if="supermarket.editing">
+                                                                <div class="form-group">
+                                                                    <label>{{ $t("Name") }}</label>
+                                                                    <input class="form-control" :placeholder="$t('Name')"
+                                                                           v-model="supermarket.name"/>
+                                                                </div>
+                                                                <div class="form-group">
+                                                                    <label>{{ $t("Description") }}</label>
+                                                                    <input class="form-control" :placeholder="$t('Description')"
+                                                                           v-model="supermarket.description"/>
+                                                                </div>
+                                                                <button class="btn btn-danger"
+                                                                        @click="deleteSupermarket(index)">
+                                                                    {{ $t("Delete") }}
+                                                                </button>
+                                                                <button class="btn btn-primary float-right"
+                                                                        @click="editOrSaveSupermarket(index)">
+                                                                    {{ $t("Save") }}
+                                                                </button>
+                                                            </b-card-body>
+                                                        </b-card>
+                                                    </b-list-group>
+                                                </b-col>
+                                                <b-col cols="12" md="6">
+                                                    <h5 v-if="editingSupermarket.length > 0">{{ $t("Shopping_Categories") }} -
+                                                        {{ editingSupermarket[0].name }}</h5>
+                                                    <h5 v-else>{{ $t("Shopping_Categories") }}
+                                                        <span class="float-right text-primary" v-plus-button
+                                                              style="cursor: pointer"><i
+                                                            class="fa fa-plus-circle" v-plus-button
+                                                            @click="addSupermarketCategory"
+                                                            aria-hidden="true"></i
+                                                        ></span>
+                                                    </h5>
+                                                    <div v-if="editingSupermarket.length === 0">
+                                                        <b-list-group>
+                                                            <b-card no-body class="mt-1 list-group-item p-2"
+                                                                    v-for="(category, index) in shopping_list_store.supermarket_categories"
+                                                                    v-hover
+                                                                    :key="category.id">
+                                                                <b-card-header class="p-2 border-0">
+                                                                    <b-row>
+                                                                        <b-col cols="12">
+                                                                            <h5 class="mt-1 mb-1">
+                                                                                {{ category.name }}
+                                                                                <span class="float-right text-primary"
+                                                                                      style="cursor: pointer"
+                                                                                ><i class="fa"
+                                                                                    v-bind:class="{ 'fa-pen': !category.editing, 'fa-save': category.editing }"
+                                                                                    @click="editOrSaveSupermarketCategory(index)"
+                                                                                    aria-hidden="true"></i
+                                                                                ></span>
+                                                                            </h5>
+                                                                        </b-col>
+                                                                    </b-row>
+                                                                </b-card-header>
+                                                                <b-card-body class="p-4" v-if="category.editing">
+                                                                    <div class="form-group">
+                                                                        <label>{{ $t("Name") }}</label>
+                                                                        <input class="form-control" :placeholder="$t('Name')"
+                                                                               v-model="category.name"/>
+                                                                    </div>
+                                                                    <div class="form-group">
+                                                                        <label>{{ $t("Description") }}</label>
+                                                                        <input class="form-control"
+                                                                               :placeholder="$t('Description')"
+                                                                               v-model="category.description"/>
+                                                                    </div>
+                                                                    <button class="btn btn-danger"
+                                                                            @click="deleteSupermarketCategory(index)">
+                                                                        {{ $t("Delete") }}
+                                                                    </button>
+                                                                    <button class="btn btn-primary float-right"
+                                                                            @click="editOrSaveSupermarketCategory(index)">
+                                                                        {{ $t("Save") }}
+                                                                    </button>
+                                                                </b-card-body>
+                                                            </b-card>
+                                                        </b-list-group>
+                                                    </div>
+                                                    <div v-else>
+                                                        <draggable :list="editing_supermarket_categories" group="categories"
+                                                                   :empty-insert-threshold="10"
+                                                                   @change="sortSupermarketCategories"
+                                                                   ghost-class="ghost">
+                                                            <b-card no-body class="mt-1 list-group-item p-2"
+                                                                    style="cursor: move"
+                                                                    v-for="(category, index) in editing_supermarket_categories"
+                                                                    v-hover
+                                                                    :key="category.id">
+                                                                <b-card-header class="p-2 border-0">
+                                                                    <div class="row">
+                                                                        <div class="col-2">
+                                                                            <button type="button"
+                                                                                    class="btn btn-lg shadow-none"><i
+                                                                                class="fas fa-arrows-alt-v"></i></button>
+                                                                        </div>
+                                                                        <div class="col-10">
+                                                                            <h5 class="mt-1 mb-1">
+                                                                                <b-badge class="float-left text-white mr-2">
+                                                                                    #{{ index + 1 }}
+                                                                                </b-badge>
+                                                                                {{ category.name }}
+                                                                                <span class="float-right text-primary"
+                                                                                      style="cursor: pointer"
+                                                                                ><i class="fa fa-minus-circle" v-minus-button
+                                                                                    @click="removeSupermarketCategoryRelationAtIndex(index)"
+                                                                                    aria-hidden="true"></i
+                                                                                ></span>
+                                                                            </h5>
+                                                                        </div>
+                                                                    </div>
+                                                                </b-card-header>
+                                                            </b-card>
+                                                        </draggable>
+                                                        <h5>{{ $t("Available") }}</h5>
+                                                        <draggable :list="unusedSupermarketCategories" group="categories"
+                                                                   :empty-insert-threshold="10"
+                                                                   ghost-class="ghost">
+                                                            <b-card no-body class="mt-1 list-group-item p-2"
+                                                                    style="cursor: move"
+                                                                    v-for="(category) in unusedSupermarketCategories"
+                                                                    v-hover
+                                                                    :key="category.id">
+                                                                <b-card-header class="p-2 border-0">
+                                                                    <div class="row">
+                                                                        <div class="col-2">
+                                                                            <button type="button"
+                                                                                    class="btn btn-lg shadow-none"><i
+                                                                                class="fas fa-arrows-alt-v"></i></button>
+                                                                        </div>
+                                                                        <div class="col-10">
+                                                                            <h5 class="mt-1 mb-1">
+                                                                                {{ category.name }}
+                                                                                <span class="float-right text-primary"
+                                                                                      style="cursor: pointer"
+                                                                                ><i class="fa fa-plus-circle" v-plus-button
+                                                                                    @click="addSupermarketCategoryRelation(category)"
+                                                                                    aria-hidden="true"></i
+                                                                                ></span>
+                                                                            </h5>
+                                                                        </div>
+                                                                    </div>
+                                                                </b-card-header>
+                                                            </b-card>
+                                                        </draggable>
+                                                    </div>
+                                                </b-col>
+                                            </b-row>
+                                        </div>
+                                    </b-col>
+                                </div>
+                            </div>
                         </div>
-                    </div>
-                </div>
-            </b-tab>
-            <!-- --------------------------------------- settings tab -->
-            <b-tab>
-                <template #title>
-                    <i class="fas fa-user-cog fa-fw"></i>
-                    <span class="d-none d-md-inline-block ml-1">{{ $t('Settings') }}</span>
-                </template>
-                <div class="row justify-content-center">
-                    <div class="col-12 col-md-8">
-                        <shopping-settings-component></shopping-settings-component>
-                    </div>
-                </div>
-            </b-tab>
-        </b-tabs>
+                    </b-tab>
+                    <!-- --------------------------------------- settings tab -->
+                    <b-tab>
+                        <template #title>
+                            <i class="fas fa-user-cog fa-fw"></i>
+                            <span class="d-none d-md-inline-block ml-1">{{ $t('Settings') }}</span>
+                        </template>
+                        <div class="row justify-content-center">
+                            <div class="col-12 col-md-8">
+                                <shopping-settings-component></shopping-settings-component>
+                            </div>
+                        </div>
+                    </b-tab>
+                </b-tabs>
+            </div>
+        </div>
+
 
         <!-- TODO maybe change to a modal ? -->
         <b-popover target="id_filters_button" triggers="click" placement="bottomleft" :title="$t('Filters')">

From 09c1446c06043f71967380e94acdff4193807b0b Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sun, 28 Jan 2024 11:39:00 +0100
Subject: [PATCH 66/95] fixed pdf export

---
 vue/package.json                              |  1 -
 .../ShoppingListView/ShoppingListView.vue     | 50 +++++++++++--------
 vue/src/components/Buttons/DownloadPDF.vue    |  8 +--
 vue/src/components/ShoppingLineItem.vue       |  4 +-
 4 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/vue/package.json b/vue/package.json
index 4f56ee31..6f37951c 100644
--- a/vue/package.json
+++ b/vue/package.json
@@ -23,7 +23,6 @@
     "babel-loader": "^9.1.0",
     "bootstrap-vue": "^2.23.1",
     "core-js": "^3.29.1",
-    "html2pdf.js": "^0.10.1",
     "lodash": "^4.17.21",
     "mavon-editor": "^2.10.4",
     "moment": "^2.29.4",
diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index bcaa58da..1549c1ca 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -7,7 +7,7 @@
         <div class="row">
             <div class="col-12 col-xl-8 offset-xl-2">
                 <div class="row float-top w-100">
-                    <div class="col-auto no-gutter ml-auto">
+                    <div class="col-auto no-gutter ml-auto d-print-none">
                         <b-button variant="link" @click="useShoppingListStore().undoChange()"><i class="fas fa-undo"></i>
                         </b-button>
 
@@ -37,16 +37,17 @@
                     <!-- shopping list tab -->
                     <b-tab active>
                         <template #title>
-                            <i v-if="!shopping_list_store.currently_updating && useShoppingListStore().autosync_has_focus"
-                               class="fas fa-shopping-cart fa-fw"></i>
-                            <i v-if="!shopping_list_store.currently_updating && !useShoppingListStore().autosync_has_focus"
-                               class="fas fa-eye-slash"></i>
-                            <b-spinner v-if="shopping_list_store.currently_updating" type="border" small
-                                       style="width: 1.25em!important; height: 1.25em!important;"></b-spinner>
-                            <span class="d-none d-md-inline-block ml-1">
-                        {{ $t('Shopping_list') + ` (${shopping_list_store.total_unchecked_food})` }}
-                    </span>
-
+                            <div class="d-print-none">
+                                <i v-if="!shopping_list_store.currently_updating && useShoppingListStore().autosync_has_focus"
+                                   class="fas fa-shopping-cart fa-fw"></i>
+                                <i v-if="!shopping_list_store.currently_updating && !useShoppingListStore().autosync_has_focus"
+                                   class="fas fa-eye-slash"></i>
+                                <b-spinner v-if="shopping_list_store.currently_updating" type="border" small
+                                           style="width: 1.25em!important; height: 1.25em!important;"></b-spinner>
+                                <span class="d-none d-md-inline-block ml-1">
+                                    {{ $t('Shopping_list') + ` (${shopping_list_store.total_unchecked_food})` }}
+                                </span>
+                            </div>
                         </template>
 
                         <b-row class="d-lg-block d-print-none d-none pr-1 pl-1 mb-3 mt-3">
@@ -77,7 +78,7 @@
                                     }}</span>
                                         <span v-else>{{ c.name }}</span>
                                     </b-button>
-                                    <b-button
+                                    <b-button class="d-print-none "
                                         :class="{'btn-success':(c.count_unchecked > 0), 'btn-warning': (c.count_unchecked <= 0)}"
                                         @click="checkGroup(c, (c.count_unchecked > 0))">
                                         <i class="fas fa-fw"
@@ -95,10 +96,13 @@
                     <!-- --------------------------------------- recipe tab -->
                     <b-tab :title="$t('Recipes')">
                         <template #title>
-                            <i class="fas fa-book fa-fw"></i>
-                            <span class="d-none d-md-inline-block ml-1">{{
-                                    $t('Recipes') + ` (${Object.keys(shopping_list_store.getAssociatedRecipes()).length})`
-                                }}</span>
+                            <div class="d-print-none">
+                                <i class="fas fa-book fa-fw"></i>
+                                <span class="d-none d-md-inline-block ml-1">{{
+                                        $t('Recipes') + ` (${Object.keys(shopping_list_store.getAssociatedRecipes()).length})`
+                                    }}</span>
+                            </div>
+
                         </template>
 
                         <b-row class="d-lg-block d-print-none d-none pr-1 pl-1 mb-3 mt-3">
@@ -137,10 +141,10 @@
                     <!-- --------------------------------------- supermarkets tab -->
                     <b-tab>
                         <template #title>
-                            <i class="fas fa-store-alt fa-fw"></i>
-                            <span class="d-none d-md-inline-block ml-1">{{
-                                    $t('Supermarkets') + ` (${shopping_list_store.supermarkets.length})`
-                                }}</span>
+                            <div class="d-print-none">
+                                <i class="fas fa-store-alt fa-fw"></i>
+                                <span class="d-none d-md-inline-block ml-1">{{ $t('Supermarkets') + ` (${shopping_list_store.supermarkets.length})` }}</span>
+                            </div>
                         </template>
                         <div class="container p-0">
                             <div class="row">
@@ -339,8 +343,10 @@
                     <!-- --------------------------------------- settings tab -->
                     <b-tab>
                         <template #title>
-                            <i class="fas fa-user-cog fa-fw"></i>
-                            <span class="d-none d-md-inline-block ml-1">{{ $t('Settings') }}</span>
+                            <div class="d-print-none">
+                                <i class="fas fa-user-cog fa-fw"></i>
+                                <span class="d-none d-md-inline-block ml-1">{{ $t('Settings') }}</span>
+                            </div>
                         </template>
                         <div class="row justify-content-center">
                             <div class="col-12 col-md-8">
diff --git a/vue/src/components/Buttons/DownloadPDF.vue b/vue/src/components/Buttons/DownloadPDF.vue
index fd7560f9..ce9ea626 100644
--- a/vue/src/components/Buttons/DownloadPDF.vue
+++ b/vue/src/components/Buttons/DownloadPDF.vue
@@ -6,7 +6,6 @@
 </template>
 
 <script>
-import html2pdf from "html2pdf.js"
 
 export default {
     name: "DownloadPDF",
@@ -20,12 +19,7 @@ export default {
     },
     methods: {
         downloadFile() {
-            const doc = document.querySelector(this.dom)
-            var options = {
-                margin: 1,
-                filename: this.name,
-            }
-            html2pdf().from(doc).set(options).save()
+            window.print()
         },
     },
 }
diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index 5ac7bab3..fbc9957f 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -23,8 +23,8 @@
                 <span v-if="info_row"><small class="text-muted">{{ info_row }}</small></span>
             </div>
             <b-button variant="success" @click="useShoppingListStore().setEntriesCheckedState(entries, !is_checked)"
-                      :class="{'btn-success': !is_checked, 'btn-warning': is_checked}">
-                <i class="fa-fw fas" :class="{'fa-check': !is_checked , 'fa-cart-plus': is_checked }"></i>
+                      :class="{'btn-success': !is_checked, 'btn-warning': is_checked}" >
+                <i class="d-print-none fa-fw fas" :class="{'fa-check': !is_checked , 'fa-cart-plus': is_checked }"></i>
             </b-button>
         </b-button-group>
         <div class="swipe-action bg-primary justify-content-end">

From 5853ca9243d12e49b2a025dd39f9eb705f875d3e Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sun, 28 Jan 2024 12:06:27 +0100
Subject: [PATCH 67/95] handle partially delayed/checked

---
 vue/src/components/ShoppingLineItem.vue | 63 ++++++++++++++++---------
 1 file changed, 42 insertions(+), 21 deletions(-)

diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index fbc9957f..522b1e19 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -13,7 +13,10 @@
             <div class="card flex-grow-1 btn-block p-2" @click="detail_modal_visible = true">
                 <div class="d-flex">
                     <div class="d-flex flex-column pr-2" v-if="Object.keys(amounts).length> 0">
-                        <span v-for="a in amounts" v-bind:key="a.id">{{ a.amount }} {{ a.unit }}<br/></span>
+                        <span v-for="a in amounts" v-bind:key="a.id">
+
+                            <span><i class="fas fa-check" v-if="a.checked && !is_checked"></i> {{ a.amount }} {{ a.unit }}</span>
+                            <br/></span>
                     </div>
                     <div class="d-flex  flex-column flex-grow-1 align-self-center">
                         {{ food.name }}
@@ -22,8 +25,8 @@
 
                 <span v-if="info_row"><small class="text-muted">{{ info_row }}</small></span>
             </div>
-            <b-button variant="success" @click="useShoppingListStore().setEntriesCheckedState(entries, !is_checked)"
-                      :class="{'btn-success': !is_checked, 'btn-warning': is_checked}" >
+            <b-button variant="success" @click="useShoppingListStore().setEntriesCheckedState(entries, !is_checked, true)"
+                      :class="{'btn-success': !is_checked, 'btn-warning': is_checked}">
                 <i class="d-print-none fa-fw fas" :class="{'fa-check': !is_checked , 'fa-cart-plus': is_checked }"></i>
             </b-button>
         </b-button-group>
@@ -50,8 +53,7 @@
                     @change="detail_modal_visible = false; updateFoodCategory(food)"
                 ></b-form-select>
 
-                <!-- TODO implement -->
-                <!--                <b-button variant="success" block @click="detail_modal_visible = false;"> {{ $t("Edit_Food") }}</b-button>  -->
+                <b-button variant="warning" block @click="detail_modal_visible = false; setFoodIgnoredAndChecked(food)"> {{ $t("Ignore_Shopping") }}</b-button>
 
                 <b-button variant="info" block
                           @click="detail_modal_visible = false;useShoppingListStore().delayEntries(entries,!this.is_delayed, true)">
@@ -67,7 +69,7 @@
 
                         <b-button-group class="w-100">
                             <div class="card flex-grow-1 btn-block p-2">
-                                <span><span v-if="e.amount > 0">{{ e.amount }}</span> {{ e.unit?.name }} {{ food.name }}</span>
+                                <span><i class="fas fa-check" v-if="e.checked"></i> <span v-if="e.amount > 0">{{ e.amount }}</span> {{ e.unit?.name }} {{ food.name }}</span>
                                 <span><small class="text-muted">
                                     <span v-if="e.recipe_mealplan && e.recipe_mealplan.recipe_name !== ''">
                                         <a :href="resolveDjangoUrl('view_recipe', e.recipe_mealplan.recipe)"> {{
@@ -175,23 +177,27 @@ export default {
             for (let i in this.entries) {
                 let e = this.entries[i]
 
-                let unit = -1
-                if (e.unit !== undefined && e.unit !== null) {
-                    unit = e.unit.id
-                }
-                if (e.amount > 0) {
-                    if (unit in unit_amounts) {
-                        unit_amounts[unit]['amount'] += e.amount
-                    } else {
-                        if (unit === -1) {
-                            unit_amounts[unit] = {id: -1, unit: "", amount: e.amount}
-                        } else {
-                            unit_amounts[unit] = {id: e.unit.id, unit: e.unit.name, amount: e.amount}
-                        }
+                if (!e.checked && e.delay_until === null
+                    || (e.checked && useUserPreferenceStore().device_settings.shopping_show_checked_entries)
+                    || (e.delay_until !== null && useUserPreferenceStore().device_settings.shopping_show_delayed_entries)) {
 
+                    let unit = -1
+                    if (e.unit !== undefined && e.unit !== null) {
+                        unit = e.unit.id
+                    }
+                    if (e.amount > 0) {
+                        if (unit in unit_amounts) {
+                            unit_amounts[unit]['amount'] += e.amount
+                        } else {
+                            if (unit === -1) {
+                                unit_amounts[unit] = {id: -1, unit: "", amount: e.amount, checked: e.checked}
+                            } else {
+                                unit_amounts[unit] = {id: e.unit.id, unit: e.unit.name, amount: e.amount, checked: e.checked}
+                            }
+
+                        }
                     }
                 }
-
             }
             return unit_amounts
         },
@@ -266,6 +272,21 @@ export default {
                 StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
             })
         },
+        /**
+         * set food on_hand status to true and check all associated entries
+         * @param food
+         */
+        setFoodIgnoredAndChecked: function (food) {
+            let apiClient = new ApiApiFactory()
+
+            food.ignore_shopping = true
+            apiClient.updateFood(food.id, food).then(r => {
+            }).catch((err) => {
+                StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
+            })
+
+            useShoppingListStore().setEntriesCheckedState(this.entries, true, false)
+        },
         /**
          * function triggered by touchend event of swipe container
          * check if min distance is reached and execute desired action
@@ -276,7 +297,7 @@ export default {
             // get the distance the user swiped
             const swipeDistance = container.scrollLeft - container.clientWidth;
             if (swipeDistance < minDistance * -1) {
-                useShoppingListStore().setEntriesCheckedState(this.entries, !this.is_checked)
+                useShoppingListStore().setEntriesCheckedState(this.entries, !this.is_checked, true)
             } else if (swipeDistance > minDistance) {
                 useShoppingListStore().delayEntries(this.entries, !this.is_delayed, true)
             }

From 44f6a581c7389f133d9b2003be5c00b6fda6ea05 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sun, 28 Jan 2024 12:11:25 +0100
Subject: [PATCH 68/95] some more icons

---
 vue/src/components/ShoppingLineItem.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index 522b1e19..ced5f36d 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -15,7 +15,7 @@
                     <div class="d-flex flex-column pr-2" v-if="Object.keys(amounts).length> 0">
                         <span v-for="a in amounts" v-bind:key="a.id">
 
-                            <span><i class="fas fa-check" v-if="a.checked && !is_checked"></i> {{ a.amount }} {{ a.unit }}</span>
+                            <span><i class="fas fa-check" v-if="a.checked && !is_checked"></i><i class="fas fa-hourglass-half" v-if="a.delayed && !a.checked"></i> {{ a.amount }} {{ a.unit }}</span>
                             <br/></span>
                     </div>
                     <div class="d-flex  flex-column flex-grow-1 align-self-center">
@@ -69,7 +69,7 @@
 
                         <b-button-group class="w-100">
                             <div class="card flex-grow-1 btn-block p-2">
-                                <span><i class="fas fa-check" v-if="e.checked"></i> <span v-if="e.amount > 0">{{ e.amount }}</span> {{ e.unit?.name }} {{ food.name }}</span>
+                                <span><i class="fas fa-check" v-if="e.checked"></i><i class="fas fa-hourglass-half" v-if="e.delay_until !== null && !e.checked"></i> <span v-if="e.amount > 0">{{ e.amount }}</span> {{ e.unit?.name }} {{ food.name }}</span>
                                 <span><small class="text-muted">
                                     <span v-if="e.recipe_mealplan && e.recipe_mealplan.recipe_name !== ''">
                                         <a :href="resolveDjangoUrl('view_recipe', e.recipe_mealplan.recipe)"> {{
@@ -190,9 +190,9 @@ export default {
                             unit_amounts[unit]['amount'] += e.amount
                         } else {
                             if (unit === -1) {
-                                unit_amounts[unit] = {id: -1, unit: "", amount: e.amount, checked: e.checked}
+                                unit_amounts[unit] = {id: -1, unit: "", amount: e.amount, checked: e.checked, delayed: (e.delay_until !== null)}
                             } else {
-                                unit_amounts[unit] = {id: e.unit.id, unit: e.unit.name, amount: e.amount, checked: e.checked}
+                                unit_amounts[unit] = {id: e.unit.id, unit: e.unit.name, amount: e.amount, checked: e.checked, delayed: (e.delay_until !== null)}
                             }
 
                         }

From 3fbfcb9939eb8a4539bb3d781ac59e2be356935b Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sun, 28 Jan 2024 12:17:46 +0100
Subject: [PATCH 69/95] translation and minor style tweaks

---
 vue/src/apps/ShoppingListView/ShoppingListView.vue | 12 ++++++------
 vue/src/locales/en.json                            |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 1549c1ca..2f0ae580 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -8,8 +8,7 @@
             <div class="col-12 col-xl-8 offset-xl-2">
                 <div class="row float-top w-100">
                     <div class="col-auto no-gutter ml-auto d-print-none">
-                        <b-button variant="link" @click="useShoppingListStore().undoChange()"><i class="fas fa-undo"></i>
-                        </b-button>
+                        <i class="fas fa-undo fa-fw mr-2" @click="useShoppingListStore().undoChange()"></i>
 
                         <b-button variant="link" class="px-1 pt-0 pb-1 d-none d-md-inline-block">
                             <i class="fas fa-download fa-lg nav-link dropdown-toggle text-primary px-1"
@@ -28,8 +27,9 @@
                                                  :label="$t('copy_markdown_table')" icon="fab fa-markdown"/>
                             </div>
                         </b-button>
-                        <i id="id_filters_button" class="fas fa-filter fa-fw mt-1" style="font-size: 16px; cursor: pointer"
-                        />
+
+                        <i id="id_filters_button" class="fas fa-filter fa-fw mt-1" style="font-size: 16px; cursor: pointer"/>
+
                     </div>
                 </div>
 
@@ -79,8 +79,8 @@
                                         <span v-else>{{ c.name }}</span>
                                     </b-button>
                                     <b-button class="d-print-none "
-                                        :class="{'btn-success':(c.count_unchecked > 0), 'btn-warning': (c.count_unchecked <= 0)}"
-                                        @click="checkGroup(c, (c.count_unchecked > 0))">
+                                              :class="{'btn-success':(c.count_unchecked > 0), 'btn-warning': (c.count_unchecked <= 0)}"
+                                              @click="checkGroup(c, (c.count_unchecked > 0))">
                                         <i class="fas fa-fw"
                                            :class="{'fa-check':(c.count_unchecked > 0), 'fa-cart-plus':(c.count_unchecked <= 0) }"></i>
                                     </b-button>
diff --git a/vue/src/locales/en.json b/vue/src/locales/en.json
index 35f9ed5c..a1f49865 100644
--- a/vue/src/locales/en.json
+++ b/vue/src/locales/en.json
@@ -243,6 +243,7 @@
 	"Week": "Week",
 	"Month": "Month",
 	"Year": "Year",
+	"created_by": "Created by",
 	"Planner": "Planner",
 	"Planner_Settings": "Planner settings",
 	"Period": "Period",

From 3c93e760d293809855c7ae7ea0d9fa8306f2f95c Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sun, 28 Jan 2024 12:21:24 +0100
Subject: [PATCH 70/95] no more loading spinner size flicker

---
 vue/src/apps/ShoppingListView/ShoppingListView.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 2f0ae580..386d2f1c 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -37,13 +37,13 @@
                     <!-- shopping list tab -->
                     <b-tab active>
                         <template #title>
-                            <div class="d-print-none">
+                            <div class="d-print-none fa-fw">
                                 <i v-if="!shopping_list_store.currently_updating && useShoppingListStore().autosync_has_focus"
                                    class="fas fa-shopping-cart fa-fw"></i>
                                 <i v-if="!shopping_list_store.currently_updating && !useShoppingListStore().autosync_has_focus"
                                    class="fas fa-eye-slash"></i>
-                                <b-spinner v-if="shopping_list_store.currently_updating" type="border" small
-                                           style="width: 1.25em!important; height: 1.25em!important;"></b-spinner>
+                                <b-spinner v-if="shopping_list_store.currently_updating" type="border"  small
+                                           style="line-height: 1!important;"></b-spinner>
                                 <span class="d-none d-md-inline-block ml-1">
                                     {{ $t('Shopping_list') + ` (${shopping_list_store.total_unchecked_food})` }}
                                 </span>

From 55877d69a08a2139dabcd8ea8067b48a430acac0 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sun, 28 Jan 2024 12:27:24 +0100
Subject: [PATCH 71/95] hopefully this really prevents multiple auto syncs even
 in HMR

---
 vue/src/apps/ShoppingListView/ShoppingListView.vue | 6 +++---
 vue/src/stores/ShoppingListStore.js                | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 386d2f1c..5063ba3a 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -570,11 +570,11 @@ export default {
          */
         autoSyncLoop: function () {
             // this should not happen in production but sometimes in development with HMR
-            clearTimeout(this.autosync_id)
-            this.autosync_id = undefined
+            clearTimeout(useShoppingListStore().autosync_timeout_id)
 
             let timeout = Math.max(this.user_preference_store.user_settings.shopping_auto_sync, 1) * 1000 // if disabled (shopping_auto_sync=0) check again after 1 second if enabled
-            this.autosync_id = setTimeout(() => {
+
+            useShoppingListStore().autosync_timeout_id = setTimeout(() => {
                 if (this.user_preference_store.user_settings.shopping_auto_sync > 0) {
                     this.shopping_list_store.autosync()
                 }
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index fd805a7e..9edb0e98 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -27,6 +27,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
         currently_updating: false,
         last_autosync: null,
         autosync_has_focus: true,
+        autosync_timeout_id: null,
         undo_stack: [],
 
         queue_timeout_id: undefined,

From 558a2d2a308aae9ed2b5b7b5ec08c8213f26a4c5 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sun, 28 Jan 2024 14:03:36 +0100
Subject: [PATCH 72/95] really no flickering maybe

---
 vue/src/apps/ShoppingListView/ShoppingListView.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 5063ba3a..c6ba179c 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -37,13 +37,14 @@
                     <!-- shopping list tab -->
                     <b-tab active>
                         <template #title>
-                            <div class="d-print-none fa-fw">
+                            <div class="d-print-none">
                                 <i v-if="!shopping_list_store.currently_updating && useShoppingListStore().autosync_has_focus"
-                                   class="fas fa-shopping-cart fa-fw"></i>
+                                   class="fas fa-shopping-cart fa-fw" style=" height: 1.25em!important;"></i>
                                 <i v-if="!shopping_list_store.currently_updating && !useShoppingListStore().autosync_has_focus"
-                                   class="fas fa-eye-slash"></i>
-                                <b-spinner v-if="shopping_list_store.currently_updating" type="border"  small
-                                           style="line-height: 1!important;"></b-spinner>
+                                   class="fas fa-eye-slash fa-fw" style=" height: 1.25em!important;"></i>
+                                <b-spinner v-if="shopping_list_store.currently_updating" type="border" small
+                                           style="line-height: 1!important;width:1.25em!important; height: 1.25em!important;"></b-spinner>
+
                                 <span class="d-none d-md-inline-block ml-1">
                                     {{ $t('Shopping_list') + ` (${shopping_list_store.total_unchecked_food})` }}
                                 </span>

From 79b57eab13dfdebf19560020474c621abf299fab Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sun, 28 Jan 2024 16:29:53 +0100
Subject: [PATCH 73/95] fixed paddings/horizontal scrol

---
 .../ShoppingListView/ShoppingListView.vue     | 148 ++++--------------
 vue/src/components/BottomNavigationBar.vue    |   8 +-
 2 files changed, 33 insertions(+), 123 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index c6ba179c..037a0dcc 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -6,15 +6,20 @@
 
         <div class="row">
             <div class="col-12 col-xl-8 offset-xl-2">
-                <div class="row float-top w-100">
-                    <div class="col-auto no-gutter ml-auto d-print-none">
-                        <i class="fas fa-undo fa-fw mr-2" @click="useShoppingListStore().undoChange()"></i>
 
-                        <b-button variant="link" class="px-1 pt-0 pb-1 d-none d-md-inline-block">
-                            <i class="fas fa-download fa-lg nav-link dropdown-toggle text-primary px-1"
-                               id="downloadShoppingLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></i>
+                <b-tabs content-class="mt-2" v-model="current_tab" class="mt-md-1" style="margin-bottom: 20vh">
+                    <template #tabs-end>
+                        <li class="nav-item flex-grow-1" >
 
-                            <div class="dropdown-menu dropdown-menu-right" aria-labelledby="downloadShoppingLink">
+                        </li>
+                        <li class="nav-item" >
+                            <a href="#" class="nav-link" @click="useShoppingListStore().undoChange()"> <i class="fas fa-undo fa-fw"></i>&nbsp;</a>
+                        </li>
+                        <li class="nav-item dropdown d-none d-md-inline-block" >
+                            <a class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-expanded="false">
+                                <i class="fas fa-download" ></i>&nbsp;
+                            </a>
+                            <div class="dropdown-menu">
                                 <DownloadPDF dom="#shoppinglist" name="shopping.pdf" :label="$t('download_pdf')"
                                              icon="far fa-file-pdf"/>
                                 <DownloadCSV :items="shopping_list_store.get_flat_entries" :delim="user_preference_store.user_settings.csv_delim"
@@ -26,16 +31,16 @@
                                 <CopyToClipboard :items="shopping_list_store.get_flat_entries" :settings="user_preference_store.user_settings" format="table"
                                                  :label="$t('copy_markdown_table')" icon="fab fa-markdown"/>
                             </div>
-                        </b-button>
+                        </li>
+                        <li class="nav-item">
+                            <a href="#" class="nav-link" id="id_filters_button">
+                                <i  class="fas fa-filter fa-fw"/>&nbsp;
+                            </a>
+                        </li>
+                    </template>
 
-                        <i id="id_filters_button" class="fas fa-filter fa-fw mt-1" style="font-size: 16px; cursor: pointer"/>
-
-                    </div>
-                </div>
-
-                <b-tabs content-class="mt-2" v-model="current_tab" class="mt-md-1" style="margin-top: 22px;">
                     <!-- shopping list tab -->
-                    <b-tab active>
+                    <b-tab>
                         <template #title>
                             <div class="d-print-none">
                                 <i v-if="!shopping_list_store.currently_updating && useShoppingListStore().autosync_has_focus"
@@ -45,13 +50,14 @@
                                 <b-spinner v-if="shopping_list_store.currently_updating" type="border" small
                                            style="line-height: 1!important;width:1.25em!important; height: 1.25em!important;"></b-spinner>
 
-                                <span class="d-none d-md-inline-block ml-1">
+                                <span class="d-none d-lg-inline-block ml-1">
                                     {{ $t('Shopping_list') + ` (${shopping_list_store.total_unchecked_food})` }}
                                 </span>
                             </div>
                         </template>
 
-                        <b-row class="d-lg-block d-print-none d-none pr-1 pl-1 mb-3 mt-3">
+                        <!-- Entry input on large screens -->
+                        <b-row class="d-lg-block d-print-none d-none mb-3 mt-3">
                             <b-col cols="12">
                                 <b-input-group>
                                     <b-form-input type="text" :placeholder="$t('Food')"
@@ -68,7 +74,7 @@
                         </b-row>
 
                         <!-- --------------------------------------- shopping list table -->
-                        <b-row v-for="c in shopping_list_store.get_entries_by_group" v-bind:key="c.id" class="pr-1 pl-1">
+                        <b-row v-for="c in shopping_list_store.get_entries_by_group" v-bind:key="c.id">
                             <b-col cols="12"
                                    v-if="c.count_unchecked > 0 || user_preference_store.device_settings.shopping_show_checked_entries && (c.count_unchecked + c.count_checked) > 0">
                                 <b-button-group class="w-100 mt-1"
@@ -99,7 +105,7 @@
                         <template #title>
                             <div class="d-print-none">
                                 <i class="fas fa-book fa-fw"></i>
-                                <span class="d-none d-md-inline-block ml-1">{{
+                                <span class="d-none d-lg-inline-block ml-1">{{
                                         $t('Recipes') + ` (${Object.keys(shopping_list_store.getAssociatedRecipes()).length})`
                                     }}</span>
                             </div>
@@ -144,7 +150,7 @@
                         <template #title>
                             <div class="d-print-none">
                                 <i class="fas fa-store-alt fa-fw"></i>
-                                <span class="d-none d-md-inline-block ml-1">{{ $t('Supermarkets') + ` (${shopping_list_store.supermarkets.length})` }}</span>
+                                <span class="d-none d-lg-inline-block ml-1">{{ $t('Supermarkets') + ` (${shopping_list_store.supermarkets.length})` }}</span>
                             </div>
                         </template>
                         <div class="container p-0">
@@ -346,7 +352,7 @@
                         <template #title>
                             <div class="d-print-none">
                                 <i class="fas fa-user-cog fa-fw"></i>
-                                <span class="d-none d-md-inline-block ml-1">{{ $t('Settings') }}</span>
+<!--                                <span class="d-none d-lg-inline-block ml-1">{{ $t('Settings') }}</span>-->
                             </div>
                         </template>
                         <div class="row justify-content-center">
@@ -359,9 +365,8 @@
             </div>
         </div>
 
-
         <!-- TODO maybe change to a modal ? -->
-        <b-popover target="id_filters_button" triggers="click" placement="bottomleft" :title="$t('Filters')">
+        <b-popover target="id_filters_button" triggers="click blur" placement="bottomleft" :title="$t('Filters')">
             <div>
                 <b-form-group v-bind:label="$t('GroupBy')" label-for="popover-input-1" label-cols="6" class="mb-1">
                     <b-form-select v-model="user_preference_store.device_settings.shopping_selected_grouping" size="sm">
@@ -423,11 +428,9 @@
 
         <bottom-navigation-bar active-view="view_shopping">
             <template #custom_nav_content v-if="current_tab <= 1">
-                <b-row class="pr-1 pl-1 mb-3">
+                <b-row class="mb-2">
                     <b-col cols="12">
                         <template v-if="current_tab===0">
-
-
                             <b-input-group>
                                 <b-form-input v-model="new_item.ingredient" :placeholder="$t('Food')"
                                               @keyup.enter="addItem"></b-form-input>
@@ -921,99 +924,6 @@ export default {
 }
 </script>
 
-<!--style src="vue-multiselect/dist/vue-multiselect.min.css"></style-->
-
 <style>
-.rotate {
-    -moz-transition: all 0.25s linear;
-    -webkit-transition: all 0.25s linear;
-    transition: all 0.25s linear;
-}
-
-.btn[aria-expanded="true"] > .rotate {
-    -moz-transform: rotate(90deg);
-    -webkit-transform: rotate(90deg);
-    transform: rotate(90deg);
-}
-
-.float-top {
-    padding-bottom: -3em;
-    margin-bottom: -3em;
-}
-
-.float-up {
-    padding-top: -3em;
-    margin-top: -3em;
-}
-
-.ghost {
-    opacity: 0.5;
-    background: #c8ebfb;
-}
-
-.slide-fade-enter-active,
-.slide-fade-leave-active {
-    transition: all 0.2s ease;
-}
-
-.slide-fade-enter, .slide-fade-leave-to
-    /* .slider-fade-leave-active below version 2.1.8 */
-{
-    transform: translateX(10px);
-    opacity: 0;
-}
-
-.form-control-append {
-    font-size: 20px;
-}
-
-#shoppinglist {
-    display: flex;
-    flex-direction: column;
-    flex-grow: 1;
-    overflow-y: scroll;
-    overflow-x: hidden;
-    height: calc(100vh - 170px);
-}
-
-#id_base_container {
-    padding-right: 5px;
-    padding-left: 5px;
-}
-
-input {
-    font-size: 16px !important;
-}
-
-@media (max-width: 991.9px) {
-    #shoppinglist {
-        max-width: none;
-    }
-}
-
-@media (min-width: 992px) {
-    #shoppinglist {
-        overflow-y: auto;
-        overflow-x: auto;
-        height: auto;
-        margin: auto;
-    }
-
-    #id_base_container {
-        padding-right: 15px;
-        padding-left: 15px;
-    }
-}
-
-.settings-checkbox {
-    font-size: 0.3rem;
-}
-
-@media (max-width: 767.9px) {
-    .recipe-table {
-        font-size: 14px;
-    }
-}
-
 
 </style>
diff --git a/vue/src/components/BottomNavigationBar.vue b/vue/src/components/BottomNavigationBar.vue
index 23b0a244..71002710 100644
--- a/vue/src/components/BottomNavigationBar.vue
+++ b/vue/src/components/BottomNavigationBar.vue
@@ -11,14 +11,14 @@
             <div class="flex-column" v-if="show_button_1">
                 <slot name="button_1">
                     <a class="nav-link bottom-nav-link p-0" v-bind:class="{'bottom-nav-link-active': activeView === 'view_search' }" v-bind:href="resolveDjangoUrl('view_search')">
-                        <i class="fas fa-fw fa-book " style="font-size: 1.5em"></i><br/><small>{{ $t('Recipes') }}</small></a> <!-- TODO localize -->
+                        <i class="fas fa-fw fa-book " style="font-size: 1.4em"></i><br/><small>{{ $t('Recipes') }}</small></a> <!-- TODO localize -->
                 </slot>
 
             </div>
             <div class="flex-column" v-if="show_button_2">
                 <slot name="button_2">
                     <a class="nav-link bottom-nav-link p-0" v-bind:class="{'bottom-nav-link-active': activeView === 'view_plan' }" v-bind:href="resolveDjangoUrl('view_plan')">
-                        <i class="fas fa-calendar-alt" style="font-size: 1.5em"></i><br/><small>{{ $t('Meal_Plan') }}</small></a>
+                        <i class="fas fa-calendar-alt" style="font-size: 1.4em"></i><br/><small>{{ $t('Meal_Plan') }}</small></a>
                 </slot>
 
             </div>
@@ -53,14 +53,14 @@
             <div class="flex-column" v-if="show_button_3">
                 <slot name="button_3">
                     <a class="nav-link bottom-nav-link p-0" v-bind:class="{'bottom-nav-link-active': activeView === 'view_shopping' }" v-bind:href="resolveDjangoUrl('view_shopping')">
-                        <i class="fas fa-shopping-cart" style="font-size: 1.5em"></i><br/><small>{{ $t('Shopping_list') }}</small></a>
+                        <i class="fas fa-shopping-cart" style="font-size: 1.4em"></i><br/><small>{{ $t('Shopping_list') }}</small></a>
                 </slot>
             </div>
             <div class="flex-column">
 
                 <slot name="button_4" v-if="show_button_4">
                     <a class="nav-link bottom-nav-link p-0" v-bind:class="{'bottom-nav-link-active': activeView === 'view_books' }" v-bind:href="resolveDjangoUrl('view_books')">
-                        <i class="fas fa-book-open" style="font-size: 1.5em"></i><br/><small>{{ $t('Books') }}</small></a> <!-- TODO localize -->
+                        <i class="fas fa-book-open" style="font-size: 1.4em"></i><br/><small>{{ $t('Books') }}</small></a> <!-- TODO localize -->
                 </slot>
 
             </div>

From e2ebccda8563492c3a5bdec0f634067e6ca7cc76 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sun, 28 Jan 2024 16:33:54 +0100
Subject: [PATCH 74/95] fixed meal plan content shift

---
 vue/src/apps/MealPlanView/MealPlanView.vue | 115 ++++++++++-----------
 1 file changed, 54 insertions(+), 61 deletions(-)

diff --git a/vue/src/apps/MealPlanView/MealPlanView.vue b/vue/src/apps/MealPlanView/MealPlanView.vue
index 9beb8454..58793c70 100644
--- a/vue/src/apps/MealPlanView/MealPlanView.vue
+++ b/vue/src/apps/MealPlanView/MealPlanView.vue
@@ -80,80 +80,73 @@
                 </div>
             </div>
         </div>
-        <div class="row d-block d-lg-none">
+        <div class="d-block d-lg-none">
             <div class="row">
-                <div class="col">
-                    <div class="">
-                        <div>
-                            <div class="col-12">
-                                <div class="col-12 d-flex justify-content-center mt-2">
-                                    <b-button-toolbar key-nav aria-label="Toolbar with button groups">
-                                        <b-button-group class="mx-1">
-                                            <b-button v-html="'<<'" class="p-2 pr-3 pl-3"
-                                                      @click="setShowDate($refs.header.headerProps.previousPeriod)"></b-button>
-                                        </b-button-group>
-                                        <b-button-group class="mx-1">
-                                            <b-button @click="setShowDate($refs.header.headerProps.currentPeriod)"><i
-                                                class="fas fa-home"></i></b-button>
-                                            <b-form-datepicker right button-only button-variant="secondary" @context="datePickerChanged"></b-form-datepicker>
-                                        </b-button-group>
-                                        <b-button-group class="mx-1">
-                                            <b-button v-html="'>>'" class="p-2 pr-3 pl-3"
-                                                      @click="setShowDate($refs.header.headerProps.nextPeriod)"></b-button>
-                                        </b-button-group>
-                                    </b-button-toolbar>
+                <div class="col-12">
+                    <div class="col-12 d-flex justify-content-center mt-2">
+                        <b-button-toolbar key-nav aria-label="Toolbar with button groups">
+                            <b-button-group class="mx-1">
+                                <b-button v-html="'<<'" class="p-2 pr-3 pl-3"
+                                          @click="setShowDate($refs.header.headerProps.previousPeriod)"></b-button>
+                            </b-button-group>
+                            <b-button-group class="mx-1">
+                                <b-button @click="setShowDate($refs.header.headerProps.currentPeriod)"><i
+                                    class="fas fa-home"></i></b-button>
+                                <b-form-datepicker right button-only button-variant="secondary" @context="datePickerChanged"></b-form-datepicker>
+                            </b-button-group>
+                            <b-button-group class="mx-1">
+                                <b-button v-html="'>>'" class="p-2 pr-3 pl-3"
+                                          @click="setShowDate($refs.header.headerProps.nextPeriod)"></b-button>
+                            </b-button-group>
+                        </b-button-toolbar>
+                    </div>
+                </div>
+                <div class="col-12 mt-2" style="padding-bottom: 60px">
+                    <div v-for="day in mobileSimpleGrid" v-bind:key="day.day">
+                        <b-list-group>
+                            <b-list-group-item>
+                                <div class="d-flex flex-row align-middle">
+                                    <h6 class="mb-0 mt-1 align-middle">{{ day.date_label }}</h6>
+
+                                    <div class="flex-grow-1 text-right">
+                                        <b-button class="btn-sm btn-outline-primary" @click="showMealPlanEditModal(null, day.create_default_date)"><i
+                                            class="fa fa-plus"></i></b-button>
+                                    </div>
                                 </div>
-                            </div>
-                            <div class="col-12 mt-2" style="padding-bottom: 60px">
-                                <div v-for="day in mobileSimpleGrid" v-bind:key="day.day">
-                                    <b-list-group>
-                                        <b-list-group-item>
-                                            <div class="d-flex flex-row align-middle">
-                                                <h6 class="mb-0 mt-1 align-middle">{{ day.date_label }}</h6>
 
-                                                <div class="flex-grow-1 text-right">
-                                                    <b-button class="btn-sm btn-outline-primary" @click="showMealPlanEditModal(null, day.create_default_date)"><i
-                                                        class="fa fa-plus"></i></b-button>
-                                                </div>
-                                            </div>
-
-                                        </b-list-group-item>
-                                        <b-list-group-item v-for="plan in day.plan_entries" v-bind:key="plan.entry.id">
-                                            <div class="d-flex flex-row align-items-center">
-                                                <div>
-                                                    <b-img style="height: 50px; width: 50px; object-fit: cover"
-                                                           :src="plan.entry.recipe.image" rounded="circle" v-if="plan.entry.recipe?.image"></b-img>
-                                                    <b-img style="height: 50px; width: 50px; object-fit: cover"
-                                                           :src="image_placeholder" rounded="circle" v-else></b-img>
-                                                </div>
-                                                <div class="flex-grow-1 ml-2"
-                                                     style="text-overflow: ellipsis; overflow-wrap: anywhere;">
+                            </b-list-group-item>
+                            <b-list-group-item v-for="plan in day.plan_entries" v-bind:key="plan.entry.id">
+                                <div class="d-flex flex-row align-items-center">
+                                    <div>
+                                        <b-img style="height: 50px; width: 50px; object-fit: cover"
+                                               :src="plan.entry.recipe.image" rounded="circle" v-if="plan.entry.recipe?.image"></b-img>
+                                        <b-img style="height: 50px; width: 50px; object-fit: cover"
+                                               :src="image_placeholder" rounded="circle" v-else></b-img>
+                                    </div>
+                                    <div class="flex-grow-1 ml-2"
+                                         style="text-overflow: ellipsis; overflow-wrap: anywhere;">
                                                     <span class="two-row-text">
                                                         <a :href="resolveDjangoUrl('view_recipe', plan.entry.recipe.id)" v-if="plan.entry.recipe">{{ plan.entry.recipe.name }}</a>
                                                         <span v-else>{{ plan.entry.title }}</span> <br/>
                                                     </span>
-                                                    <span v-if="plan.entry.note" class="two-row-text">
+                                        <span v-if="plan.entry.note" class="two-row-text">
                                                     <small>{{ plan.entry.note }}</small> <br/>
                                                 </span>
-                                                    <small class="text-muted">
-                                                        <span v-if="plan.entry.shopping" class="font-light"><i class="fas fa-shopping-cart fa-xs "/></span>
-                                                        {{ plan.entry.meal_type_name }}
-                                                        <span v-if="plan.entry.recipe">
+                                        <small class="text-muted">
+                                            <span v-if="plan.entry.shopping" class="font-light"><i class="fas fa-shopping-cart fa-xs "/></span>
+                                            {{ plan.entry.meal_type_name }}
+                                            <span v-if="plan.entry.recipe">
                                                      - <i class="fa fa-clock"></i> {{ plan.entry.recipe.working_time + plan.entry.recipe.waiting_time }} {{ $t('min') }}
                                                 </span>
-                                                    </small>
-                                                </div>
-                                                <div class="hover-button">
-                                                    <a class="pr-2" @click.stop="openContextMenu($event, {originalItem: plan})"><i class="fas fa-ellipsis-v"></i></a>
-                                                </div>
-                                            </div>
-                                        </b-list-group-item>
-
-                                    </b-list-group>
+                                        </small>
+                                    </div>
+                                    <div class="hover-button">
+                                        <a class="pr-2" @click.stop="openContextMenu($event, {originalItem: plan})"><i class="fas fa-ellipsis-v"></i></a>
+                                    </div>
                                 </div>
-                            </div>
+                            </b-list-group-item>
 
-                        </div>
+                        </b-list-group>
                     </div>
                 </div>
             </div>

From 4724104f50f25de2f8139521e639519686a3f2c5 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sun, 28 Jan 2024 16:34:12 +0100
Subject: [PATCH 75/95] eslint rule

---
 vue/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vue/package.json b/vue/package.json
index 6f37951c..a7aa4d38 100644
--- a/vue/package.json
+++ b/vue/package.json
@@ -85,7 +85,8 @@
       "parser": "@typescript-eslint/parser"
     },
     "rules": {
-      "no-unused-vars": "off"
+      "no-unused-vars": "off",
+      "vue/no-unused-components": "on"
     }
   },
   "browserslist": [

From fff2ecd58d4213adb890dbb3c90a9be96dae71b6 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sun, 28 Jan 2024 20:31:24 +0100
Subject: [PATCH 76/95] some fixes

---
 vue/src/apps/ShoppingListView/ShoppingListView.vue | 1 -
 vue/src/components/ShoppingLineItem.vue            | 4 ++--
 vue/src/stores/ShoppingListStore.js                | 4 +---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 037a0dcc..1a26d887 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -365,7 +365,6 @@
             </div>
         </div>
 
-        <!-- TODO maybe change to a modal ? -->
         <b-popover target="id_filters_button" triggers="click blur" placement="bottomleft" :title="$t('Filters')">
             <div>
                 <b-form-group v-bind:label="$t('GroupBy')" label-for="popover-input-1" label-cols="6" class="mb-1">
diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index ced5f36d..de4068d9 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -56,7 +56,7 @@
                 <b-button variant="warning" block @click="detail_modal_visible = false; setFoodIgnoredAndChecked(food)"> {{ $t("Ignore_Shopping") }}</b-button>
 
                 <b-button variant="info" block
-                          @click="detail_modal_visible = false;useShoppingListStore().delayEntries(entries,!this.is_delayed, true)">
+                          @click="detail_modal_visible = false;useShoppingListStore().delayEntries(entries,!is_delayed, true)">
                     {{ $t('Postpone') }}
                 </b-button>
 
@@ -89,7 +89,7 @@
                             </div>
                             <b-button variant="warning"
                                       @click="detail_modal_visible = false; useShoppingListStore().deleteObject(e)"><i
-                                class="fas fa-trash"></i></b-button> <!-- TODO implement -->
+                                class="fas fa-trash"></i></b-button>
                         </b-button-group>
 
                         <number-scaler-component :number="e.amount"
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index 9edb0e98..1cdbbf25 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -37,7 +37,6 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
         GROUP_CATEGORY: 'food.supermarket_category.name',
         GROUP_CREATED_BY: 'created_by.display_name',
         GROUP_RECIPE: 'recipe_mealplan.recipe_name',
-        GROUP_MEALPLAN: 'recipe_mealplan.mealplan', //TODO give this some name from the API
 
         UNDEFINED_CATEGORY: 'shopping_undefined_category'
     }),
@@ -368,7 +367,6 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
             if (navigator.onLine || document.location.href.includes('localhost')) {
                 let apiClient = new ApiApiFactory()
                 let promises = []
-                //TODO merge entries with same checked state before updating?
 
                 for (let i in this.item_check_sync_queue) {
                     let entry = this.item_check_sync_queue[i]
@@ -416,7 +414,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
          * @param undo if the user should be able to undo the change or not
          */
         delayEntries(entries, delay, undo) {
-            let delay_hours = 4 //TODO get delay from settings in an offline friendly way
+            let delay_hours = useUserPreferenceStore().user_settings.default_delay
             let delay_date = new Date(Date.now() + delay_hours * (60 * 60 * 1000))
 
             if (undo) {

From 4c6410d7aeb37d1045a5879c2298e182104cc3b4 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Mon, 29 Jan 2024 08:03:51 +0100
Subject: [PATCH 77/95] fixed inspectioin rule

---
 vue/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vue/package.json b/vue/package.json
index a7aa4d38..3e069f81 100644
--- a/vue/package.json
+++ b/vue/package.json
@@ -86,7 +86,7 @@
     },
     "rules": {
       "no-unused-vars": "off",
-      "vue/no-unused-components": "on"
+      "vue/no-unused-components": "warn"
     }
   },
   "browserslist": [

From 0f1a3ba5d86dc90fd1e8b475946b252287003ce8 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Mon, 29 Jan 2024 08:37:53 +0100
Subject: [PATCH 78/95] improvements

---
 .../ShoppingListView/ShoppingListView.vue     | 22 +++++--------------
 .../Settings/ShoppingSettingsComponent.vue    |  7 ++++--
 vue/src/locales/en.json                       |  1 +
 vue/src/stores/ShoppingListStore.js           | 21 +++++++++++++++++-
 vue/src/stores/UserPreferenceStore.js         |  4 ++--
 vue/src/utils/utils.js                        |  2 +-
 6 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 1a26d887..7661a9fe 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -134,7 +134,7 @@
                                     </div>
 
 
-                                    <b-button variant="danger" @click="deleteRecipe(r.shopping_list_recipe_id)"><i
+                                    <b-button variant="danger" @click="useShoppingListStore().deleteShoppingListRecipe(r.shopping_list_recipe_id)"><i
                                         class="fas fa-trash fa-fw"></i></b-button>
                                 </b-button-group>
 
@@ -605,18 +605,7 @@ export default {
                 })
             }
         },
-        /**
-         * delete shopping list recipe, associated entries are deleted automatically by database
-         * @param shopping_list_recipe_id id of shopping list recipe to delete
-         */
-        deleteRecipe: function (shopping_list_recipe_id) {
-            let api = new ApiApiFactory()
-            api.destroyShoppingListRecipe(shopping_list_recipe_id).then((x) => {
-                useShoppingListStore().refreshFromAPI() //TODO only do partial refresh
-            }).catch((err) => {
-                StandardToasts.makeStandardToast(this, StandardToasts.FAIL_DELETE, err)
-            })
-        },
+
         /**
          * change number of servings of a shopping list recipe
          * backend handles scaling of associated entries
@@ -680,10 +669,9 @@ export default {
          * add new supermarket to list of supermarkets
          */
         addSupermarket: function () {
-            // TODO integrate into store
             let api = new ApiApiFactory()
             api.createSupermarket({name: this.$t('Supermarket') + Math.floor(1000 + Math.random() * 9000)}).then((r) => {
-                this.shopping_list_store.supermarkets.push(r.data)
+                useShoppingListStore().supermarkets.push(r.data)
                 this.new_supermarket.value = undefined
             }).catch((err) => {
                 StandardToasts.makeStandardToast(this, StandardToasts.FAIL_CREATE, err)
@@ -880,12 +868,12 @@ export default {
             })
         },
         /**
-         * called after adding a new recipe trough the shopping modal
+         * called after adding a new recipe through the shopping modal
          * cleanup and data refresh
          */
         finishShopping() {
             this.new_recipe = {id: undefined}
-            useShoppingListStore().refreshFromAPI() //TODO only do partial fetch
+            useShoppingListStore().autosync()
         },
     },
     directives: {
diff --git a/vue/src/components/Settings/ShoppingSettingsComponent.vue b/vue/src/components/Settings/ShoppingSettingsComponent.vue
index 945e0866..f5a7da82 100644
--- a/vue/src/components/Settings/ShoppingSettingsComponent.vue
+++ b/vue/src/components/Settings/ShoppingSettingsComponent.vue
@@ -13,7 +13,7 @@
 
         <b-form-group :label="$t('shopping_auto_sync')" :description="$t('shopping_auto_sync_desc')">
             <b-form-input type="range" :min="SHOPPING_MIN_AUTOSYNC_INTERVAL" max="60" step="1" v-model="useUserPreferenceStore().user_settings.shopping_auto_sync"
-                          @change="updateSettings(false)"></b-form-input>
+                          @change="updateSettings(false)" :disabled="useUserPreferenceStore().user_settings.shopping_auto_sync < 1"></b-form-input>
             <div class="text-center">
                 <span v-if="useUserPreferenceStore().user_settings.shopping_auto_sync > 0">
                     {{ Math.round(useUserPreferenceStore().user_settings.shopping_auto_sync) }}
@@ -24,7 +24,10 @@
                 <span v-if="useUserPreferenceStore().user_settings.shopping_auto_sync < 1">{{ $t('Disable') }}</span>
             </div>
             <br/>
-                <b-button class="btn btn-sm" @click="useUserPreferenceStore().user_settings.shopping_auto_sync = 0; updateSettings(false)">{{ $t('Disabled') }}</b-button>
+                <b-button class="btn btn-sm" @click="useUserPreferenceStore().user_settings.shopping_auto_sync = 0; updateSettings(false)"
+                v-if="useUserPreferenceStore().user_settings.shopping_auto_sync > 0">{{ $t('Disable') }}</b-button>
+                <b-button class="btn btn-sm btn-success" @click="useUserPreferenceStore().user_settings.shopping_auto_sync = SHOPPING_MIN_AUTOSYNC_INTERVAL; updateSettings(false)"
+                v-if="useUserPreferenceStore().user_settings.shopping_auto_sync < 1">{{ $t('Enable') }}</b-button>
         </b-form-group>
 
         <b-form-group :description="$t('mealplan_autoadd_shopping_desc')">
diff --git a/vue/src/locales/en.json b/vue/src/locales/en.json
index a1f49865..79f9c96e 100644
--- a/vue/src/locales/en.json
+++ b/vue/src/locales/en.json
@@ -503,6 +503,7 @@
 	"Reset": "Reset",
 	"Disabled": "Disabled",
 	"Disable": "Disable",
+	"Enable": "Enable",
 	"Options": "Options",
 	"Create Food": "Create Food",
 	"create_food_desc": "Create a food and link it to this recipe.",
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index 1cdbbf25..ac00635d 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -125,8 +125,12 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
 
             return ordered_structure
         },
+        /**
+         * flattened list of entries used for exporters
+         * kinda uncool but works for now
+         * @return {*[]}
+         */
         get_flat_entries: function () {
-            //{amount: x.amount, unit: x.unit?.name ?? "", food: x.food?.name ?? ""}
             let items = []
             for (let i in this.get_entries_by_group) {
                 for (let f in this.get_entries_by_group[i]['foods']) {
@@ -435,6 +439,21 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                 this.deleteObject(this.entries[i])
             }
         },
+        deleteShoppingListRecipe(shopping_list_recipe_id) {
+            let api = new ApiApiFactory()
+
+            for (let i in this.entries) {
+                if (this.entries[i].list_recipe === shopping_list_recipe_id) {
+                    Vue.delete(this.entries, i)
+                }
+            }
+
+            api.destroyShoppingListRecipe(shopping_list_recipe_id).then((x) => {
+                // no need to update anything, entries were already removed
+            }).catch((err) => {
+                StandardToasts.makeStandardToast(this, StandardToasts.FAIL_DELETE, err)
+            })
+        },
         /**
          * register the change to a set of entries to allow undoing it
          * throws an Error if the operation type is not known
diff --git a/vue/src/stores/UserPreferenceStore.js b/vue/src/stores/UserPreferenceStore.js
index 4dc9b2d5..adc06ee4 100644
--- a/vue/src/stores/UserPreferenceStore.js
+++ b/vue/src/stores/UserPreferenceStore.js
@@ -95,10 +95,10 @@ export const useUserPreferenceStore = defineStore(_STORE_ID, {
                 for (s in settings) {
                     Vue.set(this.user_settings, s, settings[s])
                 }
-                //console.log(`loaded local user settings age ${((new Date().getTime()) - this.user_settings.locally_updated_at) / 1000} `)
+                console.log(`loaded local user settings age ${((new Date().getTime()) - this.user_settings.locally_updated_at) / 1000} `)
             }
             if (((new Date().getTime()) - this.user_settings.locally_updated_at) > _STALE_TIME_IN_MS || !allow_cached_results) {
-                //console.log('refreshing user settings from API')
+                console.log('refreshing user settings from API')
                 let apiClient = new ApiApiFactory()
                 apiClient.retrieveUserPreference(localStorage.getItem('USER_ID')).then(r => {
                     for (s in r.data) {
diff --git a/vue/src/utils/utils.js b/vue/src/utils/utils.js
index b34396d4..cf1a5b3f 100644
--- a/vue/src/utils/utils.js
+++ b/vue/src/utils/utils.js
@@ -131,7 +131,7 @@ export class StandardToasts {
         }
 
 
-        let DEBUG = localStorage.getItem("DEBUG") === "True" || always_show_errors
+        let DEBUG = (localStorage.getItem("DEBUG") === "True" || always_show_errors) && variant !== 'success'
         if (DEBUG){
             console.log('ERROR ', err, JSON.stringify(err?.response?.data))
             console.trace();

From ee7cdacc40e50bd35d660fb6881674f6c206795b Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Mon, 29 Jan 2024 08:41:02 +0100
Subject: [PATCH 79/95] cleared TODOs

---
 vue/src/stores/ShoppingListStore.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index ac00635d..6a4aab1e 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -242,12 +242,8 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
          */
         createObject(object) {
             let apiClient = new ApiApiFactory()
-
-            // TODO shared handled in backend?
-
             return apiClient.createShoppingListEntry(object).then((r) => {
                 Vue.set(this.entries, r.data.id, r.data)
-
                 this.registerChange('CREATED', {[r.data.id]: r.data},)
             }).catch((err) => {
                 StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
@@ -317,7 +313,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
          */
         updateEntryInStructure(structure, entry, group) {
             let grouping_key = _.get(entry, group, this.UNDEFINED_CATEGORY)
-            // todo handele parent
+
             if (grouping_key === undefined || grouping_key === null) {
                 grouping_key = this.UNDEFINED_CATEGORY
             }

From aac729a3a0d66223e08a843582d68ac32cb255ee Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Mon, 29 Jan 2024 08:46:34 +0100
Subject: [PATCH 80/95] fixed firefox

---
 vue/src/components/ShoppingLineItem.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index de4068d9..96f8eec5 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -321,6 +321,10 @@ export default {
     display: none;
 }
 
+.swipe-container {
+    scrollbar-width: none; /* For Firefox */
+}
+
 /* main element should always snap into view */
 .swipe-element {
     scroll-snap-align: start;

From 77f81523d0729226a8042fd45f28ad45528e65fa Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Mon, 29 Jan 2024 09:02:11 +0100
Subject: [PATCH 81/95] lmiit SLE endpoint and always fitler for recent days

---
 cookbook/helper/shopping_helper.py | 3 ---
 cookbook/views/api.py              | 6 +++++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cookbook/helper/shopping_helper.py b/cookbook/helper/shopping_helper.py
index ffcf5bea..c7772a07 100644
--- a/cookbook/helper/shopping_helper.py
+++ b/cookbook/helper/shopping_helper.py
@@ -27,9 +27,6 @@ def shopping_helper(qs, request):
     elif checked in ['true', 1, '1']:
         qs = qs.filter(checked=True)
     elif checked in ['recent']:
-        today_start = timezone.now().replace(hour=0, minute=0, second=0)
-        week_ago = today_start - timedelta(days=user.userpreference.shopping_recent_days)
-        qs = qs.filter(Q(checked=False) | Q(completed_at__gte=week_ago))
         supermarket_order = ['checked'] + supermarket_order
 
     return qs.distinct().order_by(*supermarket_order).select_related('unit', 'food', 'ingredient', 'created_by', 'list_recipe', 'list_recipe__mealplan', 'list_recipe__recipe')
diff --git a/cookbook/views/api.py b/cookbook/views/api.py
index da59419b..46009eab 100644
--- a/cookbook/views/api.py
+++ b/cookbook/views/api.py
@@ -1165,6 +1165,10 @@ class ShoppingListEntryViewSet(viewsets.ModelViewSet):
         if 'checked' in self.request.query_params or 'recent' in self.request.query_params:
             return shopping_helper(self.queryset, self.request)
 
+        today_start = timezone.now().replace(hour=0, minute=0, second=0)
+        week_ago = today_start - datetime.timedelta(days=max(self.request.user.userpreference.shopping_recent_days, 14))
+        self.queryset = self.queryset.filter(Q(checked=False) | Q(completed_at__gte=week_ago))
+
         try:
             last_autosync = self.request.query_params.get('last_autosync', None)
             if last_autosync:
@@ -1175,7 +1179,7 @@ class ShoppingListEntryViewSet(viewsets.ModelViewSet):
             traceback.print_exc()
 
         # TODO once old shopping list is removed this needs updated to sharing users in preferences
-        return self.queryset
+        return self.queryset[:1000]
 
     @decorators.action(
         detail=False,

From 7f6cd16a777c4405fbec49c28bb50f760748756c Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Thu, 1 Feb 2024 19:36:07 +0100
Subject: [PATCH 82/95] changed default supermarket prefs

---
 vue/src/stores/UserPreferenceStore.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vue/src/stores/UserPreferenceStore.js b/vue/src/stores/UserPreferenceStore.js
index adc06ee4..5e50a9ed 100644
--- a/vue/src/stores/UserPreferenceStore.js
+++ b/vue/src/stores/UserPreferenceStore.js
@@ -61,7 +61,7 @@ export const useUserPreferenceStore = defineStore(_STORE_ID, {
             shopping_selected_grouping: 'food.supermarket_category.name',
             shopping_selected_supermarket: null,
             shopping_item_info_created_by: false,
-            shopping_item_info_mealplan: true,
+            shopping_item_info_mealplan: false,
             shopping_item_info_recipe: true,
         },
     }),

From f7b25c9b31ea73759d4c0eec579601928dbab9a9 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Thu, 1 Feb 2024 19:39:11 +0100
Subject: [PATCH 83/95] easier supermarket select on mobile

---
 vue/src/apps/ShoppingListView/ShoppingListView.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 7661a9fe..095513ac 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -367,14 +367,14 @@
 
         <b-popover target="id_filters_button" triggers="click blur" placement="bottomleft" :title="$t('Filters')">
             <div>
-                <b-form-group v-bind:label="$t('GroupBy')" label-for="popover-input-1" label-cols="6" class="mb-1">
+                <b-form-group v-bind:label="$t('GroupBy')" label-for="popover-input-1" label-cols="12" class="mb-1">
                     <b-form-select v-model="user_preference_store.device_settings.shopping_selected_grouping" size="sm">
                         <b-form-select-option v-for="go in shopping_list_store.grouping_options" :value="go.id"
                                               v-bind:key="go.id">{{ $t(go.translatable_label) }}
                         </b-form-select-option>
                     </b-form-select>
                 </b-form-group>
-                <b-form-group v-bind:label="$t('Supermarket')" label-for="popover-input-2" label-cols="6" class="mb-1">
+                <b-form-group v-bind:label="$t('Supermarket')" label-for="popover-input-2" label-cols="12" class="mb-1">
                     <generic-multiselect :model="Models.SUPERMARKET"
                                          :initial_single_selection="user_preference_store.device_settings.shopping_selected_supermarket"
                                          @change="user_preference_store.device_settings.shopping_selected_supermarket = $event.val; user_preference_store.updateDeviceSettings()"

From bb1b1a40b65d6c6af6b3847c992fa18cb06a8e66 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Thu, 1 Feb 2024 20:00:51 +0100
Subject: [PATCH 84/95] fixed search on userfile and supermarket generic select

---
 cookbook/views/api.py        |    4 +-
 vue/src/utils/openapi/api.ts | 3815 +++++++++++++++++++++++++++++++++-
 vue/src/utils/utils.js       |    2 +-
 3 files changed, 3799 insertions(+), 22 deletions(-)

diff --git a/cookbook/views/api.py b/cookbook/views/api.py
index 46009eab..7c36e3e9 100644
--- a/cookbook/views/api.py
+++ b/cookbook/views/api.py
@@ -482,6 +482,7 @@ class SyncLogViewSet(viewsets.ReadOnlyModelViewSet):
 
 
 class SupermarketViewSet(viewsets.ModelViewSet, StandardFilterMixin):
+    schema = FilterSchema()
     queryset = Supermarket.objects
     serializer_class = SupermarketSerializer
     permission_classes = [CustomIsUser & CustomTokenHasReadWriteScope]
@@ -1172,7 +1173,6 @@ class ShoppingListEntryViewSet(viewsets.ModelViewSet):
         try:
             last_autosync = self.request.query_params.get('last_autosync', None)
             if last_autosync:
-
                 last_autosync = datetime.datetime.fromtimestamp(int(last_autosync) / 1000, datetime.timezone.utc)
                 self.queryset = self.queryset.filter(updated_at__gte=last_autosync)
         except:
@@ -1202,6 +1202,7 @@ class ShoppingListEntryViewSet(viewsets.ModelViewSet):
         else:
             return Response(serializer.errors, 400)
 
+
 # TODO deprecate
 class ShoppingListViewSet(viewsets.ModelViewSet):
     queryset = ShoppingList.objects
@@ -1284,6 +1285,7 @@ class BookmarkletImportViewSet(viewsets.ModelViewSet):
 
 
 class UserFileViewSet(viewsets.ModelViewSet, StandardFilterMixin):
+    schema = FilterSchema()
     queryset = UserFile.objects
     serializer_class = UserFileSerializer
     permission_classes = [CustomIsUser & CustomTokenHasReadWriteScope]
diff --git a/vue/src/utils/openapi/api.ts b/vue/src/utils/openapi/api.ts
index 984ab54c..a623c8e0 100644
--- a/vue/src/utils/openapi/api.ts
+++ b/vue/src/utils/openapi/api.ts
@@ -2091,6 +2091,957 @@ export interface MealType {
      */
     created_by?: string;
 }
+/**
+ * 
+ * @export
+ * @interface OpenDataCategory
+ */
+export interface OpenDataCategory {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataCategory
+     */
+    id?: number;
+    /**
+     * 
+     * @type {OpenDataUnitVersion}
+     * @memberof OpenDataCategory
+     */
+    version: OpenDataUnitVersion;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataCategory
+     */
+    slug: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataCategory
+     */
+    name: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataCategory
+     */
+    description?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataCategory
+     */
+    comment?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataCategory
+     */
+    created_by?: string;
+}
+/**
+ * 
+ * @export
+ * @interface OpenDataConversion
+ */
+export interface OpenDataConversion {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataConversion
+     */
+    id?: number;
+    /**
+     * 
+     * @type {OpenDataUnitVersion}
+     * @memberof OpenDataConversion
+     */
+    version: OpenDataUnitVersion;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversion
+     */
+    slug: string;
+    /**
+     * 
+     * @type {OpenDataConversionFood}
+     * @memberof OpenDataConversion
+     */
+    food: OpenDataConversionFood;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversion
+     */
+    base_amount: string;
+    /**
+     * 
+     * @type {OpenDataConversionFoodPropertiesFoodUnit}
+     * @memberof OpenDataConversion
+     */
+    base_unit: OpenDataConversionFoodPropertiesFoodUnit;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversion
+     */
+    converted_amount: string;
+    /**
+     * 
+     * @type {OpenDataConversionFoodPropertiesFoodUnit}
+     * @memberof OpenDataConversion
+     */
+    converted_unit: OpenDataConversionFoodPropertiesFoodUnit;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversion
+     */
+    source: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversion
+     */
+    comment?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversion
+     */
+    created_by?: string;
+}
+/**
+ * 
+ * @export
+ * @interface OpenDataConversionFood
+ */
+export interface OpenDataConversionFood {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataConversionFood
+     */
+    id?: number;
+    /**
+     * 
+     * @type {OpenDataUnitVersion}
+     * @memberof OpenDataConversionFood
+     */
+    version: OpenDataUnitVersion;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFood
+     */
+    slug: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFood
+     */
+    name: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFood
+     */
+    plural_name: string;
+    /**
+     * 
+     * @type {OpenDataStoreCategory}
+     * @memberof OpenDataConversionFood
+     */
+    store_category: OpenDataStoreCategory;
+    /**
+     * 
+     * @type {OpenDataConversionFoodPreferredUnitMetric}
+     * @memberof OpenDataConversionFood
+     */
+    preferred_unit_metric?: OpenDataConversionFoodPreferredUnitMetric | null;
+    /**
+     * 
+     * @type {OpenDataConversionFoodPreferredUnitMetric}
+     * @memberof OpenDataConversionFood
+     */
+    preferred_shopping_unit_metric?: OpenDataConversionFoodPreferredUnitMetric | null;
+    /**
+     * 
+     * @type {OpenDataConversionFoodPreferredUnitMetric}
+     * @memberof OpenDataConversionFood
+     */
+    preferred_unit_imperial?: OpenDataConversionFoodPreferredUnitMetric | null;
+    /**
+     * 
+     * @type {OpenDataConversionFoodPreferredUnitMetric}
+     * @memberof OpenDataConversionFood
+     */
+    preferred_shopping_unit_imperial?: OpenDataConversionFoodPreferredUnitMetric | null;
+    /**
+     * 
+     * @type {Array<OpenDataConversionFoodProperties>}
+     * @memberof OpenDataConversionFood
+     */
+    properties: Array<OpenDataConversionFoodProperties> | null;
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataConversionFood
+     */
+    properties_food_amount?: number;
+    /**
+     * 
+     * @type {OpenDataConversionFoodPropertiesFoodUnit}
+     * @memberof OpenDataConversionFood
+     */
+    properties_food_unit: OpenDataConversionFoodPropertiesFoodUnit;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFood
+     */
+    properties_source?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFood
+     */
+    fdc_id: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFood
+     */
+    comment?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFood
+     */
+    created_by?: string;
+}
+/**
+ * 
+ * @export
+ * @interface OpenDataConversionFoodPreferredUnitMetric
+ */
+export interface OpenDataConversionFoodPreferredUnitMetric {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataConversionFoodPreferredUnitMetric
+     */
+    id?: number;
+    /**
+     * 
+     * @type {OpenDataUnitVersion}
+     * @memberof OpenDataConversionFoodPreferredUnitMetric
+     */
+    version: OpenDataUnitVersion;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodPreferredUnitMetric
+     */
+    slug: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodPreferredUnitMetric
+     */
+    name: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodPreferredUnitMetric
+     */
+    plural_name?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodPreferredUnitMetric
+     */
+    base_unit?: OpenDataConversionFoodPreferredUnitMetricBaseUnitEnum;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodPreferredUnitMetric
+     */
+    type: OpenDataConversionFoodPreferredUnitMetricTypeEnum;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodPreferredUnitMetric
+     */
+    comment?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodPreferredUnitMetric
+     */
+    created_by?: string;
+}
+
+/**
+    * @export
+    * @enum {string}
+    */
+export enum OpenDataConversionFoodPreferredUnitMetricBaseUnitEnum {
+    G = 'G',
+    Kg = 'KG',
+    Ml = 'ML',
+    L = 'L',
+    Ounce = 'OUNCE',
+    Pound = 'POUND',
+    FluidOunce = 'FLUID_OUNCE',
+    Tsp = 'TSP',
+    Tbsp = 'TBSP',
+    Cup = 'CUP',
+    Pint = 'PINT',
+    Quart = 'QUART',
+    Gallon = 'GALLON',
+    ImperialFluidOunce = 'IMPERIAL_FLUID_OUNCE',
+    ImperialPint = 'IMPERIAL_PINT',
+    ImperialQuart = 'IMPERIAL_QUART',
+    ImperialGallon = 'IMPERIAL_GALLON'
+}
+/**
+    * @export
+    * @enum {string}
+    */
+export enum OpenDataConversionFoodPreferredUnitMetricTypeEnum {
+    Weight = 'WEIGHT',
+    Volume = 'VOLUME',
+    Other = 'OTHER'
+}
+
+/**
+ * 
+ * @export
+ * @interface OpenDataConversionFoodProperties
+ */
+export interface OpenDataConversionFoodProperties {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataConversionFoodProperties
+     */
+    id?: number;
+    /**
+     * 
+     * @type {OpenDataConversionFoodProperty}
+     * @memberof OpenDataConversionFoodProperties
+     */
+    property: OpenDataConversionFoodProperty;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodProperties
+     */
+    property_amount: string;
+}
+/**
+ * 
+ * @export
+ * @interface OpenDataConversionFoodPropertiesFoodUnit
+ */
+export interface OpenDataConversionFoodPropertiesFoodUnit {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataConversionFoodPropertiesFoodUnit
+     */
+    id?: number;
+    /**
+     * 
+     * @type {OpenDataUnitVersion}
+     * @memberof OpenDataConversionFoodPropertiesFoodUnit
+     */
+    version: OpenDataUnitVersion;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodPropertiesFoodUnit
+     */
+    slug: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodPropertiesFoodUnit
+     */
+    name: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodPropertiesFoodUnit
+     */
+    plural_name?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodPropertiesFoodUnit
+     */
+    base_unit?: OpenDataConversionFoodPropertiesFoodUnitBaseUnitEnum;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodPropertiesFoodUnit
+     */
+    type: OpenDataConversionFoodPropertiesFoodUnitTypeEnum;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodPropertiesFoodUnit
+     */
+    comment?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodPropertiesFoodUnit
+     */
+    created_by?: string;
+}
+
+/**
+    * @export
+    * @enum {string}
+    */
+export enum OpenDataConversionFoodPropertiesFoodUnitBaseUnitEnum {
+    G = 'G',
+    Kg = 'KG',
+    Ml = 'ML',
+    L = 'L',
+    Ounce = 'OUNCE',
+    Pound = 'POUND',
+    FluidOunce = 'FLUID_OUNCE',
+    Tsp = 'TSP',
+    Tbsp = 'TBSP',
+    Cup = 'CUP',
+    Pint = 'PINT',
+    Quart = 'QUART',
+    Gallon = 'GALLON',
+    ImperialFluidOunce = 'IMPERIAL_FLUID_OUNCE',
+    ImperialPint = 'IMPERIAL_PINT',
+    ImperialQuart = 'IMPERIAL_QUART',
+    ImperialGallon = 'IMPERIAL_GALLON'
+}
+/**
+    * @export
+    * @enum {string}
+    */
+export enum OpenDataConversionFoodPropertiesFoodUnitTypeEnum {
+    Weight = 'WEIGHT',
+    Volume = 'VOLUME',
+    Other = 'OTHER'
+}
+
+/**
+ * 
+ * @export
+ * @interface OpenDataConversionFoodProperty
+ */
+export interface OpenDataConversionFoodProperty {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataConversionFoodProperty
+     */
+    id?: number;
+    /**
+     * 
+     * @type {OpenDataUnitVersion}
+     * @memberof OpenDataConversionFoodProperty
+     */
+    version: OpenDataUnitVersion;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodProperty
+     */
+    slug: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodProperty
+     */
+    name: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodProperty
+     */
+    unit?: string;
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataConversionFoodProperty
+     */
+    fdc_id?: number | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodProperty
+     */
+    comment?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataConversionFoodProperty
+     */
+    created_by?: string;
+}
+/**
+ * 
+ * @export
+ * @interface OpenDataFood
+ */
+export interface OpenDataFood {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataFood
+     */
+    id?: number;
+    /**
+     * 
+     * @type {OpenDataUnitVersion}
+     * @memberof OpenDataFood
+     */
+    version: OpenDataUnitVersion;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataFood
+     */
+    slug: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataFood
+     */
+    name: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataFood
+     */
+    plural_name: string;
+    /**
+     * 
+     * @type {OpenDataStoreCategory}
+     * @memberof OpenDataFood
+     */
+    store_category: OpenDataStoreCategory;
+    /**
+     * 
+     * @type {OpenDataConversionFoodPreferredUnitMetric}
+     * @memberof OpenDataFood
+     */
+    preferred_unit_metric?: OpenDataConversionFoodPreferredUnitMetric | null;
+    /**
+     * 
+     * @type {OpenDataConversionFoodPreferredUnitMetric}
+     * @memberof OpenDataFood
+     */
+    preferred_shopping_unit_metric?: OpenDataConversionFoodPreferredUnitMetric | null;
+    /**
+     * 
+     * @type {OpenDataConversionFoodPreferredUnitMetric}
+     * @memberof OpenDataFood
+     */
+    preferred_unit_imperial?: OpenDataConversionFoodPreferredUnitMetric | null;
+    /**
+     * 
+     * @type {OpenDataConversionFoodPreferredUnitMetric}
+     * @memberof OpenDataFood
+     */
+    preferred_shopping_unit_imperial?: OpenDataConversionFoodPreferredUnitMetric | null;
+    /**
+     * 
+     * @type {Array<OpenDataConversionFoodProperties>}
+     * @memberof OpenDataFood
+     */
+    properties: Array<OpenDataConversionFoodProperties> | null;
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataFood
+     */
+    properties_food_amount?: number;
+    /**
+     * 
+     * @type {OpenDataConversionFoodPropertiesFoodUnit}
+     * @memberof OpenDataFood
+     */
+    properties_food_unit: OpenDataConversionFoodPropertiesFoodUnit;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataFood
+     */
+    properties_source?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataFood
+     */
+    fdc_id: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataFood
+     */
+    comment?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataFood
+     */
+    created_by?: string;
+}
+/**
+ * 
+ * @export
+ * @interface OpenDataProperty
+ */
+export interface OpenDataProperty {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataProperty
+     */
+    id?: number;
+    /**
+     * 
+     * @type {OpenDataUnitVersion}
+     * @memberof OpenDataProperty
+     */
+    version: OpenDataUnitVersion;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataProperty
+     */
+    slug: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataProperty
+     */
+    name: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataProperty
+     */
+    unit?: string;
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataProperty
+     */
+    fdc_id?: number | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataProperty
+     */
+    comment?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataProperty
+     */
+    created_by?: string;
+}
+/**
+ * 
+ * @export
+ * @interface OpenDataStore
+ */
+export interface OpenDataStore {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataStore
+     */
+    id?: number;
+    /**
+     * 
+     * @type {OpenDataUnitVersion}
+     * @memberof OpenDataStore
+     */
+    version: OpenDataUnitVersion;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataStore
+     */
+    slug: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataStore
+     */
+    name: string;
+    /**
+     * 
+     * @type {Array<OpenDataStoreCategoryToStore>}
+     * @memberof OpenDataStore
+     */
+    category_to_store: Array<OpenDataStoreCategoryToStore> | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataStore
+     */
+    comment?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataStore
+     */
+    created_by?: string;
+}
+/**
+ * 
+ * @export
+ * @interface OpenDataStoreCategory
+ */
+export interface OpenDataStoreCategory {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataStoreCategory
+     */
+    id?: number;
+    /**
+     * 
+     * @type {OpenDataUnitVersion}
+     * @memberof OpenDataStoreCategory
+     */
+    version: OpenDataUnitVersion;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataStoreCategory
+     */
+    slug: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataStoreCategory
+     */
+    name: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataStoreCategory
+     */
+    description?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataStoreCategory
+     */
+    comment?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataStoreCategory
+     */
+    created_by?: string;
+}
+/**
+ * 
+ * @export
+ * @interface OpenDataStoreCategoryToStore
+ */
+export interface OpenDataStoreCategoryToStore {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataStoreCategoryToStore
+     */
+    id?: number;
+    /**
+     * 
+     * @type {OpenDataStoreCategory}
+     * @memberof OpenDataStoreCategoryToStore
+     */
+    category: OpenDataStoreCategory;
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataStoreCategoryToStore
+     */
+    store: number;
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataStoreCategoryToStore
+     */
+    order?: number;
+}
+/**
+ * 
+ * @export
+ * @interface OpenDataUnit
+ */
+export interface OpenDataUnit {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataUnit
+     */
+    id?: number;
+    /**
+     * 
+     * @type {OpenDataUnitVersion}
+     * @memberof OpenDataUnit
+     */
+    version: OpenDataUnitVersion;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataUnit
+     */
+    slug: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataUnit
+     */
+    name: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataUnit
+     */
+    plural_name?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataUnit
+     */
+    base_unit?: OpenDataUnitBaseUnitEnum;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataUnit
+     */
+    type: OpenDataUnitTypeEnum;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataUnit
+     */
+    comment?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataUnit
+     */
+    created_by?: string;
+}
+
+/**
+    * @export
+    * @enum {string}
+    */
+export enum OpenDataUnitBaseUnitEnum {
+    G = 'G',
+    Kg = 'KG',
+    Ml = 'ML',
+    L = 'L',
+    Ounce = 'OUNCE',
+    Pound = 'POUND',
+    FluidOunce = 'FLUID_OUNCE',
+    Tsp = 'TSP',
+    Tbsp = 'TBSP',
+    Cup = 'CUP',
+    Pint = 'PINT',
+    Quart = 'QUART',
+    Gallon = 'GALLON',
+    ImperialFluidOunce = 'IMPERIAL_FLUID_OUNCE',
+    ImperialPint = 'IMPERIAL_PINT',
+    ImperialQuart = 'IMPERIAL_QUART',
+    ImperialGallon = 'IMPERIAL_GALLON'
+}
+/**
+    * @export
+    * @enum {string}
+    */
+export enum OpenDataUnitTypeEnum {
+    Weight = 'WEIGHT',
+    Volume = 'VOLUME',
+    Other = 'OTHER'
+}
+
+/**
+ * 
+ * @export
+ * @interface OpenDataUnitVersion
+ */
+export interface OpenDataUnitVersion {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataUnitVersion
+     */
+    id?: number;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataUnitVersion
+     */
+    name: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataUnitVersion
+     */
+    code: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataUnitVersion
+     */
+    comment?: string;
+}
+/**
+ * 
+ * @export
+ * @interface OpenDataVersion
+ */
+export interface OpenDataVersion {
+    /**
+     * 
+     * @type {number}
+     * @memberof OpenDataVersion
+     */
+    id?: number;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataVersion
+     */
+    name: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataVersion
+     */
+    code: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof OpenDataVersion
+     */
+    comment?: string;
+}
 /**
  * 
  * @export
@@ -3623,12 +4574,6 @@ export interface Space {
      * @memberof Space
      */
     nav_text_color?: SpaceNavTextColorEnum;
-    /**
-     * 
-     * @type {boolean}
-     * @memberof Space
-     */
-    use_plural?: boolean;
     /**
      * 
      * @type {RecipeFile}
@@ -5053,6 +5998,237 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * 
+         * @param {OpenDataCategory} [openDataCategory] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createOpenDataCategory: async (openDataCategory?: OpenDataCategory, options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-category/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataCategory, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {OpenDataConversion} [openDataConversion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createOpenDataConversion: async (openDataConversion?: OpenDataConversion, options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-conversion/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataConversion, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {OpenDataFood} [openDataFood] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createOpenDataFood: async (openDataFood?: OpenDataFood, options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-food/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataFood, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {OpenDataProperty} [openDataProperty] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createOpenDataProperty: async (openDataProperty?: OpenDataProperty, options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-property/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataProperty, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {OpenDataStore} [openDataStore] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createOpenDataStore: async (openDataStore?: OpenDataStore, options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-store/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataStore, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {OpenDataUnit} [openDataUnit] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createOpenDataUnit: async (openDataUnit?: OpenDataUnit, options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-unit/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataUnit, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {OpenDataVersion} [openDataVersion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createOpenDataVersion: async (openDataVersion?: OpenDataVersion, options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-version/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataVersion, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @param {Property} [property] 
@@ -6167,6 +7343,237 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
 
 
     
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data category.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyOpenDataCategory: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('destroyOpenDataCategory', 'id', id)
+            const localVarPath = `/api/open-data-category/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'DELETE', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data conversion.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyOpenDataConversion: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('destroyOpenDataConversion', 'id', id)
+            const localVarPath = `/api/open-data-conversion/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'DELETE', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data food.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyOpenDataFood: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('destroyOpenDataFood', 'id', id)
+            const localVarPath = `/api/open-data-food/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'DELETE', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data property.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyOpenDataProperty: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('destroyOpenDataProperty', 'id', id)
+            const localVarPath = `/api/open-data-property/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'DELETE', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data store.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyOpenDataStore: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('destroyOpenDataStore', 'id', id)
+            const localVarPath = `/api/open-data-store/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'DELETE', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data unit.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyOpenDataUnit: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('destroyOpenDataUnit', 'id', id)
+            const localVarPath = `/api/open-data-unit/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'DELETE', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data version.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyOpenDataVersion: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('destroyOpenDataVersion', 'id', id)
+            const localVarPath = `/api/open-data-version/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'DELETE', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -7418,6 +8825,238 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
 
 
     
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataCategorys: async (options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-category/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataConversions: async (options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-conversion/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataFoods: async (options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-food/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataPropertys: async (options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-property/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataStatisticsViewSets: async (options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-stats/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataStores: async (options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-store/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataUnits: async (options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-unit/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataVersions: async (options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/open-data-version/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -8001,10 +9640,11 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
         },
         /**
          * 
+         * @param {string} [query] Query string matched against supermarket name.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listSupermarkets: async (options: any = {}): Promise<RequestArgs> => {
+        listSupermarkets: async (query?: string, options: any = {}): Promise<RequestArgs> => {
             const localVarPath = `/api/supermarket/`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -8017,6 +9657,10 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            if (query !== undefined) {
+                localVarQueryParameter['query'] = query;
+            }
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
@@ -8176,10 +9820,11 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
         },
         /**
          * 
+         * @param {string} [query] Query string matched against user-file name.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listUserFiles: async (options: any = {}): Promise<RequestArgs> => {
+        listUserFiles: async (query?: string, options: any = {}): Promise<RequestArgs> => {
             const localVarPath = `/api/user-file/`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -8192,6 +9837,10 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            if (query !== undefined) {
+                localVarQueryParameter['query'] = query;
+            }
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
@@ -9054,6 +10703,265 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data category.
+         * @param {OpenDataCategory} [openDataCategory] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateOpenDataCategory: async (id: string, openDataCategory?: OpenDataCategory, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('partialUpdateOpenDataCategory', 'id', id)
+            const localVarPath = `/api/open-data-category/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PATCH', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataCategory, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data conversion.
+         * @param {OpenDataConversion} [openDataConversion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateOpenDataConversion: async (id: string, openDataConversion?: OpenDataConversion, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('partialUpdateOpenDataConversion', 'id', id)
+            const localVarPath = `/api/open-data-conversion/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PATCH', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataConversion, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data food.
+         * @param {OpenDataFood} [openDataFood] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateOpenDataFood: async (id: string, openDataFood?: OpenDataFood, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('partialUpdateOpenDataFood', 'id', id)
+            const localVarPath = `/api/open-data-food/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PATCH', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataFood, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data property.
+         * @param {OpenDataProperty} [openDataProperty] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateOpenDataProperty: async (id: string, openDataProperty?: OpenDataProperty, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('partialUpdateOpenDataProperty', 'id', id)
+            const localVarPath = `/api/open-data-property/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PATCH', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataProperty, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data store.
+         * @param {OpenDataStore} [openDataStore] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateOpenDataStore: async (id: string, openDataStore?: OpenDataStore, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('partialUpdateOpenDataStore', 'id', id)
+            const localVarPath = `/api/open-data-store/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PATCH', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataStore, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data unit.
+         * @param {OpenDataUnit} [openDataUnit] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateOpenDataUnit: async (id: string, openDataUnit?: OpenDataUnit, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('partialUpdateOpenDataUnit', 'id', id)
+            const localVarPath = `/api/open-data-unit/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PATCH', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataUnit, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data version.
+         * @param {OpenDataVersion} [openDataVersion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateOpenDataVersion: async (id: string, openDataVersion?: OpenDataVersion, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('partialUpdateOpenDataVersion', 'id', id)
+            const localVarPath = `/api/open-data-version/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PATCH', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataVersion, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -10124,6 +12032,39 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
 
 
     
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveFDCViewSet: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('retrieveFDCViewSet', 'id', id)
+            const localVarPath = `/api/open-data-FDC/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -10421,6 +12362,237 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
 
 
     
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data category.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveOpenDataCategory: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('retrieveOpenDataCategory', 'id', id)
+            const localVarPath = `/api/open-data-category/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data conversion.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveOpenDataConversion: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('retrieveOpenDataConversion', 'id', id)
+            const localVarPath = `/api/open-data-conversion/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data food.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveOpenDataFood: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('retrieveOpenDataFood', 'id', id)
+            const localVarPath = `/api/open-data-food/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data property.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveOpenDataProperty: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('retrieveOpenDataProperty', 'id', id)
+            const localVarPath = `/api/open-data-property/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data store.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveOpenDataStore: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('retrieveOpenDataStore', 'id', id)
+            const localVarPath = `/api/open-data-store/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data unit.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveOpenDataUnit: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('retrieveOpenDataUnit', 'id', id)
+            const localVarPath = `/api/open-data-unit/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data version.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveOpenDataVersion: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('retrieveOpenDataVersion', 'id', id)
+            const localVarPath = `/api/open-data-version/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -11843,6 +14015,265 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data category.
+         * @param {OpenDataCategory} [openDataCategory] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateOpenDataCategory: async (id: string, openDataCategory?: OpenDataCategory, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('updateOpenDataCategory', 'id', id)
+            const localVarPath = `/api/open-data-category/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataCategory, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data conversion.
+         * @param {OpenDataConversion} [openDataConversion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateOpenDataConversion: async (id: string, openDataConversion?: OpenDataConversion, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('updateOpenDataConversion', 'id', id)
+            const localVarPath = `/api/open-data-conversion/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataConversion, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data food.
+         * @param {OpenDataFood} [openDataFood] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateOpenDataFood: async (id: string, openDataFood?: OpenDataFood, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('updateOpenDataFood', 'id', id)
+            const localVarPath = `/api/open-data-food/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataFood, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data property.
+         * @param {OpenDataProperty} [openDataProperty] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateOpenDataProperty: async (id: string, openDataProperty?: OpenDataProperty, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('updateOpenDataProperty', 'id', id)
+            const localVarPath = `/api/open-data-property/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataProperty, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data store.
+         * @param {OpenDataStore} [openDataStore] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateOpenDataStore: async (id: string, openDataStore?: OpenDataStore, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('updateOpenDataStore', 'id', id)
+            const localVarPath = `/api/open-data-store/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataStore, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data unit.
+         * @param {OpenDataUnit} [openDataUnit] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateOpenDataUnit: async (id: string, openDataUnit?: OpenDataUnit, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('updateOpenDataUnit', 'id', id)
+            const localVarPath = `/api/open-data-unit/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataUnit, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data version.
+         * @param {OpenDataVersion} [openDataVersion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateOpenDataVersion: async (id: string, openDataVersion?: OpenDataVersion, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('updateOpenDataVersion', 'id', id)
+            const localVarPath = `/api/open-data-version/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(openDataVersion, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -12703,6 +15134,76 @@ export const ApiApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.createMealType(mealType, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * 
+         * @param {OpenDataCategory} [openDataCategory] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async createOpenDataCategory(openDataCategory?: OpenDataCategory, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataCategory>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.createOpenDataCategory(openDataCategory, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {OpenDataConversion} [openDataConversion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async createOpenDataConversion(openDataConversion?: OpenDataConversion, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataConversion>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.createOpenDataConversion(openDataConversion, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {OpenDataFood} [openDataFood] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async createOpenDataFood(openDataFood?: OpenDataFood, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataFood>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.createOpenDataFood(openDataFood, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {OpenDataProperty} [openDataProperty] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async createOpenDataProperty(openDataProperty?: OpenDataProperty, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataProperty>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.createOpenDataProperty(openDataProperty, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {OpenDataStore} [openDataStore] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async createOpenDataStore(openDataStore?: OpenDataStore, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataStore>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.createOpenDataStore(openDataStore, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {OpenDataUnit} [openDataUnit] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async createOpenDataUnit(openDataUnit?: OpenDataUnit, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataUnit>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.createOpenDataUnit(openDataUnit, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {OpenDataVersion} [openDataVersion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async createOpenDataVersion(openDataVersion?: OpenDataVersion, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataVersion>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.createOpenDataVersion(openDataVersion, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @param {Property} [property] 
@@ -13038,6 +15539,76 @@ export const ApiApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.destroyMealType(id, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data category.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async destroyOpenDataCategory(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.destroyOpenDataCategory(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data conversion.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async destroyOpenDataConversion(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.destroyOpenDataConversion(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data food.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async destroyOpenDataFood(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.destroyOpenDataFood(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data property.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async destroyOpenDataProperty(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.destroyOpenDataProperty(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data store.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async destroyOpenDataStore(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.destroyOpenDataStore(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data unit.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async destroyOpenDataUnit(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.destroyOpenDataUnit(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data version.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async destroyOpenDataVersion(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.destroyOpenDataVersion(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -13407,6 +15978,78 @@ export const ApiApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.listMealTypes(options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async listOpenDataCategorys(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<OpenDataCategory>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listOpenDataCategorys(options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async listOpenDataConversions(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<OpenDataConversion>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listOpenDataConversions(options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async listOpenDataFoods(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<OpenDataFood>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listOpenDataFoods(options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async listOpenDataPropertys(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<OpenDataProperty>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listOpenDataPropertys(options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async listOpenDataStatisticsViewSets(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<any>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listOpenDataStatisticsViewSets(options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async listOpenDataStores(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<OpenDataStore>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listOpenDataStores(options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async listOpenDataUnits(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<OpenDataUnit>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listOpenDataUnits(options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async listOpenDataVersions(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<OpenDataVersion>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listOpenDataVersions(options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @param {*} [options] Override http request option.
@@ -13565,11 +16208,12 @@ export const ApiApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
+         * @param {string} [query] Query string matched against supermarket name.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listSupermarkets(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<Supermarket>>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.listSupermarkets(options);
+        async listSupermarkets(query?: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<Supermarket>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listSupermarkets(query, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
         /**
@@ -13616,11 +16260,12 @@ export const ApiApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
+         * @param {string} [query] Query string matched against user-file name.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listUserFiles(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<UserFile>>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.listUserFiles(options);
+        async listUserFiles(query?: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<UserFile>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listUserFiles(query, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
         /**
@@ -13875,6 +16520,83 @@ export const ApiApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateMealType(id, mealType, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data category.
+         * @param {OpenDataCategory} [openDataCategory] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async partialUpdateOpenDataCategory(id: string, openDataCategory?: OpenDataCategory, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataCategory>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateOpenDataCategory(id, openDataCategory, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data conversion.
+         * @param {OpenDataConversion} [openDataConversion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async partialUpdateOpenDataConversion(id: string, openDataConversion?: OpenDataConversion, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataConversion>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateOpenDataConversion(id, openDataConversion, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data food.
+         * @param {OpenDataFood} [openDataFood] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async partialUpdateOpenDataFood(id: string, openDataFood?: OpenDataFood, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataFood>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateOpenDataFood(id, openDataFood, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data property.
+         * @param {OpenDataProperty} [openDataProperty] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async partialUpdateOpenDataProperty(id: string, openDataProperty?: OpenDataProperty, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataProperty>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateOpenDataProperty(id, openDataProperty, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data store.
+         * @param {OpenDataStore} [openDataStore] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async partialUpdateOpenDataStore(id: string, openDataStore?: OpenDataStore, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataStore>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateOpenDataStore(id, openDataStore, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data unit.
+         * @param {OpenDataUnit} [openDataUnit] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async partialUpdateOpenDataUnit(id: string, openDataUnit?: OpenDataUnit, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataUnit>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateOpenDataUnit(id, openDataUnit, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data version.
+         * @param {OpenDataVersion} [openDataVersion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async partialUpdateOpenDataVersion(id: string, openDataVersion?: OpenDataVersion, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataVersion>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateOpenDataVersion(id, openDataVersion, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -14192,6 +16914,16 @@ export const ApiApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveExportLog(id, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * 
+         * @param {string} id 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async retrieveFDCViewSet(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<any>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveFDCViewSet(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this food.
@@ -14282,6 +17014,76 @@ export const ApiApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveMealType(id, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data category.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async retrieveOpenDataCategory(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataCategory>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveOpenDataCategory(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data conversion.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async retrieveOpenDataConversion(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataConversion>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveOpenDataConversion(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data food.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async retrieveOpenDataFood(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataFood>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveOpenDataFood(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data property.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async retrieveOpenDataProperty(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataProperty>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveOpenDataProperty(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data store.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async retrieveOpenDataStore(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataStore>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveOpenDataStore(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data unit.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async retrieveOpenDataUnit(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataUnit>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveOpenDataUnit(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data version.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async retrieveOpenDataVersion(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataVersion>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveOpenDataVersion(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -14707,6 +17509,83 @@ export const ApiApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.updateMealType(id, mealType, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data category.
+         * @param {OpenDataCategory} [openDataCategory] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async updateOpenDataCategory(id: string, openDataCategory?: OpenDataCategory, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataCategory>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.updateOpenDataCategory(id, openDataCategory, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data conversion.
+         * @param {OpenDataConversion} [openDataConversion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async updateOpenDataConversion(id: string, openDataConversion?: OpenDataConversion, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataConversion>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.updateOpenDataConversion(id, openDataConversion, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data food.
+         * @param {OpenDataFood} [openDataFood] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async updateOpenDataFood(id: string, openDataFood?: OpenDataFood, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataFood>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.updateOpenDataFood(id, openDataFood, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data property.
+         * @param {OpenDataProperty} [openDataProperty] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async updateOpenDataProperty(id: string, openDataProperty?: OpenDataProperty, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataProperty>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.updateOpenDataProperty(id, openDataProperty, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data store.
+         * @param {OpenDataStore} [openDataStore] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async updateOpenDataStore(id: string, openDataStore?: OpenDataStore, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataStore>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.updateOpenDataStore(id, openDataStore, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data unit.
+         * @param {OpenDataUnit} [openDataUnit] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async updateOpenDataUnit(id: string, openDataUnit?: OpenDataUnit, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataUnit>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.updateOpenDataUnit(id, openDataUnit, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data version.
+         * @param {OpenDataVersion} [openDataVersion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async updateOpenDataVersion(id: string, openDataVersion?: OpenDataVersion, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<OpenDataVersion>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.updateOpenDataVersion(id, openDataVersion, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -15055,6 +17934,69 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         createMealType(mealType?: MealType, options?: any): AxiosPromise<MealType> {
             return localVarFp.createMealType(mealType, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @param {OpenDataCategory} [openDataCategory] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createOpenDataCategory(openDataCategory?: OpenDataCategory, options?: any): AxiosPromise<OpenDataCategory> {
+            return localVarFp.createOpenDataCategory(openDataCategory, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {OpenDataConversion} [openDataConversion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createOpenDataConversion(openDataConversion?: OpenDataConversion, options?: any): AxiosPromise<OpenDataConversion> {
+            return localVarFp.createOpenDataConversion(openDataConversion, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {OpenDataFood} [openDataFood] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createOpenDataFood(openDataFood?: OpenDataFood, options?: any): AxiosPromise<OpenDataFood> {
+            return localVarFp.createOpenDataFood(openDataFood, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {OpenDataProperty} [openDataProperty] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createOpenDataProperty(openDataProperty?: OpenDataProperty, options?: any): AxiosPromise<OpenDataProperty> {
+            return localVarFp.createOpenDataProperty(openDataProperty, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {OpenDataStore} [openDataStore] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createOpenDataStore(openDataStore?: OpenDataStore, options?: any): AxiosPromise<OpenDataStore> {
+            return localVarFp.createOpenDataStore(openDataStore, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {OpenDataUnit} [openDataUnit] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createOpenDataUnit(openDataUnit?: OpenDataUnit, options?: any): AxiosPromise<OpenDataUnit> {
+            return localVarFp.createOpenDataUnit(openDataUnit, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {OpenDataVersion} [openDataVersion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createOpenDataVersion(openDataVersion?: OpenDataVersion, options?: any): AxiosPromise<OpenDataVersion> {
+            return localVarFp.createOpenDataVersion(openDataVersion, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @param {Property} [property] 
@@ -15357,6 +18299,69 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         destroyMealType(id: string, options?: any): AxiosPromise<void> {
             return localVarFp.destroyMealType(id, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data category.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyOpenDataCategory(id: string, options?: any): AxiosPromise<void> {
+            return localVarFp.destroyOpenDataCategory(id, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data conversion.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyOpenDataConversion(id: string, options?: any): AxiosPromise<void> {
+            return localVarFp.destroyOpenDataConversion(id, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data food.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyOpenDataFood(id: string, options?: any): AxiosPromise<void> {
+            return localVarFp.destroyOpenDataFood(id, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data property.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyOpenDataProperty(id: string, options?: any): AxiosPromise<void> {
+            return localVarFp.destroyOpenDataProperty(id, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data store.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyOpenDataStore(id: string, options?: any): AxiosPromise<void> {
+            return localVarFp.destroyOpenDataStore(id, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data unit.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyOpenDataUnit(id: string, options?: any): AxiosPromise<void> {
+            return localVarFp.destroyOpenDataUnit(id, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data version.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyOpenDataVersion(id: string, options?: any): AxiosPromise<void> {
+            return localVarFp.destroyOpenDataVersion(id, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -15690,6 +18695,70 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         listMealTypes(options?: any): AxiosPromise<Array<MealType>> {
             return localVarFp.listMealTypes(options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataCategorys(options?: any): AxiosPromise<Array<OpenDataCategory>> {
+            return localVarFp.listOpenDataCategorys(options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataConversions(options?: any): AxiosPromise<Array<OpenDataConversion>> {
+            return localVarFp.listOpenDataConversions(options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataFoods(options?: any): AxiosPromise<Array<OpenDataFood>> {
+            return localVarFp.listOpenDataFoods(options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataPropertys(options?: any): AxiosPromise<Array<OpenDataProperty>> {
+            return localVarFp.listOpenDataPropertys(options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataStatisticsViewSets(options?: any): AxiosPromise<Array<any>> {
+            return localVarFp.listOpenDataStatisticsViewSets(options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataStores(options?: any): AxiosPromise<Array<OpenDataStore>> {
+            return localVarFp.listOpenDataStores(options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataUnits(options?: any): AxiosPromise<Array<OpenDataUnit>> {
+            return localVarFp.listOpenDataUnits(options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listOpenDataVersions(options?: any): AxiosPromise<Array<OpenDataVersion>> {
+            return localVarFp.listOpenDataVersions(options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @param {*} [options] Override http request option.
@@ -15835,11 +18904,12 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         },
         /**
          * 
+         * @param {string} [query] Query string matched against supermarket name.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listSupermarkets(options?: any): AxiosPromise<Array<Supermarket>> {
-            return localVarFp.listSupermarkets(options).then((request) => request(axios, basePath));
+        listSupermarkets(query?: string, options?: any): AxiosPromise<Array<Supermarket>> {
+            return localVarFp.listSupermarkets(query, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -15881,11 +18951,12 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         },
         /**
          * 
+         * @param {string} [query] Query string matched against user-file name.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listUserFiles(options?: any): AxiosPromise<Array<UserFile>> {
-            return localVarFp.listUserFiles(options).then((request) => request(axios, basePath));
+        listUserFiles(query?: string, options?: any): AxiosPromise<Array<UserFile>> {
+            return localVarFp.listUserFiles(query, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -16116,6 +19187,76 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         partialUpdateMealType(id: string, mealType?: MealType, options?: any): AxiosPromise<MealType> {
             return localVarFp.partialUpdateMealType(id, mealType, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data category.
+         * @param {OpenDataCategory} [openDataCategory] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateOpenDataCategory(id: string, openDataCategory?: OpenDataCategory, options?: any): AxiosPromise<OpenDataCategory> {
+            return localVarFp.partialUpdateOpenDataCategory(id, openDataCategory, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data conversion.
+         * @param {OpenDataConversion} [openDataConversion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateOpenDataConversion(id: string, openDataConversion?: OpenDataConversion, options?: any): AxiosPromise<OpenDataConversion> {
+            return localVarFp.partialUpdateOpenDataConversion(id, openDataConversion, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data food.
+         * @param {OpenDataFood} [openDataFood] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateOpenDataFood(id: string, openDataFood?: OpenDataFood, options?: any): AxiosPromise<OpenDataFood> {
+            return localVarFp.partialUpdateOpenDataFood(id, openDataFood, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data property.
+         * @param {OpenDataProperty} [openDataProperty] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateOpenDataProperty(id: string, openDataProperty?: OpenDataProperty, options?: any): AxiosPromise<OpenDataProperty> {
+            return localVarFp.partialUpdateOpenDataProperty(id, openDataProperty, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data store.
+         * @param {OpenDataStore} [openDataStore] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateOpenDataStore(id: string, openDataStore?: OpenDataStore, options?: any): AxiosPromise<OpenDataStore> {
+            return localVarFp.partialUpdateOpenDataStore(id, openDataStore, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data unit.
+         * @param {OpenDataUnit} [openDataUnit] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateOpenDataUnit(id: string, openDataUnit?: OpenDataUnit, options?: any): AxiosPromise<OpenDataUnit> {
+            return localVarFp.partialUpdateOpenDataUnit(id, openDataUnit, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data version.
+         * @param {OpenDataVersion} [openDataVersion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateOpenDataVersion(id: string, openDataVersion?: OpenDataVersion, options?: any): AxiosPromise<OpenDataVersion> {
+            return localVarFp.partialUpdateOpenDataVersion(id, openDataVersion, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -16404,6 +19545,15 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         retrieveExportLog(id: string, options?: any): AxiosPromise<ExportLog> {
             return localVarFp.retrieveExportLog(id, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @param {string} id 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveFDCViewSet(id: string, options?: any): AxiosPromise<any> {
+            return localVarFp.retrieveFDCViewSet(id, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this food.
@@ -16485,6 +19635,69 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         retrieveMealType(id: string, options?: any): AxiosPromise<MealType> {
             return localVarFp.retrieveMealType(id, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data category.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveOpenDataCategory(id: string, options?: any): AxiosPromise<OpenDataCategory> {
+            return localVarFp.retrieveOpenDataCategory(id, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data conversion.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveOpenDataConversion(id: string, options?: any): AxiosPromise<OpenDataConversion> {
+            return localVarFp.retrieveOpenDataConversion(id, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data food.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveOpenDataFood(id: string, options?: any): AxiosPromise<OpenDataFood> {
+            return localVarFp.retrieveOpenDataFood(id, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data property.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveOpenDataProperty(id: string, options?: any): AxiosPromise<OpenDataProperty> {
+            return localVarFp.retrieveOpenDataProperty(id, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data store.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveOpenDataStore(id: string, options?: any): AxiosPromise<OpenDataStore> {
+            return localVarFp.retrieveOpenDataStore(id, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data unit.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveOpenDataUnit(id: string, options?: any): AxiosPromise<OpenDataUnit> {
+            return localVarFp.retrieveOpenDataUnit(id, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data version.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveOpenDataVersion(id: string, options?: any): AxiosPromise<OpenDataVersion> {
+            return localVarFp.retrieveOpenDataVersion(id, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -16869,6 +20082,76 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         updateMealType(id: string, mealType?: MealType, options?: any): AxiosPromise<MealType> {
             return localVarFp.updateMealType(id, mealType, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data category.
+         * @param {OpenDataCategory} [openDataCategory] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateOpenDataCategory(id: string, openDataCategory?: OpenDataCategory, options?: any): AxiosPromise<OpenDataCategory> {
+            return localVarFp.updateOpenDataCategory(id, openDataCategory, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data conversion.
+         * @param {OpenDataConversion} [openDataConversion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateOpenDataConversion(id: string, openDataConversion?: OpenDataConversion, options?: any): AxiosPromise<OpenDataConversion> {
+            return localVarFp.updateOpenDataConversion(id, openDataConversion, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data food.
+         * @param {OpenDataFood} [openDataFood] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateOpenDataFood(id: string, openDataFood?: OpenDataFood, options?: any): AxiosPromise<OpenDataFood> {
+            return localVarFp.updateOpenDataFood(id, openDataFood, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data property.
+         * @param {OpenDataProperty} [openDataProperty] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateOpenDataProperty(id: string, openDataProperty?: OpenDataProperty, options?: any): AxiosPromise<OpenDataProperty> {
+            return localVarFp.updateOpenDataProperty(id, openDataProperty, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data store.
+         * @param {OpenDataStore} [openDataStore] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateOpenDataStore(id: string, openDataStore?: OpenDataStore, options?: any): AxiosPromise<OpenDataStore> {
+            return localVarFp.updateOpenDataStore(id, openDataStore, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data unit.
+         * @param {OpenDataUnit} [openDataUnit] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateOpenDataUnit(id: string, openDataUnit?: OpenDataUnit, options?: any): AxiosPromise<OpenDataUnit> {
+            return localVarFp.updateOpenDataUnit(id, openDataUnit, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this open data version.
+         * @param {OpenDataVersion} [openDataVersion] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateOpenDataVersion(id: string, openDataVersion?: OpenDataVersion, options?: any): AxiosPromise<OpenDataVersion> {
+            return localVarFp.updateOpenDataVersion(id, openDataVersion, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this property.
@@ -17229,6 +20512,83 @@ export class ApiApi extends BaseAPI {
         return ApiApiFp(this.configuration).createMealType(mealType, options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 
+     * @param {OpenDataCategory} [openDataCategory] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public createOpenDataCategory(openDataCategory?: OpenDataCategory, options?: any) {
+        return ApiApiFp(this.configuration).createOpenDataCategory(openDataCategory, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {OpenDataConversion} [openDataConversion] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public createOpenDataConversion(openDataConversion?: OpenDataConversion, options?: any) {
+        return ApiApiFp(this.configuration).createOpenDataConversion(openDataConversion, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {OpenDataFood} [openDataFood] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public createOpenDataFood(openDataFood?: OpenDataFood, options?: any) {
+        return ApiApiFp(this.configuration).createOpenDataFood(openDataFood, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {OpenDataProperty} [openDataProperty] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public createOpenDataProperty(openDataProperty?: OpenDataProperty, options?: any) {
+        return ApiApiFp(this.configuration).createOpenDataProperty(openDataProperty, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {OpenDataStore} [openDataStore] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public createOpenDataStore(openDataStore?: OpenDataStore, options?: any) {
+        return ApiApiFp(this.configuration).createOpenDataStore(openDataStore, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {OpenDataUnit} [openDataUnit] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public createOpenDataUnit(openDataUnit?: OpenDataUnit, options?: any) {
+        return ApiApiFp(this.configuration).createOpenDataUnit(openDataUnit, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {OpenDataVersion} [openDataVersion] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public createOpenDataVersion(openDataVersion?: OpenDataVersion, options?: any) {
+        return ApiApiFp(this.configuration).createOpenDataVersion(openDataVersion, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @param {Property} [property] 
@@ -17597,6 +20957,83 @@ export class ApiApi extends BaseAPI {
         return ApiApiFp(this.configuration).destroyMealType(id, options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data category.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public destroyOpenDataCategory(id: string, options?: any) {
+        return ApiApiFp(this.configuration).destroyOpenDataCategory(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data conversion.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public destroyOpenDataConversion(id: string, options?: any) {
+        return ApiApiFp(this.configuration).destroyOpenDataConversion(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data food.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public destroyOpenDataFood(id: string, options?: any) {
+        return ApiApiFp(this.configuration).destroyOpenDataFood(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data property.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public destroyOpenDataProperty(id: string, options?: any) {
+        return ApiApiFp(this.configuration).destroyOpenDataProperty(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data store.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public destroyOpenDataStore(id: string, options?: any) {
+        return ApiApiFp(this.configuration).destroyOpenDataStore(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data unit.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public destroyOpenDataUnit(id: string, options?: any) {
+        return ApiApiFp(this.configuration).destroyOpenDataUnit(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data version.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public destroyOpenDataVersion(id: string, options?: any) {
+        return ApiApiFp(this.configuration).destroyOpenDataVersion(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @param {string} id A unique integer value identifying this property.
@@ -18002,6 +21439,86 @@ export class ApiApi extends BaseAPI {
         return ApiApiFp(this.configuration).listMealTypes(options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public listOpenDataCategorys(options?: any) {
+        return ApiApiFp(this.configuration).listOpenDataCategorys(options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public listOpenDataConversions(options?: any) {
+        return ApiApiFp(this.configuration).listOpenDataConversions(options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public listOpenDataFoods(options?: any) {
+        return ApiApiFp(this.configuration).listOpenDataFoods(options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public listOpenDataPropertys(options?: any) {
+        return ApiApiFp(this.configuration).listOpenDataPropertys(options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public listOpenDataStatisticsViewSets(options?: any) {
+        return ApiApiFp(this.configuration).listOpenDataStatisticsViewSets(options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public listOpenDataStores(options?: any) {
+        return ApiApiFp(this.configuration).listOpenDataStores(options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public listOpenDataUnits(options?: any) {
+        return ApiApiFp(this.configuration).listOpenDataUnits(options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public listOpenDataVersions(options?: any) {
+        return ApiApiFp(this.configuration).listOpenDataVersions(options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @param {*} [options] Override http request option.
@@ -18173,12 +21690,13 @@ export class ApiApi extends BaseAPI {
 
     /**
      * 
+     * @param {string} [query] Query string matched against supermarket name.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof ApiApi
      */
-    public listSupermarkets(options?: any) {
-        return ApiApiFp(this.configuration).listSupermarkets(options).then((request) => request(this.axios, this.basePath));
+    public listSupermarkets(query?: string, options?: any) {
+        return ApiApiFp(this.configuration).listSupermarkets(query, options).then((request) => request(this.axios, this.basePath));
     }
 
     /**
@@ -18229,12 +21747,13 @@ export class ApiApi extends BaseAPI {
 
     /**
      * 
+     * @param {string} [query] Query string matched against user-file name.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof ApiApi
      */
-    public listUserFiles(options?: any) {
-        return ApiApiFp(this.configuration).listUserFiles(options).then((request) => request(this.axios, this.basePath));
+    public listUserFiles(query?: string, options?: any) {
+        return ApiApiFp(this.configuration).listUserFiles(query, options).then((request) => request(this.axios, this.basePath));
     }
 
     /**
@@ -18512,6 +22031,90 @@ export class ApiApi extends BaseAPI {
         return ApiApiFp(this.configuration).partialUpdateMealType(id, mealType, options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data category.
+     * @param {OpenDataCategory} [openDataCategory] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public partialUpdateOpenDataCategory(id: string, openDataCategory?: OpenDataCategory, options?: any) {
+        return ApiApiFp(this.configuration).partialUpdateOpenDataCategory(id, openDataCategory, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data conversion.
+     * @param {OpenDataConversion} [openDataConversion] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public partialUpdateOpenDataConversion(id: string, openDataConversion?: OpenDataConversion, options?: any) {
+        return ApiApiFp(this.configuration).partialUpdateOpenDataConversion(id, openDataConversion, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data food.
+     * @param {OpenDataFood} [openDataFood] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public partialUpdateOpenDataFood(id: string, openDataFood?: OpenDataFood, options?: any) {
+        return ApiApiFp(this.configuration).partialUpdateOpenDataFood(id, openDataFood, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data property.
+     * @param {OpenDataProperty} [openDataProperty] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public partialUpdateOpenDataProperty(id: string, openDataProperty?: OpenDataProperty, options?: any) {
+        return ApiApiFp(this.configuration).partialUpdateOpenDataProperty(id, openDataProperty, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data store.
+     * @param {OpenDataStore} [openDataStore] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public partialUpdateOpenDataStore(id: string, openDataStore?: OpenDataStore, options?: any) {
+        return ApiApiFp(this.configuration).partialUpdateOpenDataStore(id, openDataStore, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data unit.
+     * @param {OpenDataUnit} [openDataUnit] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public partialUpdateOpenDataUnit(id: string, openDataUnit?: OpenDataUnit, options?: any) {
+        return ApiApiFp(this.configuration).partialUpdateOpenDataUnit(id, openDataUnit, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data version.
+     * @param {OpenDataVersion} [openDataVersion] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public partialUpdateOpenDataVersion(id: string, openDataVersion?: OpenDataVersion, options?: any) {
+        return ApiApiFp(this.configuration).partialUpdateOpenDataVersion(id, openDataVersion, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @param {string} id A unique integer value identifying this property.
@@ -18858,6 +22461,17 @@ export class ApiApi extends BaseAPI {
         return ApiApiFp(this.configuration).retrieveExportLog(id, options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 
+     * @param {string} id 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public retrieveFDCViewSet(id: string, options?: any) {
+        return ApiApiFp(this.configuration).retrieveFDCViewSet(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @param {string} id A unique integer value identifying this food.
@@ -18957,6 +22571,83 @@ export class ApiApi extends BaseAPI {
         return ApiApiFp(this.configuration).retrieveMealType(id, options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data category.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public retrieveOpenDataCategory(id: string, options?: any) {
+        return ApiApiFp(this.configuration).retrieveOpenDataCategory(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data conversion.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public retrieveOpenDataConversion(id: string, options?: any) {
+        return ApiApiFp(this.configuration).retrieveOpenDataConversion(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data food.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public retrieveOpenDataFood(id: string, options?: any) {
+        return ApiApiFp(this.configuration).retrieveOpenDataFood(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data property.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public retrieveOpenDataProperty(id: string, options?: any) {
+        return ApiApiFp(this.configuration).retrieveOpenDataProperty(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data store.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public retrieveOpenDataStore(id: string, options?: any) {
+        return ApiApiFp(this.configuration).retrieveOpenDataStore(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data unit.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public retrieveOpenDataUnit(id: string, options?: any) {
+        return ApiApiFp(this.configuration).retrieveOpenDataUnit(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data version.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public retrieveOpenDataVersion(id: string, options?: any) {
+        return ApiApiFp(this.configuration).retrieveOpenDataVersion(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @param {string} id A unique integer value identifying this property.
@@ -19423,6 +23114,90 @@ export class ApiApi extends BaseAPI {
         return ApiApiFp(this.configuration).updateMealType(id, mealType, options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data category.
+     * @param {OpenDataCategory} [openDataCategory] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public updateOpenDataCategory(id: string, openDataCategory?: OpenDataCategory, options?: any) {
+        return ApiApiFp(this.configuration).updateOpenDataCategory(id, openDataCategory, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data conversion.
+     * @param {OpenDataConversion} [openDataConversion] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public updateOpenDataConversion(id: string, openDataConversion?: OpenDataConversion, options?: any) {
+        return ApiApiFp(this.configuration).updateOpenDataConversion(id, openDataConversion, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data food.
+     * @param {OpenDataFood} [openDataFood] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public updateOpenDataFood(id: string, openDataFood?: OpenDataFood, options?: any) {
+        return ApiApiFp(this.configuration).updateOpenDataFood(id, openDataFood, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data property.
+     * @param {OpenDataProperty} [openDataProperty] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public updateOpenDataProperty(id: string, openDataProperty?: OpenDataProperty, options?: any) {
+        return ApiApiFp(this.configuration).updateOpenDataProperty(id, openDataProperty, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data store.
+     * @param {OpenDataStore} [openDataStore] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public updateOpenDataStore(id: string, openDataStore?: OpenDataStore, options?: any) {
+        return ApiApiFp(this.configuration).updateOpenDataStore(id, openDataStore, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data unit.
+     * @param {OpenDataUnit} [openDataUnit] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public updateOpenDataUnit(id: string, openDataUnit?: OpenDataUnit, options?: any) {
+        return ApiApiFp(this.configuration).updateOpenDataUnit(id, openDataUnit, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this open data version.
+     * @param {OpenDataVersion} [openDataVersion] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public updateOpenDataVersion(id: string, openDataVersion?: OpenDataVersion, options?: any) {
+        return ApiApiFp(this.configuration).updateOpenDataVersion(id, openDataVersion, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @param {string} id A unique integer value identifying this property.
diff --git a/vue/src/utils/utils.js b/vue/src/utils/utils.js
index cf1a5b3f..515dc242 100644
--- a/vue/src/utils/utils.js
+++ b/vue/src/utils/utils.js
@@ -393,7 +393,7 @@ export const ApiMixin = {
         }
     },
     methods: {
-        // if passing parameters that are not part of the offical schema of the endpoint use parameter: options: {query: {simple: 1}}
+        // if passing parameters that are not part of the official schema of the endpoint use parameter: options: {query: {simple: 1}}
         genericAPI: function (model, action, options) {
             let setup = getConfig(model, action)
             if (setup?.config?.function) {

From ece7ca7e826c72a0010c1ac02548a20f3f3f7a83 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Thu, 1 Feb 2024 21:09:21 +0100
Subject: [PATCH 85/95] playing with checkbox design

---
 vue/src/components/ShoppingLineItem.vue | 85 +++++++++++++++++--------
 1 file changed, 57 insertions(+), 28 deletions(-)

diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index 96f8eec5..ac647f22 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -1,38 +1,60 @@
 <template>
-    <div class="swipe-container" :id="item_container_id" @touchend="handleSwipe()"
-         v-if="(useUserPreferenceStore().device_settings.shopping_show_checked_entries || !is_checked) && (useUserPreferenceStore().device_settings.shopping_show_delayed_entries || !is_delayed)"
-    >
-        <div class="swipe-action" :class="{'bg-success': !is_checked , 'bg-warning': is_checked }">
-            <i class="swipe-icon fa-fw fas" :class="{'fa-check': !is_checked , 'fa-cart-plus': is_checked }"></i>
+    <div>
+
+
+        <div class="swipe-container" :id="item_container_id" @touchend="handleSwipe()"
+             v-if="(useUserPreferenceStore().device_settings.shopping_show_checked_entries || !is_checked) && (useUserPreferenceStore().device_settings.shopping_show_delayed_entries || !is_delayed)">
+            <!--        <div class="swipe-action" :class="{'bg-success': !is_checked , 'bg-warning': is_checked }">-->
+            <!--            <i class="swipe-icon fa-fw fas" :class="{'fa-check': !is_checked , 'fa-cart-plus': is_checked }"></i>-->
+            <!--        </div>-->
+
+            <!--        <div class="swipe-action bg-primary justify-content-end">-->
+            <!--            <i class="fa-fw fas fa-hourglass-half swipe-icon"></i>-->
+            <!--        </div>-->
         </div>
 
-        <b-button-group class="swipe-element">
-            <b-button variant="primary" v-if="is_delayed">
-                <i class="fa-fw fas fa-hourglass-half"></i>
-            </b-button>
-            <div class="card flex-grow-1 btn-block p-2" @click="detail_modal_visible = true">
-                <div class="d-flex">
-                    <div class="d-flex flex-column pr-2" v-if="Object.keys(amounts).length> 0">
+        <!--            <b-col cols="1" variant="primary" v-if="is_delayed">-->
+            <!--                <i class="fa-fw fas fa-hourglass-half"></i>-->
+            <!--            </b-col>-->
+
+        <b-row >
+
+            <b-col cols="4" md="3" >
+                <div class="" v-if="Object.keys(amounts).length> 0">
                         <span v-for="a in amounts" v-bind:key="a.id">
 
                             <span><i class="fas fa-check" v-if="a.checked && !is_checked"></i><i class="fas fa-hourglass-half" v-if="a.delayed && !a.checked"></i> {{ a.amount }} {{ a.unit }}</span>
-                            <br/></span>
-                    </div>
-                    <div class="d-flex  flex-column flex-grow-1 align-self-center">
-                        {{ food.name }}
-                    </div>
+                            <br/>
+                        </span>
                 </div>
+            </b-col>
+            <b-col cols="6" md="6" @click="detail_modal_visible = true">
+                <b-row >
+                    <b-col >
+                        <div class="align-middle">
+                             {{ food.name }}
+                        </div>
+
+
+                    </b-col>
+                </b-row>
+                <b-row v-if="info_row">
+                    <b-col>
+                        <small class="text-muted">{{ info_row }}</small>
+                    </b-col>
+                </b-row>
+
+
+            </b-col>
+            <b-col cols="2" md="3">
+
+                <input type="checkbox" class="form-control form-control-sm checkbox-control-mobile"
+                       :checked="is_checked" @click="useShoppingListStore().setEntriesCheckedState(entries, !is_checked, true)"/>
+
+            </b-col>
+
+        </b-row>
 
-                <span v-if="info_row"><small class="text-muted">{{ info_row }}</small></span>
-            </div>
-            <b-button variant="success" @click="useShoppingListStore().setEntriesCheckedState(entries, !is_checked, true)"
-                      :class="{'btn-success': !is_checked, 'btn-warning': is_checked}">
-                <i class="d-print-none fa-fw fas" :class="{'fa-check': !is_checked , 'fa-cart-plus': is_checked }"></i>
-            </b-button>
-        </b-button-group>
-        <div class="swipe-action bg-primary justify-content-end">
-            <i class="fa-fw fas fa-hourglass-half swipe-icon"></i>
-        </div>
 
         <b-modal v-model="detail_modal_visible" @hidden="detail_modal_visible = false">
             <template #modal-title>
@@ -69,7 +91,9 @@
 
                         <b-button-group class="w-100">
                             <div class="card flex-grow-1 btn-block p-2">
-                                <span><i class="fas fa-check" v-if="e.checked"></i><i class="fas fa-hourglass-half" v-if="e.delay_until !== null && !e.checked"></i> <span v-if="e.amount > 0">{{ e.amount }}</span> {{ e.unit?.name }} {{ food.name }}</span>
+                                <span><i class="fas fa-check" v-if="e.checked"></i><i class="fas fa-hourglass-half" v-if="e.delay_until !== null && !e.checked"></i> <span v-if="e.amount > 0">{{ e.amount }}</span> {{
+                                        e.unit?.name
+                                    }} {{ food.name }}</span>
                                 <span><small class="text-muted">
                                     <span v-if="e.recipe_mealplan && e.recipe_mealplan.recipe_name !== ''">
                                         <a :href="resolveDjangoUrl('view_recipe', e.recipe_mealplan.recipe)"> {{
@@ -308,6 +332,11 @@ export default {
 
 
 <style>
+
+.checkbox-control-mobile {
+    font-size: 1rem;
+}
+
 /* scroll snap takes care of restoring scroll position */
 .swipe-container {
     display: flex;

From 4eafbddfdb34dbff1424c4de9be88e33fb37eea0 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Fri, 2 Feb 2024 09:31:33 +0100
Subject: [PATCH 86/95] fixed SLE api endpoint

---
 cookbook/views/api.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/cookbook/views/api.py b/cookbook/views/api.py
index 7c36e3e9..359b281d 100644
--- a/cookbook/views/api.py
+++ b/cookbook/views/api.py
@@ -1165,10 +1165,10 @@ class ShoppingListEntryViewSet(viewsets.ModelViewSet):
 
         if 'checked' in self.request.query_params or 'recent' in self.request.query_params:
             return shopping_helper(self.queryset, self.request)
-
-        today_start = timezone.now().replace(hour=0, minute=0, second=0)
-        week_ago = today_start - datetime.timedelta(days=max(self.request.user.userpreference.shopping_recent_days, 14))
-        self.queryset = self.queryset.filter(Q(checked=False) | Q(completed_at__gte=week_ago))
+        elif not self.detail:
+            today_start = timezone.now().replace(hour=0, minute=0, second=0)
+            week_ago = today_start - datetime.timedelta(days=max(self.request.user.userpreference.shopping_recent_days, 14))
+            self.queryset = self.queryset.filter(Q(checked=False) | Q(completed_at__gte=week_ago))
 
         try:
             last_autosync = self.request.query_params.get('last_autosync', None)
@@ -1179,7 +1179,10 @@ class ShoppingListEntryViewSet(viewsets.ModelViewSet):
             traceback.print_exc()
 
         # TODO once old shopping list is removed this needs updated to sharing users in preferences
-        return self.queryset[:1000]
+        if self.detail:
+            return self.queryset
+        else:
+            return self.queryset[:1000]
 
     @decorators.action(
         detail=False,

From a2cb1ccf3a8be3e71ffd6886e5f4ba28398a1bf6 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Tue, 6 Feb 2024 13:25:34 +0100
Subject: [PATCH 87/95] Revert "playing with checkbox design"

This reverts commit ece7ca7e826c72a0010c1ac02548a20f3f3f7a83.
---
 vue/src/components/ShoppingLineItem.vue | 85 ++++++++-----------------
 1 file changed, 28 insertions(+), 57 deletions(-)

diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index ac647f22..96f8eec5 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -1,60 +1,38 @@
 <template>
-    <div>
-
-
-        <div class="swipe-container" :id="item_container_id" @touchend="handleSwipe()"
-             v-if="(useUserPreferenceStore().device_settings.shopping_show_checked_entries || !is_checked) && (useUserPreferenceStore().device_settings.shopping_show_delayed_entries || !is_delayed)">
-            <!--        <div class="swipe-action" :class="{'bg-success': !is_checked , 'bg-warning': is_checked }">-->
-            <!--            <i class="swipe-icon fa-fw fas" :class="{'fa-check': !is_checked , 'fa-cart-plus': is_checked }"></i>-->
-            <!--        </div>-->
-
-            <!--        <div class="swipe-action bg-primary justify-content-end">-->
-            <!--            <i class="fa-fw fas fa-hourglass-half swipe-icon"></i>-->
-            <!--        </div>-->
+    <div class="swipe-container" :id="item_container_id" @touchend="handleSwipe()"
+         v-if="(useUserPreferenceStore().device_settings.shopping_show_checked_entries || !is_checked) && (useUserPreferenceStore().device_settings.shopping_show_delayed_entries || !is_delayed)"
+    >
+        <div class="swipe-action" :class="{'bg-success': !is_checked , 'bg-warning': is_checked }">
+            <i class="swipe-icon fa-fw fas" :class="{'fa-check': !is_checked , 'fa-cart-plus': is_checked }"></i>
         </div>
 
-        <!--            <b-col cols="1" variant="primary" v-if="is_delayed">-->
-            <!--                <i class="fa-fw fas fa-hourglass-half"></i>-->
-            <!--            </b-col>-->
-
-        <b-row >
-
-            <b-col cols="4" md="3" >
-                <div class="" v-if="Object.keys(amounts).length> 0">
+        <b-button-group class="swipe-element">
+            <b-button variant="primary" v-if="is_delayed">
+                <i class="fa-fw fas fa-hourglass-half"></i>
+            </b-button>
+            <div class="card flex-grow-1 btn-block p-2" @click="detail_modal_visible = true">
+                <div class="d-flex">
+                    <div class="d-flex flex-column pr-2" v-if="Object.keys(amounts).length> 0">
                         <span v-for="a in amounts" v-bind:key="a.id">
 
                             <span><i class="fas fa-check" v-if="a.checked && !is_checked"></i><i class="fas fa-hourglass-half" v-if="a.delayed && !a.checked"></i> {{ a.amount }} {{ a.unit }}</span>
-                            <br/>
-                        </span>
+                            <br/></span>
+                    </div>
+                    <div class="d-flex  flex-column flex-grow-1 align-self-center">
+                        {{ food.name }}
+                    </div>
                 </div>
-            </b-col>
-            <b-col cols="6" md="6" @click="detail_modal_visible = true">
-                <b-row >
-                    <b-col >
-                        <div class="align-middle">
-                             {{ food.name }}
-                        </div>
-
-
-                    </b-col>
-                </b-row>
-                <b-row v-if="info_row">
-                    <b-col>
-                        <small class="text-muted">{{ info_row }}</small>
-                    </b-col>
-                </b-row>
-
-
-            </b-col>
-            <b-col cols="2" md="3">
-
-                <input type="checkbox" class="form-control form-control-sm checkbox-control-mobile"
-                       :checked="is_checked" @click="useShoppingListStore().setEntriesCheckedState(entries, !is_checked, true)"/>
-
-            </b-col>
-
-        </b-row>
 
+                <span v-if="info_row"><small class="text-muted">{{ info_row }}</small></span>
+            </div>
+            <b-button variant="success" @click="useShoppingListStore().setEntriesCheckedState(entries, !is_checked, true)"
+                      :class="{'btn-success': !is_checked, 'btn-warning': is_checked}">
+                <i class="d-print-none fa-fw fas" :class="{'fa-check': !is_checked , 'fa-cart-plus': is_checked }"></i>
+            </b-button>
+        </b-button-group>
+        <div class="swipe-action bg-primary justify-content-end">
+            <i class="fa-fw fas fa-hourglass-half swipe-icon"></i>
+        </div>
 
         <b-modal v-model="detail_modal_visible" @hidden="detail_modal_visible = false">
             <template #modal-title>
@@ -91,9 +69,7 @@
 
                         <b-button-group class="w-100">
                             <div class="card flex-grow-1 btn-block p-2">
-                                <span><i class="fas fa-check" v-if="e.checked"></i><i class="fas fa-hourglass-half" v-if="e.delay_until !== null && !e.checked"></i> <span v-if="e.amount > 0">{{ e.amount }}</span> {{
-                                        e.unit?.name
-                                    }} {{ food.name }}</span>
+                                <span><i class="fas fa-check" v-if="e.checked"></i><i class="fas fa-hourglass-half" v-if="e.delay_until !== null && !e.checked"></i> <span v-if="e.amount > 0">{{ e.amount }}</span> {{ e.unit?.name }} {{ food.name }}</span>
                                 <span><small class="text-muted">
                                     <span v-if="e.recipe_mealplan && e.recipe_mealplan.recipe_name !== ''">
                                         <a :href="resolveDjangoUrl('view_recipe', e.recipe_mealplan.recipe)"> {{
@@ -332,11 +308,6 @@ export default {
 
 
 <style>
-
-.checkbox-control-mobile {
-    font-size: 1rem;
-}
-
 /* scroll snap takes care of restoring scroll position */
 .swipe-container {
     display: flex;

From 5211fbe6da2216215ade2742e9a83995ab2dbf10 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Tue, 6 Feb 2024 13:52:26 +0100
Subject: [PATCH 88/95] styling and bg sync message

---
 vue/src/components/ShoppingLineItem.vue |  13 +-
 vue/src/locales/en.json                 |   2 +-
 vue/src/utils/openapi/api.ts            | 198 +++++-------------------
 3 files changed, 47 insertions(+), 166 deletions(-)

diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index 96f8eec5..72348df3 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -12,18 +12,20 @@
             </b-button>
             <div class="card flex-grow-1 btn-block p-2" @click="detail_modal_visible = true">
                 <div class="d-flex">
-                    <div class="d-flex flex-column pr-2" v-if="Object.keys(amounts).length> 0">
+                    <div class="d-flex flex-column pr-2"  v-if="Object.keys(amounts).length> 0">
                         <span v-for="a in amounts" v-bind:key="a.id">
 
-                            <span><i class="fas fa-check" v-if="a.checked && !is_checked"></i><i class="fas fa-hourglass-half" v-if="a.delayed && !a.checked"></i> {{ a.amount }} {{ a.unit }}</span>
+                            <span><i class="fas fa-check" v-if="a.checked && !is_checked"></i><i class="fas fa-hourglass-half" v-if="a.delayed && !a.checked"></i> <b>{{ a.amount }} {{ a.unit }} </b></span>
                             <br/></span>
+
                     </div>
                     <div class="d-flex  flex-column flex-grow-1 align-self-center">
-                        {{ food.name }}
+                        {{ food.name }} <br/>
+                         <span v-if="info_row"><small class="text-muted">{{ info_row }}</small></span>
                     </div>
                 </div>
 
-                <span v-if="info_row"><small class="text-muted">{{ info_row }}</small></span>
+
             </div>
             <b-button variant="success" @click="useShoppingListStore().setEntriesCheckedState(entries, !is_checked, true)"
                       :class="{'btn-success': !is_checked, 'btn-warning': is_checked}">
@@ -69,7 +71,8 @@
 
                         <b-button-group class="w-100">
                             <div class="card flex-grow-1 btn-block p-2">
-                                <span><i class="fas fa-check" v-if="e.checked"></i><i class="fas fa-hourglass-half" v-if="e.delay_until !== null && !e.checked"></i> <span v-if="e.amount > 0">{{ e.amount }}</span> {{ e.unit?.name }} {{ food.name }}</span>
+                                <span><i class="fas fa-check" v-if="e.checked"></i><i class="fas fa-hourglass-half" v-if="e.delay_until !== null && !e.checked"></i> <span
+                                    v-if="e.amount > 0">{{ e.amount }}</span> {{ e.unit?.name }} {{ food.name }}</span>
                                 <span><small class="text-muted">
                                     <span v-if="e.recipe_mealplan && e.recipe_mealplan.recipe_name !== ''">
                                         <a :href="resolveDjangoUrl('view_recipe', e.recipe_mealplan.recipe)"> {{
diff --git a/vue/src/locales/en.json b/vue/src/locales/en.json
index 79f9c96e..c6b9b0d0 100644
--- a/vue/src/locales/en.json
+++ b/vue/src/locales/en.json
@@ -304,7 +304,7 @@
 	"ShowRecentlyCompleted": "Show recently completed items",
 	"Completed": "Completed",
 	"OfflineAlert": "You are offline, shopping list may not syncronize.",
-	"ShoppingBackgroundSyncWarning": "Due to bad connectivity some changes could not be synchronized. Automatically retrying when connection becomes available.",
+	"ShoppingBackgroundSyncWarning": "Bad network, waiting to sync ...",
 	"shopping_share": "Share Shopping List",
 	"shopping_auto_sync": "Autosync",
 	"one_url_per_line": "One URL per line",
diff --git a/vue/src/utils/openapi/api.ts b/vue/src/utils/openapi/api.ts
index a623c8e0..67da310d 100644
--- a/vue/src/utils/openapi/api.ts
+++ b/vue/src/utils/openapi/api.ts
@@ -4013,6 +4013,18 @@ export interface ShoppingListEntries {
      * @memberof ShoppingListEntries
      */
     unit?: FoodPropertiesFoodUnit | null;
+    /**
+     * 
+     * @type {number}
+     * @memberof ShoppingListEntries
+     */
+    ingredient?: number | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ShoppingListEntries
+     */
+    ingredient_note?: string;
     /**
      * 
      * @type {string}
@@ -4049,12 +4061,6 @@ export interface ShoppingListEntries {
      * @memberof ShoppingListEntries
      */
     created_at?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof ShoppingListEntries
-     */
-    updated_at?: string;
     /**
      * 
      * @type {string}
@@ -4098,6 +4104,18 @@ export interface ShoppingListEntry {
      * @memberof ShoppingListEntry
      */
     unit?: FoodPropertiesFoodUnit | null;
+    /**
+     * 
+     * @type {number}
+     * @memberof ShoppingListEntry
+     */
+    ingredient?: number | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ShoppingListEntry
+     */
+    ingredient_note?: string;
     /**
      * 
      * @type {string}
@@ -4134,12 +4152,6 @@ export interface ShoppingListEntry {
      * @memberof ShoppingListEntry
      */
     created_at?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof ShoppingListEntry
-     */
-    updated_at?: string;
     /**
      * 
      * @type {string}
@@ -4153,25 +4165,6 @@ export interface ShoppingListEntry {
      */
     delay_until?: string | null;
 }
-/**
- * 
- * @export
- * @interface ShoppingListEntryBulk
- */
-export interface ShoppingListEntryBulk {
-    /**
-     * 
-     * @type {Array<any>}
-     * @memberof ShoppingListEntryBulk
-     */
-    ids: Array<any>;
-    /**
-     * 
-     * @type {boolean}
-     * @memberof ShoppingListEntryBulk
-     */
-    checked: boolean;
-}
 /**
  * 
  * @export
@@ -4220,18 +4213,6 @@ export interface ShoppingListRecipe {
      * @memberof ShoppingListRecipe
      */
     mealplan_note?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof ShoppingListRecipe
-     */
-    mealplan_from_date?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof ShoppingListRecipe
-     */
-    mealplan_type?: string;
 }
 /**
  * 
@@ -4281,18 +4262,6 @@ export interface ShoppingListRecipeMealplan {
      * @memberof ShoppingListRecipeMealplan
      */
     mealplan_note?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof ShoppingListRecipeMealplan
-     */
-    mealplan_from_date?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof ShoppingListRecipeMealplan
-     */
-    mealplan_type?: string;
 }
 /**
  * 
@@ -4342,18 +4311,6 @@ export interface ShoppingListRecipes {
      * @memberof ShoppingListRecipes
      */
     mealplan_note?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof ShoppingListRecipes
-     */
-    mealplan_from_date?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof ShoppingListRecipes
-     */
-    mealplan_type?: string;
 }
 /**
  * 
@@ -5503,39 +5460,6 @@ export interface ViewLog {
  */
 export const ApiApiAxiosParamCreator = function (configuration?: Configuration) {
     return {
-        /**
-         * 
-         * @param {ShoppingListEntryBulk} [shoppingListEntryBulk] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        bulkShoppingListEntry: async (shoppingListEntryBulk?: ShoppingListEntryBulk, options: any = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/shopping-list-entry/bulk/`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(shoppingListEntryBulk, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
         /**
          * 
          * @param {AccessToken} [accessToken] 
@@ -9640,11 +9564,10 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
         },
         /**
          * 
-         * @param {string} [query] Query string matched against supermarket name.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listSupermarkets: async (query?: string, options: any = {}): Promise<RequestArgs> => {
+        listSupermarkets: async (options: any = {}): Promise<RequestArgs> => {
             const localVarPath = `/api/supermarket/`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -9657,10 +9580,6 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
-            if (query !== undefined) {
-                localVarQueryParameter['query'] = query;
-            }
-
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
@@ -9820,11 +9739,10 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
         },
         /**
          * 
-         * @param {string} [query] Query string matched against user-file name.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listUserFiles: async (query?: string, options: any = {}): Promise<RequestArgs> => {
+        listUserFiles: async (options: any = {}): Promise<RequestArgs> => {
             const localVarPath = `/api/user-file/`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -9837,10 +9755,6 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
-            if (query !== undefined) {
-                localVarQueryParameter['query'] = query;
-            }
-
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
@@ -14984,16 +14898,6 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
 export const ApiApiFp = function(configuration?: Configuration) {
     const localVarAxiosParamCreator = ApiApiAxiosParamCreator(configuration)
     return {
-        /**
-         * 
-         * @param {ShoppingListEntryBulk} [shoppingListEntryBulk] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async bulkShoppingListEntry(shoppingListEntryBulk?: ShoppingListEntryBulk, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<ShoppingListEntryBulk>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.bulkShoppingListEntry(shoppingListEntryBulk, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
         /**
          * 
          * @param {AccessToken} [accessToken] 
@@ -16208,12 +16112,11 @@ export const ApiApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
-         * @param {string} [query] Query string matched against supermarket name.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listSupermarkets(query?: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<Supermarket>>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.listSupermarkets(query, options);
+        async listSupermarkets(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<Supermarket>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listSupermarkets(options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
         /**
@@ -16260,12 +16163,11 @@ export const ApiApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
-         * @param {string} [query] Query string matched against user-file name.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listUserFiles(query?: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<UserFile>>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.listUserFiles(query, options);
+        async listUserFiles(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<UserFile>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listUserFiles(options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
         /**
@@ -17799,15 +17701,6 @@ export const ApiApiFp = function(configuration?: Configuration) {
 export const ApiApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
     const localVarFp = ApiApiFp(configuration)
     return {
-        /**
-         * 
-         * @param {ShoppingListEntryBulk} [shoppingListEntryBulk] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        bulkShoppingListEntry(shoppingListEntryBulk?: ShoppingListEntryBulk, options?: any): AxiosPromise<ShoppingListEntryBulk> {
-            return localVarFp.bulkShoppingListEntry(shoppingListEntryBulk, options).then((request) => request(axios, basePath));
-        },
         /**
          * 
          * @param {AccessToken} [accessToken] 
@@ -18904,12 +18797,11 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         },
         /**
          * 
-         * @param {string} [query] Query string matched against supermarket name.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listSupermarkets(query?: string, options?: any): AxiosPromise<Array<Supermarket>> {
-            return localVarFp.listSupermarkets(query, options).then((request) => request(axios, basePath));
+        listSupermarkets(options?: any): AxiosPromise<Array<Supermarket>> {
+            return localVarFp.listSupermarkets(options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -18951,12 +18843,11 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         },
         /**
          * 
-         * @param {string} [query] Query string matched against user-file name.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listUserFiles(query?: string, options?: any): AxiosPromise<Array<UserFile>> {
-            return localVarFp.listUserFiles(query, options).then((request) => request(axios, basePath));
+        listUserFiles(options?: any): AxiosPromise<Array<UserFile>> {
+            return localVarFp.listUserFiles(options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -20347,17 +20238,6 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
  * @extends {BaseAPI}
  */
 export class ApiApi extends BaseAPI {
-    /**
-     * 
-     * @param {ShoppingListEntryBulk} [shoppingListEntryBulk] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public bulkShoppingListEntry(shoppingListEntryBulk?: ShoppingListEntryBulk, options?: any) {
-        return ApiApiFp(this.configuration).bulkShoppingListEntry(shoppingListEntryBulk, options).then((request) => request(this.axios, this.basePath));
-    }
-
     /**
      * 
      * @param {AccessToken} [accessToken] 
@@ -21690,13 +21570,12 @@ export class ApiApi extends BaseAPI {
 
     /**
      * 
-     * @param {string} [query] Query string matched against supermarket name.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof ApiApi
      */
-    public listSupermarkets(query?: string, options?: any) {
-        return ApiApiFp(this.configuration).listSupermarkets(query, options).then((request) => request(this.axios, this.basePath));
+    public listSupermarkets(options?: any) {
+        return ApiApiFp(this.configuration).listSupermarkets(options).then((request) => request(this.axios, this.basePath));
     }
 
     /**
@@ -21747,13 +21626,12 @@ export class ApiApi extends BaseAPI {
 
     /**
      * 
-     * @param {string} [query] Query string matched against user-file name.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof ApiApi
      */
-    public listUserFiles(query?: string, options?: any) {
-        return ApiApiFp(this.configuration).listUserFiles(query, options).then((request) => request(this.axios, this.basePath));
+    public listUserFiles(options?: any) {
+        return ApiApiFp(this.configuration).listUserFiles(options).then((request) => request(this.axios, this.basePath));
     }
 
     /**

From 08a2b4d0b2669a64b4be8fbe2c5602078d33afbe Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Tue, 6 Feb 2024 14:10:36 +0100
Subject: [PATCH 89/95] formatted file

---
 cookbook/templates/shoppinglist_template.html | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/cookbook/templates/shoppinglist_template.html b/cookbook/templates/shoppinglist_template.html
index c8c1d3f5..ceb61342 100644
--- a/cookbook/templates/shoppinglist_template.html
+++ b/cookbook/templates/shoppinglist_template.html
@@ -2,6 +2,7 @@
 {% load render_bundle from webpack_loader %}
 {% load static %}
 {% load i18n %}
+
 {% block title %} {{ title }} {% endblock %}
 
 {% block content_fluid %}
@@ -10,16 +11,21 @@
         <shopping-list-view></shopping-list-view>
     </div>
 
-{% endblock %} {% block script %} {% if debug %}
-    <script src="{% url 'js_reverse' %}"></script>
-{% else %}
-    <script src="{% static 'django_js_reverse/reverse.js' %}"></script>
-{% endif %}
+{% endblock %}
 
-<script type="application/javascript">
-    window.IMAGE_PLACEHOLDER = "{% static 'assets/recipe_no_image.svg' %}"
-    window.CUSTOM_LOCALE = '{{ request.LANGUAGE_CODE }}'
-    window.SHOPPING_MIN_AUTOSYNC_INTERVAL = {{ SHOPPING_MIN_AUTOSYNC_INTERVAL }}
-</script>
+{% block script %}
+    {% if debug %}
+        <script src="{% url 'js_reverse' %}"></script>
+    {% else %}
+        <script src="{% static 'django_js_reverse/reverse.js' %}"></script>
+    {% endif %}
 
-{% render_bundle 'shopping_list_view' %} {% endblock %}
+    <script type="application/javascript">
+        window.IMAGE_PLACEHOLDER = "{% static 'assets/recipe_no_image.svg' %}"
+        window.CUSTOM_LOCALE = '{{ request.LANGUAGE_CODE }}'
+        window.SHOPPING_MIN_AUTOSYNC_INTERVAL = {{ SHOPPING_MIN_AUTOSYNC_INTERVAL }}
+    </script>
+
+
+    {% render_bundle 'shopping_list_view' %}
+{% endblock %}

From dffb2d4eaed0af706ee037ed43c28fc0460a8a57 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Tue, 6 Feb 2024 14:42:14 +0100
Subject: [PATCH 90/95] fixed test

---
 cookbook/tests/api/test_api_shopping_list_entryv2.py | 3 +++
 cookbook/views/api.py                                | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cookbook/tests/api/test_api_shopping_list_entryv2.py b/cookbook/tests/api/test_api_shopping_list_entryv2.py
index a1e78f7b..f1266d1e 100644
--- a/cookbook/tests/api/test_api_shopping_list_entryv2.py
+++ b/cookbook/tests/api/test_api_shopping_list_entryv2.py
@@ -214,6 +214,9 @@ def test_completed(sle, u1_s1):
 
 def test_recent(sle, u1_s1):
     user = auth.get_user(u1_s1)
+    user.userpreference.shopping_recent_days = 7 # hardcoded API limit 14 days
+    user.userpreference.save()
+
     today_start = timezone.now().replace(hour=0, minute=0, second=0)
 
     # past_date within recent_days threshold
diff --git a/cookbook/views/api.py b/cookbook/views/api.py
index 359b281d..fa16688a 100644
--- a/cookbook/views/api.py
+++ b/cookbook/views/api.py
@@ -1163,11 +1163,11 @@ class ShoppingListEntryViewSet(viewsets.ModelViewSet):
         if pk := self.request.query_params.getlist('id', []):
             self.queryset = self.queryset.filter(food__id__in=[int(i) for i in pk])
 
-        if 'checked' in self.request.query_params or 'recent' in self.request.query_params:
+        if 'checked' in self.request.query_params:
             return shopping_helper(self.queryset, self.request)
         elif not self.detail:
             today_start = timezone.now().replace(hour=0, minute=0, second=0)
-            week_ago = today_start - datetime.timedelta(days=max(self.request.user.userpreference.shopping_recent_days, 14))
+            week_ago = today_start - datetime.timedelta(days=min(self.request.user.userpreference.shopping_recent_days, 14))
             self.queryset = self.queryset.filter(Q(checked=False) | Q(completed_at__gte=week_ago))
 
         try:

From 98b06b6f3cb262a76ee52e1c04cedeccf4cd9b4a Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Tue, 6 Feb 2024 14:48:18 +0100
Subject: [PATCH 91/95] improved modal

---
 vue/src/components/ShoppingLineItem.vue | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index 72348df3..dbc9c2fd 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -12,16 +12,18 @@
             </b-button>
             <div class="card flex-grow-1 btn-block p-2" @click="detail_modal_visible = true">
                 <div class="d-flex">
-                    <div class="d-flex flex-column pr-2"  v-if="Object.keys(amounts).length> 0">
+                    <div class="d-flex flex-column pr-2" v-if="Object.keys(amounts).length> 0">
                         <span v-for="a in amounts" v-bind:key="a.id">
 
-                            <span><i class="fas fa-check" v-if="a.checked && !is_checked"></i><i class="fas fa-hourglass-half" v-if="a.delayed && !a.checked"></i> <b>{{ a.amount }} {{ a.unit }} </b></span>
+                            <span><i class="fas fa-check" v-if="a.checked && !is_checked"></i><i class="fas fa-hourglass-half" v-if="a.delayed && !a.checked"></i> <b>{{ a.amount }} {{
+                                    a.unit
+                                }} </b></span>
                             <br/></span>
 
                     </div>
                     <div class="d-flex  flex-column flex-grow-1 align-self-center">
                         {{ food.name }} <br/>
-                         <span v-if="info_row"><small class="text-muted">{{ info_row }}</small></span>
+                        <span v-if="info_row"><small class="text-muted">{{ info_row }}</small></span>
                     </div>
                 </div>
 
@@ -36,7 +38,7 @@
             <i class="fa-fw fas fa-hourglass-half swipe-icon"></i>
         </div>
 
-        <b-modal v-model="detail_modal_visible" @hidden="detail_modal_visible = false">
+        <b-modal v-model="detail_modal_visible" @hidden="detail_modal_visible = false" body-class="pr-4 pl-4 pt-0">
             <template #modal-title>
                 <h5> {{ food_row }}</h5>
                 <small class="text-muted">{{ food.description }}</small>
@@ -55,8 +57,6 @@
                     @change="detail_modal_visible = false; updateFoodCategory(food)"
                 ></b-form-select>
 
-                <b-button variant="warning" block @click="detail_modal_visible = false; setFoodIgnoredAndChecked(food)"> {{ $t("Ignore_Shopping") }}</b-button>
-
                 <b-button variant="info" block
                           @click="detail_modal_visible = false;useShoppingListStore().delayEntries(entries,!is_delayed, true)">
                     {{ $t('Postpone') }}
@@ -71,13 +71,13 @@
 
                         <b-button-group class="w-100">
                             <div class="card flex-grow-1 btn-block p-2">
-                                <span><i class="fas fa-check" v-if="e.checked"></i><i class="fas fa-hourglass-half" v-if="e.delay_until !== null && !e.checked"></i> <span
-                                    v-if="e.amount > 0">{{ e.amount }}</span> {{ e.unit?.name }} {{ food.name }}</span>
+                                <span><i class="fas fa-check" v-if="e.checked"></i><i class="fas fa-hourglass-half" v-if="e.delay_until !== null && !e.checked"></i>
+                                     <b><span v-if="e.amount > 0">{{ e.amount }}</span> {{ e.unit?.name }}</b> {{ food.name }}</span>
                                 <span><small class="text-muted">
                                     <span v-if="e.recipe_mealplan && e.recipe_mealplan.recipe_name !== ''">
-                                        <a :href="resolveDjangoUrl('view_recipe', e.recipe_mealplan.recipe)"> {{
+                                        <a :href="resolveDjangoUrl('view_recipe', e.recipe_mealplan.recipe)"> <b>  {{
                                                 e.recipe_mealplan.recipe_name
-                                            }} </a>({{
+                                            }} </b></a>({{
                                             e.recipe_mealplan.servings
                                         }} {{ $t('Servings') }})<br/>
                                     </span>
@@ -90,7 +90,7 @@
                                 </small></span>
 
                             </div>
-                            <b-button variant="warning"
+                            <b-button variant="outline-danger"
                                       @click="detail_modal_visible = false; useShoppingListStore().deleteObject(e)"><i
                                 class="fas fa-trash"></i></b-button>
                         </b-button-group>
@@ -102,6 +102,7 @@
                     </b-col>
                 </b-row>
 
+                <b-button variant="warning" block @click="detail_modal_visible = false; setFoodIgnoredAndChecked(food)"> {{ $t("Ignore_Shopping") }}</b-button>
                 <b-button variant="danger" block class="mt-2"
                           @click="detail_modal_visible = false;useShoppingListStore().deleteEntries(entries)">
                     {{ $t('Delete_All') }}

From 61ccc6061ce087be93692306562ff3942de77792 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Tue, 6 Feb 2024 19:21:55 +0100
Subject: [PATCH 92/95] updated api client

---
 vue/src/utils/openapi/api.ts | 198 ++++++++++++++++++++++++++++-------
 1 file changed, 160 insertions(+), 38 deletions(-)

diff --git a/vue/src/utils/openapi/api.ts b/vue/src/utils/openapi/api.ts
index 67da310d..a623c8e0 100644
--- a/vue/src/utils/openapi/api.ts
+++ b/vue/src/utils/openapi/api.ts
@@ -4013,18 +4013,6 @@ export interface ShoppingListEntries {
      * @memberof ShoppingListEntries
      */
     unit?: FoodPropertiesFoodUnit | null;
-    /**
-     * 
-     * @type {number}
-     * @memberof ShoppingListEntries
-     */
-    ingredient?: number | null;
-    /**
-     * 
-     * @type {string}
-     * @memberof ShoppingListEntries
-     */
-    ingredient_note?: string;
     /**
      * 
      * @type {string}
@@ -4061,6 +4049,12 @@ export interface ShoppingListEntries {
      * @memberof ShoppingListEntries
      */
     created_at?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ShoppingListEntries
+     */
+    updated_at?: string;
     /**
      * 
      * @type {string}
@@ -4104,18 +4098,6 @@ export interface ShoppingListEntry {
      * @memberof ShoppingListEntry
      */
     unit?: FoodPropertiesFoodUnit | null;
-    /**
-     * 
-     * @type {number}
-     * @memberof ShoppingListEntry
-     */
-    ingredient?: number | null;
-    /**
-     * 
-     * @type {string}
-     * @memberof ShoppingListEntry
-     */
-    ingredient_note?: string;
     /**
      * 
      * @type {string}
@@ -4152,6 +4134,12 @@ export interface ShoppingListEntry {
      * @memberof ShoppingListEntry
      */
     created_at?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ShoppingListEntry
+     */
+    updated_at?: string;
     /**
      * 
      * @type {string}
@@ -4165,6 +4153,25 @@ export interface ShoppingListEntry {
      */
     delay_until?: string | null;
 }
+/**
+ * 
+ * @export
+ * @interface ShoppingListEntryBulk
+ */
+export interface ShoppingListEntryBulk {
+    /**
+     * 
+     * @type {Array<any>}
+     * @memberof ShoppingListEntryBulk
+     */
+    ids: Array<any>;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof ShoppingListEntryBulk
+     */
+    checked: boolean;
+}
 /**
  * 
  * @export
@@ -4213,6 +4220,18 @@ export interface ShoppingListRecipe {
      * @memberof ShoppingListRecipe
      */
     mealplan_note?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ShoppingListRecipe
+     */
+    mealplan_from_date?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ShoppingListRecipe
+     */
+    mealplan_type?: string;
 }
 /**
  * 
@@ -4262,6 +4281,18 @@ export interface ShoppingListRecipeMealplan {
      * @memberof ShoppingListRecipeMealplan
      */
     mealplan_note?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ShoppingListRecipeMealplan
+     */
+    mealplan_from_date?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ShoppingListRecipeMealplan
+     */
+    mealplan_type?: string;
 }
 /**
  * 
@@ -4311,6 +4342,18 @@ export interface ShoppingListRecipes {
      * @memberof ShoppingListRecipes
      */
     mealplan_note?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ShoppingListRecipes
+     */
+    mealplan_from_date?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ShoppingListRecipes
+     */
+    mealplan_type?: string;
 }
 /**
  * 
@@ -5460,6 +5503,39 @@ export interface ViewLog {
  */
 export const ApiApiAxiosParamCreator = function (configuration?: Configuration) {
     return {
+        /**
+         * 
+         * @param {ShoppingListEntryBulk} [shoppingListEntryBulk] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        bulkShoppingListEntry: async (shoppingListEntryBulk?: ShoppingListEntryBulk, options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/shopping-list-entry/bulk/`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(shoppingListEntryBulk, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @param {AccessToken} [accessToken] 
@@ -9564,10 +9640,11 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
         },
         /**
          * 
+         * @param {string} [query] Query string matched against supermarket name.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listSupermarkets: async (options: any = {}): Promise<RequestArgs> => {
+        listSupermarkets: async (query?: string, options: any = {}): Promise<RequestArgs> => {
             const localVarPath = `/api/supermarket/`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -9580,6 +9657,10 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            if (query !== undefined) {
+                localVarQueryParameter['query'] = query;
+            }
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
@@ -9739,10 +9820,11 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
         },
         /**
          * 
+         * @param {string} [query] Query string matched against user-file name.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listUserFiles: async (options: any = {}): Promise<RequestArgs> => {
+        listUserFiles: async (query?: string, options: any = {}): Promise<RequestArgs> => {
             const localVarPath = `/api/user-file/`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -9755,6 +9837,10 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            if (query !== undefined) {
+                localVarQueryParameter['query'] = query;
+            }
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
@@ -14898,6 +14984,16 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
 export const ApiApiFp = function(configuration?: Configuration) {
     const localVarAxiosParamCreator = ApiApiAxiosParamCreator(configuration)
     return {
+        /**
+         * 
+         * @param {ShoppingListEntryBulk} [shoppingListEntryBulk] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async bulkShoppingListEntry(shoppingListEntryBulk?: ShoppingListEntryBulk, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<ShoppingListEntryBulk>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.bulkShoppingListEntry(shoppingListEntryBulk, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @param {AccessToken} [accessToken] 
@@ -16112,11 +16208,12 @@ export const ApiApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
+         * @param {string} [query] Query string matched against supermarket name.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listSupermarkets(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<Supermarket>>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.listSupermarkets(options);
+        async listSupermarkets(query?: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<Supermarket>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listSupermarkets(query, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
         /**
@@ -16163,11 +16260,12 @@ export const ApiApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
+         * @param {string} [query] Query string matched against user-file name.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listUserFiles(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<UserFile>>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.listUserFiles(options);
+        async listUserFiles(query?: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<UserFile>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listUserFiles(query, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
         /**
@@ -17701,6 +17799,15 @@ export const ApiApiFp = function(configuration?: Configuration) {
 export const ApiApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
     const localVarFp = ApiApiFp(configuration)
     return {
+        /**
+         * 
+         * @param {ShoppingListEntryBulk} [shoppingListEntryBulk] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        bulkShoppingListEntry(shoppingListEntryBulk?: ShoppingListEntryBulk, options?: any): AxiosPromise<ShoppingListEntryBulk> {
+            return localVarFp.bulkShoppingListEntry(shoppingListEntryBulk, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @param {AccessToken} [accessToken] 
@@ -18797,11 +18904,12 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         },
         /**
          * 
+         * @param {string} [query] Query string matched against supermarket name.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listSupermarkets(options?: any): AxiosPromise<Array<Supermarket>> {
-            return localVarFp.listSupermarkets(options).then((request) => request(axios, basePath));
+        listSupermarkets(query?: string, options?: any): AxiosPromise<Array<Supermarket>> {
+            return localVarFp.listSupermarkets(query, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -18843,11 +18951,12 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         },
         /**
          * 
+         * @param {string} [query] Query string matched against user-file name.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listUserFiles(options?: any): AxiosPromise<Array<UserFile>> {
-            return localVarFp.listUserFiles(options).then((request) => request(axios, basePath));
+        listUserFiles(query?: string, options?: any): AxiosPromise<Array<UserFile>> {
+            return localVarFp.listUserFiles(query, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -20238,6 +20347,17 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
  * @extends {BaseAPI}
  */
 export class ApiApi extends BaseAPI {
+    /**
+     * 
+     * @param {ShoppingListEntryBulk} [shoppingListEntryBulk] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public bulkShoppingListEntry(shoppingListEntryBulk?: ShoppingListEntryBulk, options?: any) {
+        return ApiApiFp(this.configuration).bulkShoppingListEntry(shoppingListEntryBulk, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @param {AccessToken} [accessToken] 
@@ -21570,12 +21690,13 @@ export class ApiApi extends BaseAPI {
 
     /**
      * 
+     * @param {string} [query] Query string matched against supermarket name.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof ApiApi
      */
-    public listSupermarkets(options?: any) {
-        return ApiApiFp(this.configuration).listSupermarkets(options).then((request) => request(this.axios, this.basePath));
+    public listSupermarkets(query?: string, options?: any) {
+        return ApiApiFp(this.configuration).listSupermarkets(query, options).then((request) => request(this.axios, this.basePath));
     }
 
     /**
@@ -21626,12 +21747,13 @@ export class ApiApi extends BaseAPI {
 
     /**
      * 
+     * @param {string} [query] Query string matched against user-file name.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof ApiApi
      */
-    public listUserFiles(options?: any) {
-        return ApiApiFp(this.configuration).listUserFiles(options).then((request) => request(this.axios, this.basePath));
+    public listUserFiles(query?: string, options?: any) {
+        return ApiApiFp(this.configuration).listUserFiles(query, options).then((request) => request(this.axios, this.basePath));
     }
 
     /**

From 6aa2aa42c73754cb33e00872e09770b30803db12 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sat, 10 Feb 2024 08:56:15 +0100
Subject: [PATCH 93/95] added more editing capabilities to line item modal

---
 vue/src/components/ShoppingLineItem.vue | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index dbc9c2fd..b11f2ce7 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -91,17 +91,29 @@
 
                             </div>
                             <b-button variant="outline-danger"
-                                      @click="detail_modal_visible = false; useShoppingListStore().deleteObject(e)"><i
+                                      @click="useShoppingListStore().deleteObject(e)"><i
                                 class="fas fa-trash"></i></b-button>
                         </b-button-group>
 
+                        <generic-multiselect
+                            class="mt-1"
+                            v-if="e.recipe_mealplan === null"
+                            :initial_single_selection="e.unit"
+                            :model="Models.UNIT"
+                            :multiple="false"
+                            @change="e.unit = $event.val; useShoppingListStore().updateObject(e)"
+                        >
+                        </generic-multiselect>
+
                         <number-scaler-component :number="e.amount"
                                                  @change="e.amount = $event; useShoppingListStore().updateObject(e)"
                                                  v-if="e.recipe_mealplan === null"></number-scaler-component>
                         <hr class="m-2"/>
                     </b-col>
+
                 </b-row>
 
+                <b-button variant="success" block @click="useShoppingListStore().createObject({ amount: 0, unit: null, food: food, })"> {{ $t("Add") }}</b-button>
                 <b-button variant="warning" block @click="detail_modal_visible = false; setFoodIgnoredAndChecked(food)"> {{ $t("Ignore_Shopping") }}</b-button>
                 <b-button variant="danger" block class="mt-2"
                           @click="detail_modal_visible = false;useShoppingListStore().deleteEntries(entries)">
@@ -131,6 +143,7 @@ import {ApiApiFactory} from "@/utils/openapi/api";
 import {useUserPreferenceStore} from "@/stores/UserPreferenceStore";
 import NumberScalerComponent from "@/components/NumberScalerComponent.vue";
 import GenericModalForm from "@/components/Modals/GenericModalForm.vue";
+import GenericMultiselect from "@/components/GenericMultiselect.vue";
 
 
 Vue.use(BootstrapVue)
@@ -138,7 +151,7 @@ Vue.use(BootstrapVue)
 export default {
     name: "ShoppingLineItem",
     mixins: [ApiMixin, FormatMixin],
-    components: {GenericModalForm, NumberScalerComponent},
+    components: {GenericMultiselect, GenericModalForm, NumberScalerComponent},
     props: {
         entries: {type: Object,},
     },

From 03c775d1cc9540e04ec6714553363125a267b6a8 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sat, 10 Feb 2024 09:01:21 +0100
Subject: [PATCH 94/95] added merge capabilities to supermarket category

---
 cookbook/views/api.py        |  2 +-
 vue/src/utils/models.js      |  1 +
 vue/src/utils/openapi/api.ts | 77 ++++++++++++++++++++++++++++++++++++
 3 files changed, 79 insertions(+), 1 deletion(-)

diff --git a/cookbook/views/api.py b/cookbook/views/api.py
index fa16688a..e4c91b2b 100644
--- a/cookbook/views/api.py
+++ b/cookbook/views/api.py
@@ -492,7 +492,7 @@ class SupermarketViewSet(viewsets.ModelViewSet, StandardFilterMixin):
         return super().get_queryset()
 
 
-class SupermarketCategoryViewSet(viewsets.ModelViewSet, FuzzyFilterMixin):
+class SupermarketCategoryViewSet(viewsets.ModelViewSet, FuzzyFilterMixin, MergeMixin):
     queryset = SupermarketCategory.objects
     model = SupermarketCategory
     serializer_class = SupermarketCategorySerializer
diff --git a/vue/src/utils/models.js b/vue/src/utils/models.js
index 9b1e544d..8953b76c 100644
--- a/vue/src/utils/models.js
+++ b/vue/src/utils/models.js
@@ -408,6 +408,7 @@ export class Models {
     static SHOPPING_CATEGORY = {
         name: "Shopping_Category",
         apiName: "SupermarketCategory",
+        merge: true,
         create: {
             params: [["name", "description"]],
             form: {
diff --git a/vue/src/utils/openapi/api.ts b/vue/src/utils/openapi/api.ts
index a623c8e0..a7eceb1e 100644
--- a/vue/src/utils/openapi/api.ts
+++ b/vue/src/utils/openapi/api.ts
@@ -10099,6 +10099,47 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this supermarket category.
+         * @param {string} target 
+         * @param {SupermarketCategory} [supermarketCategory] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        mergeSupermarketCategory: async (id: string, target: string, supermarketCategory?: SupermarketCategory, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('mergeSupermarketCategory', 'id', id)
+            // verify required parameter 'target' is not null or undefined
+            assertParamExists('mergeSupermarketCategory', 'target', target)
+            const localVarPath = `/api/supermarket-category/{id}/merge/{target}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)))
+                .replace(`{${"target"}}`, encodeURIComponent(String(target)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(supermarketCategory, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this unit.
@@ -16341,6 +16382,18 @@ export const ApiApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.mergeKeyword(id, target, keyword, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this supermarket category.
+         * @param {string} target 
+         * @param {SupermarketCategory} [supermarketCategory] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async mergeSupermarketCategory(id: string, target: string, supermarketCategory?: SupermarketCategory, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<SupermarketCategory>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.mergeSupermarketCategory(id, target, supermarketCategory, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this unit.
@@ -19024,6 +19077,17 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         mergeKeyword(id: string, target: string, keyword?: Keyword, options?: any): AxiosPromise<Keyword> {
             return localVarFp.mergeKeyword(id, target, keyword, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this supermarket category.
+         * @param {string} target 
+         * @param {SupermarketCategory} [supermarketCategory] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        mergeSupermarketCategory(id: string, target: string, supermarketCategory?: SupermarketCategory, options?: any): AxiosPromise<SupermarketCategory> {
+            return localVarFp.mergeSupermarketCategory(id, target, supermarketCategory, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this unit.
@@ -21836,6 +21900,19 @@ export class ApiApi extends BaseAPI {
         return ApiApiFp(this.configuration).mergeKeyword(id, target, keyword, options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this supermarket category.
+     * @param {string} target 
+     * @param {SupermarketCategory} [supermarketCategory] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public mergeSupermarketCategory(id: string, target: string, supermarketCategory?: SupermarketCategory, options?: any) {
+        return ApiApiFp(this.configuration).mergeSupermarketCategory(id, target, supermarketCategory, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @param {string} id A unique integer value identifying this unit.

From fb8e04fee57fc2edf7009179ec1c6d435581b03d Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sat, 10 Feb 2024 09:07:03 +0100
Subject: [PATCH 95/95] swipe test view

---
 vue/src/apps/TestView/TestView.vue | 93 +++++++++++++++++++++++++-----
 1 file changed, 78 insertions(+), 15 deletions(-)

diff --git a/vue/src/apps/TestView/TestView.vue b/vue/src/apps/TestView/TestView.vue
index d1faca5c..dcef3101 100644
--- a/vue/src/apps/TestView/TestView.vue
+++ b/vue/src/apps/TestView/TestView.vue
@@ -3,22 +3,44 @@
     <div id="app">
         <div>
 
-            <generic-multiselect
-                :model="Models.SHOPPING_CATEGORY"
-                :multiple="false"
-            ></generic-multiselect>
-            <generic-multiselect
-                :model="Models.SHOPPING_CATEGORY"
-                :multiple="false"
-            ></generic-multiselect>
-            <generic-multiselect
-                :model="Models.SHOPPING_CATEGORY"
-                :multiple="false"
-            ></generic-multiselect>
-            ----
+            <div class="swipe-container">
+                <div class="swipe-action bg-success">
+                    <i class="swipe-icon fa-fw fas fa-check"></i>
+                </div>
 
-            <markdown-editor-component></markdown-editor-component>
+                <b-button-group class="swipe-element">
 
+                    <div class="card flex-grow-1 btn-block p-2">
+                        <div class="d-flex">
+                            <div class="d-flex flex-column pr-2">
+                            <span>
+                            <span><i class="fas fa-check"></i> <b>100 g </b></span>
+                            <br/>
+                            </span>
+                                <span>
+                            <span><i class="fas fa-check"></i> <b>200 kg </b></span>
+                            <br/>
+                            </span>
+
+                            </div>
+                            <div class="d-flex  flex-column flex-grow-1 align-self-center">
+                                Erdbeeren <br/>
+                                <span><small class="text-muted">vabene111</small></span>
+                            </div>
+                        </div>
+
+
+                    </div>
+                    <b-button variant="success">
+                        <i class="d-print-none fa-fw fas fa-check"></i>
+                    </b-button>
+                </b-button-group>
+                <div class="swipe-action bg-primary justify-content-end">
+                    <i class="fa-fw fas fa-hourglass-half swipe-icon"></i>
+                </div>
+
+
+            </div>
         </div>
     </div>
 </template>
@@ -45,7 +67,7 @@ Vue.use(BootstrapVue)
 export default {
     name: "TestView",
     mixins: [ApiMixin],
-    components: {GenericMultiselect, MarkdownEditorComponent},
+    components: {},
     computed: {},
     data() {
         return {}
@@ -64,5 +86,46 @@ export default {
 </script>
 
 <style>
+.swipe-container {
+    display: flex;
+    overflow: auto;
+    overflow-x: scroll;
+    scroll-snap-type: x mandatory;
+}
 
+/* scrollbar should be hidden */
+.swipe-container::-webkit-scrollbar {
+    display: none;
+}
+
+.swipe-container {
+    scrollbar-width: none; /* For Firefox */
+}
+
+/* main element should always snap into view */
+.swipe-element {
+    scroll-snap-align: start;
+}
+
+.swipe-icon {
+    color: white;
+    position: sticky;
+    left: 16px;
+    right: 16px;
+}
+
+/* swipe-actions and element should be 100% wide */
+.swipe-action,
+.swipe-element {
+    min-width: 100%;
+}
+
+.swipe-action {
+    display: flex;
+    align-items: center;
+}
+
+.right {
+    justify-content: flex-end;
+}
 </style>