Skip to content

Commit 9a572cf

Browse files
committed
enabled deleting of events and updated the frontend to always show two empty boxes for events
1 parent db1370c commit 9a572cf

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

src/Mealz/MealBundle/Controller/MealAdminController.php

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -304,12 +304,18 @@ private function handleEventArr(array $eventArr, Day $day): void{
304304

305305
private function addEvent(array $event, Day $dayEntity){
306306
$this->logger->info('EventId: '. $event['eventId']. ', name: '. $event['eventSlug']);
307-
$eventEntity = $this->mealAdminHelper->findEvent($event['eventId']);
308-
$eventExistsForDayAlready = $this->mealAdminHelper->checkIfEventExistsForDay($event['eventId'], $dayEntity);
309-
if(!$eventExistsForDayAlready){
310-
$this->logger->info('addEvent');
311-
$eventParticipationEntity = new EventParticipation($dayEntity, $eventEntity);
312-
$dayEntity->addEvent($eventParticipationEntity);
307+
if(!isset($event['eventId'])){
308+
$this->logger->info('Event wird gelöscht');
309+
} else{
310+
$eventEntity = $this->mealAdminHelper->findEvent($event['eventId']);
311+
$eventExistsForDayAlready = $this->mealAdminHelper->checkIfEventExistsForDay($event['eventId'], $dayEntity);
312+
if(!$eventExistsForDayAlready){
313+
$this->logger->info('addEvent');
314+
$eventParticipationEntity = new EventParticipation($dayEntity, $eventEntity);
315+
$dayEntity->addEvent($eventParticipationEntity);
316+
} else{
317+
throw new Exception('Meal exists for day already');
318+
}
313319
}
314320
}
315321

src/Resources/src/components/menu/MenuDay.vue

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<template>
22
<div
3-
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]"
4-
:class="[selectedEventOne ? 'grid-rows-4' : 'grid-rows-3']"
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]"
54
>
65
<div
7-
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"
8-
:class="[selectedEventOne ? 'row-span-4' : 'row-span-3']"
6+
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"
97
>
108
<Popover
119
:translate-x-min="'0%'"
@@ -50,7 +48,6 @@
5048
class="col-start-2 row-span-1 row-start-3 border-b border-t-[3px] px-2 py-[12px] md:px-4"
5149
/>
5250
<EventInput
53-
v-if="selectedEventOne"
5451
v-model="selectedEventTwo"
5552
class="col-start-2 row-span-1 row-start-4 px-2 py-[12px] md:px-4"
5653
/>

0 commit comments

Comments
 (0)