diff --git a/vue3/src/components/dialogs/ShoppingLineItemDialog.vue b/vue3/src/components/dialogs/ShoppingLineItemDialog.vue index 3b82c3709..d6f2e3c84 100644 --- a/vue3/src/components/dialogs/ShoppingLineItemDialog.vue +++ b/vue3/src/components/dialogs/ShoppingLineItemDialog.vue @@ -80,7 +80,7 @@ {{ $t('PostponedUntil') }} {{ DateTime.fromJSDate(e.delayUntil!).toLocaleString(DateTime.DATETIME_SHORT) }} - {{sl.name}} + @@ -139,6 +139,7 @@ import ModelEditDialog from "@/components/dialogs/ModelEditDialog.vue"; import {useShoppingStore} from "@/stores/ShoppingStore"; import {isDelayed, isShoppingListFoodDelayed} from "@/utils/logic_utils"; import {ErrorMessageType, PreparedMessage, useMessageStore} from "@/stores/MessageStore"; +import ShoppingListsBar from "@/components/display/ShoppingListsBar.vue"; const {mobile} = useDisplay() diff --git a/vue3/src/components/display/ShoppingLineItem.vue b/vue3/src/components/display/ShoppingLineItem.vue index 327a229de..30c5428b1 100644 --- a/vue3/src/components/display/ShoppingLineItem.vue +++ b/vue3/src/components/display/ShoppingLineItem.vue @@ -62,6 +62,7 @@ import {IShoppingListFood, ShoppingLineAmount} from "@/types/Shopping"; import {isDelayed, isEntryVisible, isShoppingListFoodDelayed, isShoppingListFoodVisible} from "@/utils/logic_utils"; import ShoppingLineItemDialog from "@/components/dialogs/ShoppingLineItemDialog.vue"; import {pluralString} from "@/utils/model_utils.ts"; +import ShoppingListsBar from "@/components/display/ShoppingListsBar.vue"; const emit = defineEmits(['clicked']) diff --git a/vue3/src/components/display/ShoppingListView.vue b/vue3/src/components/display/ShoppingListView.vue index 88afeb773..47ed4c1ed 100644 --- a/vue3/src/components/display/ShoppingListView.vue +++ b/vue3/src/components/display/ShoppingListView.vue @@ -79,15 +79,37 @@ + + + + + + + + - - - {{ s.name }} - + + + + + {{useUserPreferenceStore().deviceSettings.shopping_selected_supermarket.name}} + + {{ $t('Supermarket') }} + + + + + {{ s.name }} + + + + + + - + @@ -265,6 +287,7 @@ import {onBeforeRouteLeave} from "vue-router"; import {isShoppingCategoryVisible} from "@/utils/logic_utils.ts"; import ShoppingExportDialog from "@/components/dialogs/ShoppingExportDialog.vue"; import AddToShoppingDialog from "@/components/dialogs/AddToShoppingDialog.vue"; +import {TSupermarket} from "@/types/Models.ts"; const {t} = useI18n() diff --git a/vue3/src/components/display/ShoppingListsBar.vue b/vue3/src/components/display/ShoppingListsBar.vue new file mode 100644 index 000000000..de1ce71a8 --- /dev/null +++ b/vue3/src/components/display/ShoppingListsBar.vue @@ -0,0 +1,27 @@ + + + + + + {{ shoppingList.name }} + + + + + + + +