From 9a572cf3cb7b0b194139b95516989ac3ababe863 Mon Sep 17 00:00:00 2001
From: Iris Olfermann <iris.olfermann@aoe.com>
Date: Mon, 26 Aug 2024 13:43:38 +0200
Subject: [PATCH] enabled deleting of events and updated the frontend to always
 show two empty boxes for events

---
 .../Controller/MealAdminController.php         | 18 ++++++++++++------
 src/Resources/src/components/menu/MenuDay.vue  |  7 ++-----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/Mealz/MealBundle/Controller/MealAdminController.php b/src/Mealz/MealBundle/Controller/MealAdminController.php
index eaca69968..2ee7d93de 100644
--- a/src/Mealz/MealBundle/Controller/MealAdminController.php
+++ b/src/Mealz/MealBundle/Controller/MealAdminController.php
@@ -304,12 +304,18 @@ private function handleEventArr(array $eventArr, Day $day): void{
 
     private function addEvent(array $event, Day $dayEntity){
         $this->logger->info('EventId: '. $event['eventId']. ', name: '. $event['eventSlug']);
-        $eventEntity = $this->mealAdminHelper->findEvent($event['eventId']);
-        $eventExistsForDayAlready = $this->mealAdminHelper->checkIfEventExistsForDay($event['eventId'], $dayEntity);
-        if(!$eventExistsForDayAlready){
-            $this->logger->info('addEvent');
-            $eventParticipationEntity = new EventParticipation($dayEntity, $eventEntity);
-            $dayEntity->addEvent($eventParticipationEntity);
+        if(!isset($event['eventId'])){
+            $this->logger->info('Event wird gelöscht');
+        } else{
+            $eventEntity = $this->mealAdminHelper->findEvent($event['eventId']);
+            $eventExistsForDayAlready = $this->mealAdminHelper->checkIfEventExistsForDay($event['eventId'], $dayEntity);
+            if(!$eventExistsForDayAlready){
+                $this->logger->info('addEvent');
+                $eventParticipationEntity = new EventParticipation($dayEntity, $eventEntity);
+                $dayEntity->addEvent($eventParticipationEntity);
+            } else{
+                throw new Exception('Meal exists for day already');
+            }
         }
     }
 
diff --git a/src/Resources/src/components/menu/MenuDay.vue b/src/Resources/src/components/menu/MenuDay.vue
index 435945662..96e65e93e 100644
--- a/src/Resources/src/components/menu/MenuDay.vue
+++ b/src/Resources/src/components/menu/MenuDay.vue
@@ -1,11 +1,9 @@
 <template>
   <div
-    class="day-shadow group grid grid-cols-[24px_minmax(0,1fr)_58px] rounded-lg border-0 border-none bg-white text-center align-middle sm:grid-cols-[24px_minmax(0,1fr)_72px]"
-    :class="[selectedEventOne ? 'grid-rows-4' : 'grid-rows-3']"
+    class="day-shadow group grid grid-cols-[24px_minmax(0,1fr)_58px]  grid-rows-4 rounded-lg border-0 border-none bg-white text-center align-middle sm:grid-cols-[24px_minmax(0,1fr)_72px]"
   >
     <div
-      class="col-start-1 row-start-1 grid w-[24px] grid-rows-[24px_minmax(0,1fr)_24px] justify-center rounded-l-lg bg-primary-2 py-1"
-      :class="[selectedEventOne ? 'row-span-4' : 'row-span-3']"
+      class="col-start-1 row-span-4 row-start-1 grid w-[24px] grid-rows-[24px_minmax(0,1fr)_24px] justify-center rounded-l-lg bg-primary-2 py-1"
     >
       <Popover
         :translate-x-min="'0%'"
@@ -50,7 +48,6 @@
       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"
     />