Merge pull request #432 from AOEpeople/bugfix/fixing-several-bugs

Bugfix/fixing several bugs

config/packages/security.yaml

@@ -78,6 +78,7 @@ security:
         - { path: ^/api/print/participations, roles: [IS_AUTHENTICATED_ANONYMOUSLY] }
         - { path: ^/api/dashboard, roles: [IS_AUTHENTICATED_ANONYMOUSLY] }
         - { path: ^/api/guest-invitation, roles: [IS_AUTHENTICATED_ANONYMOUSLY] }
+        - { path: ^/api/guest/meal/participation, roles: [IS_AUTHENTICATED_ANONYMOUSLY] }
         - { path: ^/api/environmentals, roles: [IS_AUTHENTICATED_ANONYMOUSLY] }
         - { path: ^/api/user, roles: [IS_AUTHENTICATED_ANONYMOUSLY] }
         - { path: ^/api/event/invitation/\S*, roles: [IS_AUTHENTICATED_ANONYMOUSLY] }

src/Mealz/MealBundle/Controller/DishController.php

@@ -5,6 +5,7 @@
 namespace App\Mealz\MealBundle\Controller;
 
 use App\Mealz\MealBundle\Entity\Dish;
+use App\Mealz\MealBundle\Entity\DishCollection;
 use App\Mealz\MealBundle\Repository\CategoryRepository;
 use App\Mealz\MealBundle\Repository\CategoryRepositoryInterface;
 use App\Mealz\MealBundle\Repository\DishRepository;
@@ -60,6 +61,17 @@ public function getDishes(): JsonResponse
             $dishes[] = $combiDish[0];
         }
 
+        /** @var Dish $dish */
+        foreach ($dishes as $dish) {
+            if (count($dish->getVariations()) > 0) {
+                $variations = array_values(array_filter(
+                    $dish->getVariations()->toArray(),
+                    fn ($variation) => $variation->isEnabled()
+                ));
+                $dish->setVariations(new DishCollection($variations));
+            }
+        }
+
         return new JsonResponse($dishes, 200);
     }
 

src/Mealz/MealBundle/Controller/MealAdminController.php

@@ -197,7 +197,11 @@ public function count(): JsonResponse
 
     private function setParticipationLimit(Meal $mealEntity, $meal): void
     {
-        if (true === isset($meal['participationLimit']) && 0 < $meal['participationLimit']) {
+        if (
+            true === isset($meal['participationLimit']) &&
+            0 < $meal['participationLimit'] &&
+            count($mealEntity->getParticipants()) < $meal['participationLimit']
+        ) {
             $mealEntity->setParticipationLimit($meal['participationLimit']);
         } else {
             $mealEntity->setParticipationLimit(0);

src/Resources/src/App.vue

@@ -8,7 +8,7 @@
       <vue3-progress-bar />
     </div>
     <DebtPopup />
-    <Content class="relative z-[2] grow-[1]" />
+    <Content class="relative z-[2] grow-[1] pb-12" />
     <Footer
       v-if="!showParticipations"
       class="relative z-[1] mt-auto"

src/Resources/src/components/categories/CategoriesCreationPanel.vue

@@ -46,6 +46,8 @@ const props = withDefaults(
   }
 );
 
+const emit = defineEmits(['closePanel']);
+
 const titleDeInput = ref(props.titleDe);
 const titleEnInput = ref(props.titleEn);
 const required = ref(false);
@@ -66,5 +68,6 @@ async function onSubmit() {
     };
     await createCategory(category);
   }
+  emit('closePanel');
 }
 </script>

src/Resources/src/components/categories/CategoriesHeader.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="grid grid-rows-2 items-center xl:my-[42px] xl:grid-cols-2">
+  <div class="grid grid-rows-2 items-center xl:my-[42px] xl:grid-cols-2 xl:grid-rows-1">
     <h2 class="text-center xl:justify-self-start">
       {{ t('category.header') }}
     </h2>

src/Resources/src/components/costs/CashPaymentPanel.vue

@@ -32,10 +32,13 @@ const props = defineProps<{
   username: string;
 }>();
 
+const emit = defineEmits(['closePanel']);
+
 async function onSubmit() {
   const parsedAmount = parseFloat(amount.value);
   if (parsedAmount > 0) {
     await sendCashPayment(props.username, parsedAmount);
   }
+  emit('closePanel');
 }
 </script>

src/Resources/src/components/costs/CostsTable.vue

@@ -2,14 +2,16 @@
   <Table
     :labels="columnNames"
     :header-text-position="'lfr'"
+    :add-styles="'first:sticky first:left-0 first:bg-[#f4f7f9] last:pl-4'"
+    :overflow-table="true"
   >
     <LazyTableRow
       v-for="[username, costs] in filteredUsers"
       :key="username"
       :min-height="40"
       class="max-h-[62px] border-b-2 border-gray-200 text-right text-[12px] xl:text-[18px]"
     >
-      <td class="py-2 text-left">
+      <td class="sticky left-0 bg-[#f4f7f9] py-2 text-left">
         {{ `${costs.name}, ${costs.firstName}` }}
       </td>
       <td>
@@ -24,7 +26,7 @@
       <td>
         {{ new Intl.NumberFormat(locale, { style: 'currency', currency: 'EUR' }).format(costs.costs['total']) }}
       </td>
-      <td>
+      <td class="min-w-[100px] pl-2">
         <CostsTableActions
           :username="username"
           :balance="costs.costs['total']"

src/Resources/src/components/costs/CostsTableActions.vue

@@ -1,11 +1,16 @@
 <template>
   <div class="ml-auto grid h-full w-fit grid-cols-3 justify-end gap-2">
     <ActionButton
+      class="min-w-[32px]"
       :action="Action.HIDE"
       :btn-text="''"
       @click="hideUser(username)"
     />
-    <Popover :translate-x-min="'-50%'">
+    <Popover
+      :overflow-hidden="false"
+      :translate-x-min="'-5%'"
+      :popup-styles="'right-0'"
+    >
       <template #button="{ open }">
         <ActionButton
           :action="Action.CREATE"
@@ -21,6 +26,7 @@
     </Popover>
     <ActionButton
       v-if="balance > 0"
+      class="min-w-[32px]"
       :action="Action.BALANCE"
       :btn-text="''"
       @click="settlementOpen = true"

src/Resources/src/components/dashboard/MealCheckbox.vue

@@ -123,7 +123,10 @@ const checkboxCSS = computed(() => {
 
 async function handle() {
   // Meal is not locked
-  if (mealOrVariation.value.isLocked === false && isLocked(String(props.dayID)) === false) {
+  if (
+    (mealOrVariation.value.isLocked === false || mealOrVariation.value.mealState === 'tradeable') &&
+    isLocked(String(props.dayID)) === false
+  ) {
     addLock(String(props.dayID));
     // User is participating
     if (isParticipating.value) {
@@ -138,6 +141,7 @@ async function handle() {
     }
     removeLock(String(props.dayID));
   } else if (isLocked(String(props.dayID)) === false) {
+    console.log(`Attemting accept offer: mealstate: ${mealOrVariation.value.mealState}`);
     addLock(String(props.dayID));
     if (mealOrVariation.value.mealState === 'offerable') {
       addLock(String(props.dayID));

src/Resources/src/components/dishes/DishActions.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="flex flex-row content-center items-center justify-end justify-items-end sm:gap-4">
     <Popover
-      :breakpoint-width="564"
-      :translate-x-min="'-60%'"
-      :translate-x-max="'-50%'"
+      :popup-styles="'right-0'"
+      :translate-x-min="'-5%'"
+      :translate-x-max="'-5%'"
     >
       <template #button="{ open }">
         <ActionButton
@@ -13,13 +13,16 @@
         />
       </template>
       <template #panel="{ close }">
-        <DishVariationCreationPanel :parent-slug="dish.slug" />
+        <DishVariationCreationPanel
+          :parent-slug="dish.slug"
+          @close-panel="close()"
+        />
       </template>
     </Popover>
     <Popover
-      :breakpoint-width="564"
-      :translate-x-min="'-75%'"
-      :translate-x-max="'-80%'"
+      :popup-styles="'right-0'"
+      :translate-x-min="'-5%'"
+      :translate-x-max="'-5%'"
     >
       <template #button="{ open }">
         <ActionButton
@@ -38,6 +41,7 @@
           :dish-id="dish.id"
           :category-id="dish.categoryId"
           :one-size-serving="dish.oneServingSize"
+          @close-panel="close()"
         />
       </template>
     </Popover>

src/Resources/src/components/dishes/DishTableRow.vue

@@ -5,7 +5,7 @@
   >
     <td
       colspan="1"
-      class="w-[50%] py-2"
+      class="sticky left-0 w-[50%] bg-[#f4f7f9] py-2"
     >
       <span class="text-[12px] xl:text-[18px]">
         {{ locale === 'en' ? dish.titleEn : dish.titleDe }}
@@ -38,7 +38,7 @@
   >
     <td
       colspan="1"
-      class="w-[50%] py-2 pl-4"
+      class="sticky left-0 w-[50%] bg-[#f4f7f9] py-2 pl-4"
     >
       <span class="text-[12px] xl:text-[18px]">
         {{ locale === 'en' ? variation.titleEn : variation.titleDe }}

src/Resources/src/components/dishes/DishVariationActions.vue

@@ -1,6 +1,10 @@
 <template>
   <div class="flex flex-row content-center items-center justify-end justify-items-end sm:gap-4">
-    <Popover>
+    <Popover
+      :popup-styles="'right-0'"
+      :translate-x-min="'-5%'"
+      :translate-x-max="'-5%'"
+    >
       <template #button="{ open }">
         <ActionButton
           :action="Action.EDIT"
@@ -15,6 +19,7 @@
           :title-en="variation.titleEn"
           :slug="variation.slug"
           :edit="true"
+          @close-panel="close()"
         />
       </template>
     </Popover>

src/Resources/src/components/dishes/DishVariationCreationPanel.vue

@@ -47,6 +47,8 @@ const props = withDefaults(
   }
 );
 
+const emit = defineEmits(['closePanel']);
+
 const titleDeInput = ref(props.titleDe);
 const titleEnInput = ref(props.titleEn);
 const required = ref(false);
@@ -57,8 +59,10 @@ async function onSubmit() {
     return;
   } else if (props.edit === true && typeof props.slug === 'string') {
     await updateDishVariation(props.slug, createDishVariationDtoObject());
+    emit('closePanel');
   } else if (props.edit === false) {
     await createDishVariation(createDishVariationDtoObject(), props.parentSlug);
+    emit('closePanel');
   }
 }
 

src/Resources/src/components/dishes/DishesCreationPanel.vue

@@ -91,6 +91,8 @@ const props = withDefaults(
   }
 );
 
+const emit = defineEmits(['closePanel']);
+
 onMounted(async () => {
   await fetchCategories();
 });
@@ -113,6 +115,7 @@ async function onSubmit() {
   } else {
     await createDish(createDishDtoObject());
   }
+  emit('closePanel');
 }
 
 function createDishDtoObject() {

src/Resources/src/components/dishes/DishesHeader.vue

@@ -17,7 +17,7 @@
         />
       </template>
       <template #panel="{ close }">
-        <DishesCreationPanel />
+        <DishesCreationPanel @close-panel="close()" />
       </template>
     </Popover>
     <DishesSearchBar class="row-span-1 row-start-3 md:col-start-1 md:row-start-2 md:justify-self-start" />

src/Resources/src/components/eventParticipation/EventPopup.vue

@@ -71,7 +71,7 @@ const props = withDefaults(
 );
 
 const showParticipations = ref(false);
-const participations = ref([]);
+const participations = ref<string[]>([]);
 const isLoading = ref(false);
 
 watch(showParticipations, async () => {

src/Resources/src/components/events/EventCreationPanel.vue

@@ -59,6 +59,8 @@ const props = withDefaults(
   }
 );
 
+const emit = defineEmits(['closePanel']);
+
 const eventTitle = ref(props.title);
 const isEventPublic = ref(props.isPublic);
 
@@ -68,8 +70,10 @@ async function onSubmit() {
   required.value = true;
   if (eventTitle.value !== '' && props.edit === false) {
     await createEvent(eventTitle.value, isEventPublic.value);
+    emit('closePanel');
   } else if (eventTitle.value !== '' && props.slug !== '') {
     await updateEvent(props.slug, eventTitle.value, isEventPublic.value);
+    emit('closePanel');
   }
 }
 </script>

src/Resources/src/components/events/EventsActions.vue

@@ -1,10 +1,6 @@
 <template>
   <div class="flex flex-row content-center items-center justify-end justify-items-end sm:gap-4">
-    <Popover
-      :breakpoint-width="564"
-      :translate-x-min="'-60%'"
-      :translate-x-max="'-50%'"
-    >
+    <Popover :translate-x-min="'-71%'">
       <template #button="{ open }">
         <ActionButton
           :action="Action.EDIT"
@@ -18,6 +14,7 @@
           :is-public="event.public"
           :edit="true"
           :slug="event.slug"
+          @close-panel="close()"
         />
       </template>
     </Popover>

src/Resources/src/components/events/EventsHeader.vue

@@ -16,7 +16,7 @@
         />
       </template>
       <template #panel="{ close }">
-        <EventCreationPanel />
+        <EventCreationPanel @close-panel="close()" />
       </template>
     </Popover>
     <InputLabel

src/Resources/src/components/finance/FinanceHeader.vue

@@ -1,7 +1,7 @@
 <template>
   <div
     v-if="showControls === true"
-    class="mb-4 flex items-center gap-5 align-middle"
+    class="mb-8 flex items-center gap-5 align-middle"
   >
     <VueDatePicker
       v-model="date"
@@ -13,9 +13,9 @@
     />
   </div>
   <div class="grid grid-rows-1 items-center xl:my-[24px] xl:grid-cols-2">
-    <h1 class="m-0 text-center xl:justify-self-start">
+    <h2 class="m-0 text-center max-[420px]:text-[24px] xl:justify-self-start">
       {{ dateRange }}
-    </h1>
+    </h2>
     <a
       v-if="showControls === true"
       class="cursor-pointer justify-self-end text-primary hover:text-secondary"