From ad609b2269841ada782dcc8c16e9a62c8c338b4e Mon Sep 17 00:00:00 2001 From: Felix Ruf Date: Wed, 21 Aug 2024 09:22:41 +0200 Subject: [PATCH 1/2] fixed a bug that prevented booked Guest meals to be displayed in the participant list --- .../src/components/menuParticipants/MenuTableData.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Resources/src/components/menuParticipants/MenuTableData.vue b/src/Resources/src/components/menuParticipants/MenuTableData.vue index 796fd7248..010d66378 100644 --- a/src/Resources/src/components/menuParticipants/MenuTableData.vue +++ b/src/Resources/src/components/menuParticipants/MenuTableData.vue @@ -71,9 +71,13 @@ const isCombi = computed(() => props.meal.dish === 'combined-dish'); const bookedCombi = computed(() => { const dishId = mealIdToDishIdDict.get(props.meal.id); if (dishId === undefined || dishId === null) return undefined; - return hasParticipantBookedCombiDish(props.dayId, props.participant, dishId); + return hasParticipantBookedCombiDish(props.dayId, cleanParticipantName(props.participant), dishId); }); -const bookedMeal = computed(() => hasParticipantBookedMeal(props.dayId, props.participant, props.meal.id)); +const bookedMeal = computed(() => hasParticipantBookedMeal(props.dayId, cleanParticipantName(props.participant), props.meal.id)); + +function cleanParticipantName(name: string): string { + return name.replace(/\s\(gast\)\s*/i, ' (Guest)'); +} function handleClick() { if (props.edit === true && bookedMeal.value === true) { From 53e339116ecadb47884a2d2953063a88885f4f46 Mon Sep 17 00:00:00 2001 From: Felix Ruf Date: Wed, 21 Aug 2024 09:23:06 +0200 Subject: [PATCH 2/2] fixed formatting --- .../src/components/menuParticipants/MenuTableData.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Resources/src/components/menuParticipants/MenuTableData.vue b/src/Resources/src/components/menuParticipants/MenuTableData.vue index 010d66378..77351f162 100644 --- a/src/Resources/src/components/menuParticipants/MenuTableData.vue +++ b/src/Resources/src/components/menuParticipants/MenuTableData.vue @@ -73,7 +73,9 @@ const bookedCombi = computed(() => { if (dishId === undefined || dishId === null) return undefined; return hasParticipantBookedCombiDish(props.dayId, cleanParticipantName(props.participant), dishId); }); -const bookedMeal = computed(() => hasParticipantBookedMeal(props.dayId, cleanParticipantName(props.participant), props.meal.id)); +const bookedMeal = computed(() => + hasParticipantBookedMeal(props.dayId, cleanParticipantName(props.participant), props.meal.id) +); function cleanParticipantName(name: string): string { return name.replace(/\s\(gast\)\s*/i, ' (Guest)');