diff --git a/vue3/src/components/dialogs/ShoppingLineItemDialog.vue b/vue3/src/components/dialogs/ShoppingLineItemDialog.vue
new file mode 100644
index 000000000..b148fa99f
--- /dev/null
+++ b/vue3/src/components/dialogs/ShoppingLineItemDialog.vue
@@ -0,0 +1,94 @@
+
+
+
+
+
+
+
+ {{ $t('Choose_Category') }}
+
+
+
+
+
+
+ {{ $t('Postpone') }}
+
+
+
+
+
+ {{ $t('Ignore_Shopping') }}
+
+
+
+
+
+
+
+ {{ $t('Edit_Food') }}
+
+
+
+
+
+ {{ $t('Add') }}
+
+
+
+
+ {{ $t('Entries') }}
+
+
+
+
+ {{ e.amount }}
+ {{ e.unit.name }}
+
+ {{ e.food.name }}
+
+
+ {{ e.recipeMealplan.servings }} {{ $t('Servings') }}
+
+ {{ e.recipeMealplan.recipeName }}
+
+
+
+ {{ e.recipeMealplan.mealplanType }} {{ DateTime.fromJSDate(e.recipeMealplan.mealplanFromDate).toLocaleString(DateTime.DATE_SHORT) }}
+
+
+ {{ e.createdBy.displayName }} - {{ DateTime.fromJSDate(e.createdAt).toLocaleString(DateTime.DATETIME_SHORT) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/vue3/src/components/display/ShoppingLineItem.vue b/vue3/src/components/display/ShoppingLineItem.vue
index 3d6858dca..a2dbb4fa8 100644
--- a/vue3/src/components/display/ShoppingLineItem.vue
+++ b/vue3/src/components/display/ShoppingLineItem.vue
@@ -1,7 +1,6 @@
-
@@ -16,13 +15,14 @@
-
+
{{ a.amount }}
- {{ a.unit.name }}
+ {{ a.unit.name }}
+
@@ -60,14 +60,12 @@ import {ApiApi, Food, ShoppingListEntry} from '@/openapi'
import {ErrorMessageType, useMessageStore} from "@/stores/MessageStore";
import {ShoppingLineAmount} from "@/types/Shopping";
+const emit = defineEmits(['clicked'])
+
const props = defineProps({
- entries: {type: [] as PropType, required: true},
+ entries: {type: Array as PropType>, required: true},
})
-const detail_modal_visible = ref(false)
-const editing_food = ref({} as Food)
-
-
const itemContainerId = computed(() => {
let id = 'id_sli_'
for (let i in props.entries) {
@@ -125,6 +123,7 @@ const amounts = computed((): Map => {
unitAmounts.get(unit)!.amount += e.amount
} else {
unitAmounts.set(unit, {
+ key: e.food?.id!,
amount: e.amount,
unit: e.unit,
checked: e.checked,
diff --git a/vue3/src/components/display/ShoppingListView.vue b/vue3/src/components/display/ShoppingListView.vue
index f646fd3f5..86416176f 100644
--- a/vue3/src/components/display/ShoppingListView.vue
+++ b/vue3/src/components/display/ShoppingListView.vue
@@ -1,5 +1,5 @@
-
+
{{ $t('Shopping_list') }}
{{ $t('Recipes') }}
@@ -30,8 +30,8 @@
{{ category.name }}
-
-
+
+ {shoppingLineItemDialog = true; shoppingLineItemDialogFood = value;}">
@@ -46,18 +46,22 @@
{{ $t('Recipes') }}
- {{$t('Add_to_Shopping')}}
+ {{ $t('Add_to_Shopping') }}
- {{$t('Recipes')}}
+ {{ $t('Recipes') }}
-
+
+ {{r}}
+
+
+