Skip to content

Commit

Permalink
Revert "added second event to the edit week site in the frontend, sec…
Browse files Browse the repository at this point in the history
…ond event input opens when you input a first one"

This reverts commit 92f5c7a.
  • Loading branch information
IrisOlfermann committed Sep 24, 2024
1 parent 92f5c7a commit ea59a70
Showing 1 changed file with 53 additions and 14 deletions.
67 changes: 53 additions & 14 deletions src/Resources/src/components/menu/MenuDay.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,7 @@
v-model="selectedEventOne"
class="col-start-2 row-span-1 row-start-3 border-b border-t-[3px] px-2 py-[12px] md:px-4"
/>

<EventInput
v-if="selectedEventOne"
v-model="selectedEventTwo"
class="col-start-2 row-span-1 row-start-4 px-2 py-[12px] md:px-4"
/>
Expand Down Expand Up @@ -168,18 +166,40 @@ watch(selectedDishTwo, () => {
});
watch(selectedEventOne, () => {
if (selectedEventOne.value !== null && selectedEventOne.value !== undefined) {
props.modelValue.event = selectedEventOne.value.id;
} else {
props.modelValue.event = null;
try {
const firstKey = Object.keys(props.modelValue.events)[0] ?? selectedEventOne.value?.id;
if (selectedEventOne.value) {
selectedDishes.value.events[firstKey] = {
eventId: selectedEventOne.value.id,
eventSlug: selectedEventOne.value.slug,
eventTitle: selectedEventOne.value.title,
isPublic: selectedEventOne.value.public
};
} else if (firstKey) {
selectedDishes.value.events[firstKey].eventId = null;
}
} catch (error) {
console.error('Fehler: ', error);
}
});
watch(selectedEventTwo, () => {
if (selectedEventTwo.value !== null && selectedEventTwo.value !== undefined) {
props.modelValue.event = selectedEventTwo.value.id;
} else {
props.modelValue.event = null;
try {
const secondKey = Object.keys(props.modelValue.events)[1] ?? selectedEventTwo.value?.id;
if (selectedEventTwo.value) {
selectedDishes.value.events[secondKey] = {
eventId: selectedEventTwo.value.id,
eventSlug: selectedEventTwo.value.slug,
eventTitle: selectedEventTwo.value.title,
isPublic: selectedEventTwo.value.public
};
} else if (secondKey) {
selectedDishes.value.events[secondKey].eventId = null;
}
} catch (error) {
console.error('Fehler: ', error);
}
});
Expand All @@ -196,10 +216,29 @@ onMounted(() => {
.filter((slug) => slug !== null) as string[]
);
// set Event from modelValue to be the initial value of the selectedEvent
selectedEventOne.value = getEventById(props.modelValue.event);
// set Event from modelValue to be the initial value of the selectedEvent
selectedEventTwo.value = getEventById(props.modelValue.event);
try {
const firstKey = Object.keys(props.modelValue.events)[0];
const secondKey = Object.keys(props.modelValue.events)[1];
if (props.modelValue.events[firstKey]) {
selectedEventOne.value = {
id: props.modelValue.events[firstKey].eventId as number,
slug: props.modelValue.events[firstKey].eventSlug as string,
title: props.modelValue.events[firstKey].eventTitle as string,
public: props.modelValue.events[firstKey].isPublic as boolean
};
}
if (props.modelValue.events[secondKey]) {
selectedEventTwo.value = {
id: props.modelValue.events[secondKey].eventId as number,
slug: props.modelValue.events[secondKey].eventSlug as string,
title: props.modelValue.events[secondKey].eventTitle as string,
public: props.modelValue.events[secondKey].isPublic as boolean
};
}
} catch (error) {
console.error('Fehler beim Laden der Events: ', error);
}
});
Expand Down

0 comments on commit ea59a70

Please sign in to comment.