ran prettier

src/Mealz/MealBundle/Controller/ApiController.php

@@ -106,14 +106,6 @@ public function getDashboardData(ParticipationCountService $partCountSrv): JsonR
                     'isEnabled' => $day->isEnabled(),
                     'events' => $this->apiSrv->getEventParticipationsData($day, $profile),
                 ];
-                // $events = [];
-                // // if($day->getId() == 1111){
-                // //     var_dump($this->apiSrv->getEventParticipationData($day, $profile));
-                // // }
-                // foreach($day->getEvents() as $event){
-                //     $events = $this->setEventData($event, $events);
-                // }
-                // $response[$week->getId()]['days'][$day->getId()]['events'] = $events;
                 $this->addSlots($response[$week->getId()]['days'][$day->getId()]['slots'], $slots, $day, $activeParticipations);
                 /** @var Meal $meal */
                 foreach ($day->getMeals() as $meal) {
@@ -413,14 +405,4 @@ private function getDishData(Meal $meal): array
 
         return $collection;
     }
-    private function setEventData(EventParticipation $event, array $events): array
-    {
-        $events[$event->getId()] = [
-            'id' => $event->getId(),
-            'event' => $event->getEvent(),
-            'day' => $event->getDay()->getId(),
-            'participants' => $event->getParticipants(),
-        ];
-        return $events;
-    }
 }

src/Mealz/MealBundle/Tests/Controller/AbstractControllerTestCase.php

@@ -147,7 +147,7 @@ protected function createParticipant(Profile $profile, Meal $meal): Participant
     protected function createEventParticipation(Day $day, Event $event): EventParticipation
     {
         $eventParticipation = new EventParticipation($day, $event);
-        $day->setEvent($eventParticipation);
+        $day->addEvent($eventParticipation);
         $this->persistAndFlushAll([$eventParticipation, $day]);
 
         return $eventParticipation;

src/Resources/src/api/getDashboardData.ts

@@ -48,7 +48,7 @@ export type EventParticipation = {
 };
 
 export type Event = {
-    id : number;
+    id: number;
     title: string;
     slug: string;
     public: boolean;

src/Resources/src/api/getEventParticipants.ts

@@ -2,7 +2,7 @@ import useApi from './api';
 import { type IMessage } from '@/interfaces/IMessage';
 
 export default async function getEventParticipants(date: string, participationId: number) {
-    console.log('getEventParticipants '+ participationId);
+    console.log('getEventParticipants ' + participationId);
     const { error, response, request } = useApi<string[] | IMessage>(
         'GET',
         `api/events/participation/${date}/${participationId}`

src/Resources/src/components/dashboard/Day.vue

@@ -137,7 +137,7 @@ const date = computed(() => {
   return day.date.date.split(' ')[0];
 });
 const emptyDay = Object.keys(day?.meals ?? {}).length === 0;
-const isEventDay: boolean = day?.events !== undefined && Object.keys(day?.events).length >0;
+const isEventDay: boolean = day?.events !== undefined && Object.keys(day?.events).length > 0;
 const dateString = computed(() => {
   if (day) {
     return new Date(Date.parse(day.date.date)).toLocaleDateString(locale.value, {

src/Resources/src/components/dashboard/EventData.vue

@@ -1,8 +1,6 @@
 <template>
   <div class="grid w-full grid-cols-1 grid-rows-[repeat(2,minmax(0,1fr))]">
-    <BannerSpacer
-      class="!h-fit"
-    >
+    <BannerSpacer class="!h-fit">
       <EventIcon
         class="w-[20px] self-center"
         :size="20"
@@ -18,17 +16,13 @@
     <div
       v-for="(event, key) in day.events"
       :key="key"
-      :class="
-      twoEvents
-      ? 'pb-2'
-      :'pb-0'
-      "
+      :class="twoEvents ? 'pb-2' : 'pb-0'"
     >
       <div class="flex w-full flex-col items-center px-[15px] min-[380px]:flex-row">
         <span
           class="inline-block grow self-start break-words text-[12px] font-bold leading-[20px] tracking-[0.5px] text-primary-1 max-[380px]:basis-9/12 min-[380px]:self-center min-[380px]:text-note"
         >
-        {{ getEventById(event?.eventId ?? -1)?.title }}
+          {{ getEventById(event?.eventId ?? -1)?.title }}
         </span>
         <div class="flex w-fit flex-row items-center gap-1 self-end justify-self-end max-[380px]:basis-3/12">
           <GuestButton
@@ -84,6 +78,7 @@ const twoEvents: boolean = props.day?.events !== undefined && Object.keys(props.
 const { t } = useI18n();
 const { getEventById, joinEvent, leaveEvent } = useEvents();
 const { addLock, isLocked, removeLock } = useLockRequests();
+
 async function handleClick(event: EventParticipation) {
   if (isLocked(props.dayId) === true || isEventPast() === true) {
     return;
@@ -92,11 +87,11 @@ async function handleClick(event: EventParticipation) {
   if (event?.isParticipating === undefined || event?.isParticipating === false) {
     await joinEvent(props.day.date.date, event?.participationId);
     event.isParticipating = true;
-    event.participations = event.participations +1;
+    event.participations = event.participations + 1;
   } else {
-    await leaveEvent(props.day.date.date,event?.participationId);
+    await leaveEvent(props.day.date.date, event?.participationId);
     event.isParticipating = false;
-    event.participations = event.participations -1;
+    event.participations = event.participations - 1;
   }
   removeLock(props.dayId);
 }
@@ -108,4 +103,3 @@ function isEventPast() {
   return isPast;
 }
 </script>
-

src/Resources/src/stores/dashboardStore.ts

@@ -43,14 +43,14 @@ class DashboardStore extends Store<Dashboard> {
     public getDayByEventParticipationId(eventParticipationId: number): Day | undefined {
         for (const week of Object.values(this.state.weeks)) {
             for (const day of Object.values(week.days)) {
-                for(const event of Object.values(day.events))
-                if (
-                    event.id !== null &&
-                    event.id !== undefined &&
-                    event.id === eventParticipationId
-                ) {
-                    return day;
-                }
+                for (const event of Object.values(day.events))
+                    if (
+                        event.eventId !== null &&
+                        event.eventId !== undefined &&
+                        event.eventId === eventParticipationId
+                    ) {
+                        return day;
+                    }
             }
         }
     }
@@ -109,14 +109,9 @@ class DashboardStore extends Store<Dashboard> {
 
     public updateEventParticipation(weekId: number, dayId: number, eventId: number, participations: number) {
         const day = this.getDay(weekId, dayId);
-            if (
-                day !== null &&
-                day !== undefined &&
-                day.events !== null &&
-                day.events[eventId] !== undefined
-            ) {
-                day.events[eventId].participations = participations;
-            }
+        if (day !== null && day !== undefined && day.events !== null && day.events[eventId] !== undefined) {
+            day.events[eventId].participations = participations;
+        }
     }
 
     public setIsParticipatingEvent(participationId: number, isParticipating: boolean) {

src/Resources/src/stores/eventsStore.ts

@@ -88,27 +88,27 @@ export function useEvents() {
         EventsState.error = '';
         EventsState.isLoading = false;
     }
-        /**
+    /**
      * Returns the event with the given slug from the EventsState
      * @param slug The slug of the event
      */
-        function getEventBySlug(slug: string) {
-            return EventsState.events.find((event) => event.slug === slug)!;
-        }
-        /**
-         * Returns the eventId for the passed slug
-         * @param slug The slug of the event
-         */
-        function getEventIdBySlug(slug: string) {
-            return EventsState.events.find((event) => event.slug === slug)!.id;
-        }
-        /**
-         * Returns the event with the given id from the EventsState
-         * @param eventId The id of the event
-         */
-        function getEventById(eventId: number){
-            return EventsState.events.find((event) => event.id === eventId);
-        }
+    function getEventBySlug(slug: string) {
+        return EventsState.events.find((event) => event.slug === slug)!;
+    }
+    /**
+     * Returns the eventId for the passed slug
+     * @param slug The slug of the event
+     */
+    function getEventIdBySlug(slug: string) {
+        return EventsState.events.find((event) => event.slug === slug)!.id;
+    }
+    /**
+     * Returns the event with the given id from the EventsState
+     * @param eventId The id of the event
+     */
+    function getEventById(eventId: number) {
+        return EventsState.events.find((event) => event.id === eventId);
+    }
 
     /**
      * Creates an event with the given title and public status
@@ -218,9 +218,9 @@ export function useEvents() {
     }
 
     async function getParticipantsForEvent(date: string, participationId: number) {
-        console.log('ParticipationId: '+participationId);
+        console.log('ParticipationId: ' + participationId);
         const { error, response } = await getEventParticipants(date, participationId);
-        participationId
+        participationId;
         if (error.value === true && isMessage(response.value) === true) {
             EventsState.error = (response.value as IMessage)?.message;
         } else if (error.value === true) {
@@ -239,7 +239,6 @@ export function useEvents() {
         filterStr.value = newFilter;
     }
 
-
     /**
      * Resets the EventsState. Should only be used for Testing
      */