From d7b605be20cd8fa043d228becd00a9605ff851f7 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Wed, 6 Mar 2024 17:00:07 -0500
Subject: [PATCH 1/7] Group: Fix page to add user to group

---
 public/main/admin/add_users_to_usergroup.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/main/admin/add_users_to_usergroup.php b/public/main/admin/add_users_to_usergroup.php
index b7d9722755..ba1fdb589e 100644
--- a/public/main/admin/add_users_to_usergroup.php
+++ b/public/main/admin/add_users_to_usergroup.php
@@ -143,7 +143,7 @@ if (isset($_GET['action']) && 'export' === $_GET['action']) {
             ['UserName', 'ClassName'],
         ];
         foreach ($users as $user) {
-            $data[] = [$user['username'], $groupInfo['name']];
+            $data[] = [$user['username'], $groupInfo['title']];
         }
         $filename = 'export_user_class_'.api_get_local_time();
         Export::arrayToCsv($data, $filename);
@@ -345,7 +345,7 @@ echo Display::toolbarAction('add_users', [$actions]);
 echo '<div id="advanced_search_options" style="display:none">';
 $searchForm->display();
 echo '</div>';
-echo Display::page_header($tool_name.': '.$data['name']);
+echo Display::page_header($tool_name.': '.$data['title']);
 
 ?>
 <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if (!empty($_GET['add'])) {

From aadedea48b9226b687c6c50380f9ef74b81b1df3 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Wed, 6 Mar 2024 17:00:49 -0500
Subject: [PATCH 2/7] Calendar: Refactoring to separate function to load
 personal events

---
 .../Extension/CCalendarEventExtension.php     | 53 +++++++++-------
 src/CoreBundle/ServiceHelper/CidReqHelper.php | 60 +++++++++++++++++++
 2 files changed, 91 insertions(+), 22 deletions(-)
 create mode 100644 src/CoreBundle/ServiceHelper/CidReqHelper.php

diff --git a/src/CoreBundle/DataProvider/Extension/CCalendarEventExtension.php b/src/CoreBundle/DataProvider/Extension/CCalendarEventExtension.php
index 1464f97f4b..d87a9329b6 100644
--- a/src/CoreBundle/DataProvider/Extension/CCalendarEventExtension.php
+++ b/src/CoreBundle/DataProvider/Extension/CCalendarEventExtension.php
@@ -12,8 +12,11 @@ use ApiPlatform\Doctrine\Orm\Extension\QueryCollectionExtensionInterface;
 use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface;
 use ApiPlatform\Metadata\Operation;
 use Chamilo\CoreBundle\Entity\User;
+use Chamilo\CoreBundle\ServiceHelper\CidReqHelper;
+use Chamilo\CoreBundle\Settings\SettingsManager;
 use Chamilo\CourseBundle\Entity\CCalendarEvent;
 use Doctrine\ORM\QueryBuilder;
+use phpDocumentor\Reflection\Types\Integer;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Security\Core\Security;
 
@@ -23,7 +26,8 @@ final class CCalendarEventExtension implements QueryCollectionExtensionInterface
 
     public function __construct(
         private readonly Security $security,
-        private readonly RequestStack $requestStack
+        private readonly CidReqHelper $cidReqHelper,
+        private readonly SettingsManager $settingsManager,
     ) {}
 
     public function applyToCollection(
@@ -42,8 +46,19 @@ final class CCalendarEventExtension implements QueryCollectionExtensionInterface
             return;
         }
 
-        /** @var User $user */
+        $courseId = $this->cidReqHelper->getCourseId();
+        $sessionId = $this->cidReqHelper->getSessionId();
+        $groupId = $this->cidReqHelper->getGroupId();
+
+        /** @var ?User $user */
         $user = $this->security->getUser();
+
+        $inCourseBase = !empty($courseId);
+        $inSession = !empty($sessionId);
+        $inCourseSession = $inCourseBase && $inSession;
+
+        $inPersonalList = !$inCourseBase && !$inCourseSession;
+
         $alias = $qb->getRootAliases()[0];
 
         $qb
@@ -51,27 +66,21 @@ final class CCalendarEventExtension implements QueryCollectionExtensionInterface
             ->leftJoin('node.resourceLinks', 'resource_links')
         ;
 
-        $request = $this->requestStack->getCurrentRequest();
-        $courseId = $request->query->getInt('cid');
-        $sessionId = $request->query->getInt('sid');
-        $groupId = $request->query->getInt('gid');
-
-        $inCourseBase = !empty($courseId);
-        $inSession = !empty($sessionId);
-        $inCourseSession = $inCourseBase && $inSession;
-
-        $inPersonalList = !$inCourseBase && !$inCourseSession;
+        if ($inPersonalList && $user) {
+            $this->addPersonalCalendarConditions($qb, $user);
+        }
+    }
 
-        if ($inPersonalList) {
-            $qb
-                ->andWhere(
-                    $qb->expr()->orX(
-                        $qb->expr()->eq('resource_links.user', ':user'),
-                        $qb->expr()->eq('node.creator', ':user')
-                    )
+    private function addPersonalCalendarConditions(QueryBuilder $qb, User $user): void
+    {
+        $qb
+            ->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('resource_links.user', ':user'),
+                    $qb->expr()->eq('node.creator', ':user')
                 )
-                ->setParameter('user', $user->getId())
-            ;
-        }
+            )
+            ->setParameter('user', $user->getId())
+        ;
     }
 }
diff --git a/src/CoreBundle/ServiceHelper/CidReqHelper.php b/src/CoreBundle/ServiceHelper/CidReqHelper.php
new file mode 100644
index 0000000000..4218fd8c79
--- /dev/null
+++ b/src/CoreBundle/ServiceHelper/CidReqHelper.php
@@ -0,0 +1,60 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ServiceHelper;
+
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\EventListener\CourseListener;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
+
+/**
+ * @see CourseListener::onKernelRequest()
+ */
+class CidReqHelper
+{
+    public function __construct(
+        private readonly RequestStack $requestStack,
+    ) {
+    }
+
+    private function getRequest(): ?Request
+    {
+        return $this->requestStack->getCurrentRequest();
+    }
+
+    private function getSessionHandler(): SessionInterface
+    {
+        return $this->getRequest()->getSession();
+    }
+
+    public function getSessionId(): ?int
+    {
+        return $this->getSessionHandler()->get('sid');
+    }
+
+    public function getSessionEntity(): ?Session
+    {
+        return $this->getSessionHandler()->get('session');
+    }
+
+    public function getCourseId()
+    {
+        return $this->getSessionHandler()->get('cid');
+    }
+
+    public function getCourseEntity(): ?Course
+    {
+        return $this->getSessionHandler()->get('course');
+    }
+
+    public function getGroupId(): ?int
+    {
+        return $this->getSessionHandler()->get('gid');
+    }
+}

From 2ae80c32674328a4a1eedc40ba150570ad924043 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Thu, 7 Mar 2024 01:06:00 -0500
Subject: [PATCH 3/7] Internal: Group: Use AccessUrlHelper to filter queries
 with access_url relation

---
 .../Repository/Node/UsergroupRepository.php   | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/CoreBundle/Repository/Node/UsergroupRepository.php b/src/CoreBundle/Repository/Node/UsergroupRepository.php
index 2da34dfae0..bf8fa8fdaf 100644
--- a/src/CoreBundle/Repository/Node/UsergroupRepository.php
+++ b/src/CoreBundle/Repository/Node/UsergroupRepository.php
@@ -10,6 +10,7 @@ use Chamilo\CoreBundle\Entity\User;
 use Chamilo\CoreBundle\Entity\Usergroup;
 use Chamilo\CoreBundle\Entity\UsergroupRelUser;
 use Chamilo\CoreBundle\Repository\ResourceRepository;
+use Chamilo\CoreBundle\ServiceHelper\AccessUrlHelper;
 use Doctrine\Persistence\ManagerRegistry;
 use Exception;
 
@@ -17,7 +18,8 @@ class UsergroupRepository extends ResourceRepository
 {
     public function __construct(
         ManagerRegistry $registry,
-        private readonly IllustrationRepository $illustrationRepository
+        private readonly IllustrationRepository $illustrationRepository,
+        private readonly AccessUrlHelper $accessUrlHelper,
     ) {
         parent::__construct($registry, Usergroup::class);
     }
@@ -47,11 +49,12 @@ class UsergroupRepository extends ResourceRepository
             }
         }
 
-        if ($this->getUseMultipleUrl()) {
-            $urlId = $this->getCurrentAccessUrlId();
+        if ($this->accessUrlHelper->isMultipleEnabled()) {
+            $accessUrl = $this->accessUrlHelper->getCurrent();
+
             $qb->innerJoin('g.urls', 'u')
                 ->andWhere('u.accessUrl = :urlId')
-                ->setParameter('urlId', $urlId)
+                ->setParameter('urlId', $accessUrl->getId())
             ;
         }
 
@@ -85,11 +88,12 @@ class UsergroupRepository extends ResourceRepository
             ->setMaxResults($limit)
         ;
 
-        if ($this->getUseMultipleUrl()) {
-            $urlId = $this->getCurrentAccessUrlId();
+        if ($this->accessUrlHelper->isMultipleEnabled()) {
+            $accessUrl = $this->accessUrlHelper->getCurrent();
+
             $qb->innerJoin('g.urls', 'u')
                 ->andWhere('u.accessUrl = :urlId')
-                ->setParameter('urlId', $urlId)
+                ->setParameter('urlId', $accessUrl->getId())
             ;
         }
 
@@ -120,11 +124,12 @@ class UsergroupRepository extends ResourceRepository
             ->setMaxResults($limit)
         ;
 
-        if ($this->getUseMultipleUrl()) {
-            $urlId = $this->getCurrentAccessUrlId();
+        if ($this->accessUrlHelper->isMultipleEnabled()) {
+            $accessUrl = $this->accessUrlHelper->getCurrent();
+
             $qb->innerJoin('g.urls', 'u')
                 ->andWhere('u.accessUrl = :urlId')
-                ->setParameter('urlId', $urlId)
+                ->setParameter('urlId', $accessUrl->getId())
             ;
         }
 
@@ -306,11 +311,12 @@ class UsergroupRepository extends ResourceRepository
             $qb->select('g.id, g.title, g.description, g.url, g.picture');
         }
 
-        if ($this->getUseMultipleUrl()) {
-            $urlId = $this->getCurrentAccessUrlId();
+        if ($this->accessUrlHelper->isMultipleEnabled()) {
+            $accessUrl = $this->accessUrlHelper->getCurrent();
+
             $qb->innerJoin('g.accessUrls', 'a', 'WITH', 'g.id = a.usergroup')
                 ->andWhere('a.accessUrl = :urlId')
-                ->setParameter('urlId', $urlId)
+                ->setParameter('urlId', $accessUrl->getId())
             ;
         }
 

From 5a13696b2736acadbece6c98cc1e3977d4295393 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Thu, 7 Mar 2024 01:08:50 -0500
Subject: [PATCH 4/7] Calendar: List events according related to the user group
 considering the agenda.agenda_event_subscriptions setting - refs BT#19390
 BT#20637

---
 .../Extension/CCalendarEventExtension.php     | 41 ++++++++++++++++---
 1 file changed, 36 insertions(+), 5 deletions(-)

diff --git a/src/CoreBundle/DataProvider/Extension/CCalendarEventExtension.php b/src/CoreBundle/DataProvider/Extension/CCalendarEventExtension.php
index d87a9329b6..12bce35c2c 100644
--- a/src/CoreBundle/DataProvider/Extension/CCalendarEventExtension.php
+++ b/src/CoreBundle/DataProvider/Extension/CCalendarEventExtension.php
@@ -7,20 +7,18 @@ declare(strict_types=1);
 namespace Chamilo\CoreBundle\DataProvider\Extension;
 
 use ApiPlatform\Doctrine\Orm\Extension\QueryCollectionExtensionInterface;
-// use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryItemExtensionInterface;
-// use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryItemExtensionInterface;
 use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface;
 use ApiPlatform\Metadata\Operation;
 use Chamilo\CoreBundle\Entity\User;
+use Chamilo\CoreBundle\Entity\Usergroup;
 use Chamilo\CoreBundle\ServiceHelper\CidReqHelper;
 use Chamilo\CoreBundle\Settings\SettingsManager;
 use Chamilo\CourseBundle\Entity\CCalendarEvent;
 use Doctrine\ORM\QueryBuilder;
-use phpDocumentor\Reflection\Types\Integer;
-use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Security\Core\Security;
+use UserGroupModel;
 
-final class CCalendarEventExtension implements QueryCollectionExtensionInterface // , QueryItemExtensionInterface
+final class CCalendarEventExtension implements QueryCollectionExtensionInterface
 {
     use CourseLinkExtensionTrait;
 
@@ -82,5 +80,38 @@ final class CCalendarEventExtension implements QueryCollectionExtensionInterface
             )
             ->setParameter('user', $user->getId())
         ;
+
+        if ('true' === $this->settingsManager->getSetting('agenda.agenda_event_subscriptions')) {
+            $this->addSubscriptionsConditions($qb, $user);
+        }
+    }
+
+    private function addSubscriptionsConditions(QueryBuilder $qb, User $user): void
+    {
+        $groupList = (new UserGroupModel())->getUserGroupListByUser($user->getId(), Usergroup::NORMAL_CLASS);
+        $groupIdList = $groupList ? array_column($groupList, 'id') : [];
+
+        $alias = $qb->getRootAliases()[0];
+
+        $expr = $qb->expr()->orX(
+            $qb->expr()->eq("$alias.subscriptionVisibility", ':visibility_all'),
+        );
+
+        if ($groupIdList) {
+            $expr->add(
+                $qb->expr()->orX(
+                    $qb->expr()->eq("$alias.subscriptionVisibility", ':visibility_class'),
+                    $qb->expr()->in("$alias.subscriptionItemId", ':item_id_list')
+                )
+            );
+
+            $qb->setParameter('visibility_class', CCalendarEvent::SUBSCRIPTION_VISIBILITY_CLASS);
+            $qb->setParameter('item_id_list', $groupIdList);
+        }
+
+        $qb
+            ->orWhere($expr)
+            ->setParameter(':visibility_all', CCalendarEvent::SUBSCRIPTION_VISIBILITY_ALL)
+        ;
     }
 }

From e2d1d8d2f709a604ae98515393363d2a05ba095a Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Thu, 7 Mar 2024 01:44:11 -0500
Subject: [PATCH 5/7] Minor: Format code

---
 src/CoreBundle/Entity/User.php                | 9 +++++----
 src/CoreBundle/ServiceHelper/CidReqHelper.php | 3 +--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/CoreBundle/Entity/User.php b/src/CoreBundle/Entity/User.php
index 2d9a8d3bac..c673340621 100644
--- a/src/CoreBundle/Entity/User.php
+++ b/src/CoreBundle/Entity/User.php
@@ -931,16 +931,17 @@ class User implements UserInterface, EquatableInterface, ResourceInterface, Reso
         }*/
 
     /**
-     * Get a bool on whether the user is active or not. Active can be "-1" which means pre-deleted, and is returned as false (not active)
+     * Get a bool on whether the user is active or not. Active can be "-1" which means pre-deleted, and is returned as false (not active).
+     *
      * @return bool True if active = 1, false in any other case (0 = inactive, -1 = predeleted)
      */
     public function getIsActive(): bool
     {
-        if ($this->active == 1) {
+        if (1 == $this->active) {
             return true;
-        } else {
-            return false;
         }
+
+        return false;
     }
 
     public function isEnabled(): bool
diff --git a/src/CoreBundle/ServiceHelper/CidReqHelper.php b/src/CoreBundle/ServiceHelper/CidReqHelper.php
index 4218fd8c79..713fcb461b 100644
--- a/src/CoreBundle/ServiceHelper/CidReqHelper.php
+++ b/src/CoreBundle/ServiceHelper/CidReqHelper.php
@@ -20,8 +20,7 @@ class CidReqHelper
 {
     public function __construct(
         private readonly RequestStack $requestStack,
-    ) {
-    }
+    ) {}
 
     private function getRequest(): ?Request
     {

From 9e3721df6e518f3928a24674510ea62e519f4042 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Thu, 7 Mar 2024 04:13:06 -0500
Subject: [PATCH 6/7] Calendar: Fix event information with invitations

---
 .../ccalendarevent/CCalendarEventInfo.vue     | 12 +++---
 .../vue/composables/calendar/calendarEvent.js | 38 +++++++++++++++++++
 .../ccalendarevent/CCalendarEventList.vue     | 19 +++-------
 .../ApiResource/AbstractResource.php          |  5 +++
 src/CoreBundle/ApiResource/CalendarEvent.php  | 18 ++++++++-
 .../CalendarEventTransformer.php              |  8 ++++
 src/CourseBundle/Entity/CCalendarEvent.php    | 20 +++++-----
 7 files changed, 88 insertions(+), 32 deletions(-)
 create mode 100644 assets/vue/composables/calendar/calendarEvent.js

diff --git a/assets/vue/components/ccalendarevent/CCalendarEventInfo.vue b/assets/vue/components/ccalendarevent/CCalendarEventInfo.vue
index c43c3af100..63120f2b72 100644
--- a/assets/vue/components/ccalendarevent/CCalendarEventInfo.vue
+++ b/assets/vue/components/ccalendarevent/CCalendarEventInfo.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex flex-col gap-4">
+  <div class="flex flex-col space-y-4">
     <h5 v-text="event.title" />
 
     <p v-text="abbreviatedDatetime(event.startDate)" />
@@ -13,11 +13,7 @@
 
     <div v-html="event.content" />
 
-    <div
-      v-if="event.resourceLinkListFromEntity && event.resourceLinkListFromEntity.length"
-      aria-invalid="spelling"
-      @click="window.alert('asdfsadf')"
-    >
+    <div v-if="allowCollectiveInvitations && type.invitation === event.invitationType">
       <h6 v-t="'Invitees'" />
 
       <ShowLinks
@@ -30,10 +26,12 @@
 
 <script setup>
 import { useFormatDate } from "../../composables/formatDate"
-
 import ShowLinks from "../resource_links/ShowLinks"
+import { useCalendarInvitations } from "../../composables/calendar/calendarInvitations"
+import { type } from "../../constants/entity/ccalendarevent"
 
 const { abbreviatedDatetime } = useFormatDate()
+const { allowCollectiveInvitations } = useCalendarInvitations()
 
 // eslint-disable-next-line no-undef
 defineProps({
diff --git a/assets/vue/composables/calendar/calendarEvent.js b/assets/vue/composables/calendar/calendarEvent.js
new file mode 100644
index 0000000000..609a3bddba
--- /dev/null
+++ b/assets/vue/composables/calendar/calendarEvent.js
@@ -0,0 +1,38 @@
+import { type } from "../../constants/entity/ccalendarevent"
+
+export function useCalendarEvent() {
+  return {
+    findUserLink,
+    isEditableByUser,
+  }
+}
+
+/**
+ * @param {Object} event
+ * @param {number} userId
+ * @returns {Object|undefined}
+ */
+function findUserLink(event, userId) {
+  return event.resourceLinkListFromEntity.find((linkEntity) => linkEntity.user.id === userId)
+}
+
+/**
+ * @param {Object} event
+ * @param {number} userId
+ * @returns {boolean}
+ */
+function isEditableByUser(event, userId) {
+  if (event.resourceNode.creator.id === userId) {
+    return true
+  }
+
+  if (type.invitation === event.invitationType && event.collective) {
+    const userLink = findUserLink(event, userId)
+
+    if (userLink) {
+      return true
+    }
+  }
+
+  return false
+}
diff --git a/assets/vue/views/ccalendarevent/CCalendarEventList.vue b/assets/vue/views/ccalendarevent/CCalendarEventList.vue
index 25ca4b0524..2f69a74635 100644
--- a/assets/vue/views/ccalendarevent/CCalendarEventList.vue
+++ b/assets/vue/views/ccalendarevent/CCalendarEventList.vue
@@ -61,7 +61,7 @@
           @click="confirmDelete"
         />
         <BaseButton
-          v-if="isEventEditable"
+          v-if="allowToEdit"
           :label="t('Edit')"
           type="secondary"
           @click="dialog = true"
@@ -129,6 +129,7 @@ import { useLocale, useParentLocale } from "../../composables/locale"
 import { storeToRefs } from "pinia"
 import CalendarSectionHeader from "../../components/ccalendarevent/CalendarSectionHeader.vue"
 import { useCalendarActionButtons } from "../../composables/calendar/calendarActionButtons"
+import { useCalendarEvent } from "../../composables/calendar/calendarEvent"
 
 const store = useStore()
 const confirm = useConfirm()
@@ -140,10 +141,12 @@ const { abbreviatedDatetime } = useFormatDate()
 
 const { showAddButton } = useCalendarActionButtons()
 
+const { isEditableByUser } = useCalendarEvent()
+
 const item = ref({})
 const dialog = ref(false)
 const dialogShow = ref(false)
-const isEventEditable = ref(false)
+const allowToEdit = ref(false)
 
 const currentUser = computed(() => store.getters["security/getUser"])
 const { t } = useI18n()
@@ -244,17 +247,7 @@ const calendarOptions = ref({
     item.value["endDate"] = event.end
     item.value["parentResourceNodeId"] = event.extendedProps.resourceNode.creator.id
 
-    isEventEditable.value = item.value["parentResourceNodeId"] === currentUser.value["id"]
-
-    if (!isEventEditable.value && event.extendedProps.collective && event.extendedProps.resourceLinkListFromEntity) {
-      const resourceLink = event.extendedProps.resourceLinkListFromEntity.find(
-        (linkEntity) => linkEntity.user.id === currentUser.value.id,
-      )
-
-      if (resourceLink) {
-        isEventEditable.value = true
-      }
-    }
+    allowToEdit.value = isEditableByUser(item.value, currentUser.value.id)
 
     dialogShow.value = true
   },
diff --git a/src/CoreBundle/ApiResource/AbstractResource.php b/src/CoreBundle/ApiResource/AbstractResource.php
index 880e685d58..c479a7d257 100644
--- a/src/CoreBundle/ApiResource/AbstractResource.php
+++ b/src/CoreBundle/ApiResource/AbstractResource.php
@@ -14,4 +14,9 @@ abstract class AbstractResource
         'ctool:read',
     ])]
     public ?string $illustrationUrl = null;
+
+    #[Groups([
+        'calendar_event:read',
+    ])]
+    public ?array $resourceLinkListFromEntity = null;
 }
diff --git a/src/CoreBundle/ApiResource/CalendarEvent.php b/src/CoreBundle/ApiResource/CalendarEvent.php
index 05f4f40c72..3ed873158a 100644
--- a/src/CoreBundle/ApiResource/CalendarEvent.php
+++ b/src/CoreBundle/ApiResource/CalendarEvent.php
@@ -7,10 +7,11 @@ declare(strict_types=1);
 namespace Chamilo\CoreBundle\ApiResource;
 
 use Chamilo\CoreBundle\Entity\ResourceNode;
+use Chamilo\CourseBundle\Entity\CCalendarEvent;
 use DateTime;
 use Symfony\Component\Serializer\Annotation\Groups;
 
-class CalendarEvent
+class CalendarEvent extends AbstractResource
 {
     public function __construct(
         #[Groups(['calendar_event:read'])]
@@ -28,6 +29,19 @@ class CalendarEvent
         #[Groups(['calendar_event:read'])]
         public ?string $url = null,
         #[Groups(['calendar_event:read'])]
+        public ?string $invitationType = null,
+        #[Groups(['calendar_event:read'])]
+        public bool $collective = false,
+        #[Groups(['calendar_event:read'])]
+        public int $subscriptionVisibility = CCalendarEvent::SUBSCRIPTION_VISIBILITY_NO,
+        #[Groups(['calendar_event:read'])]
+        public ?int $subscriptionItemId = null,
+        #[Groups(['calendar_event:read'])]
+        public int $maxAttendees = 0,
+        #[Groups(['calendar_event:read'])]
         public ?ResourceNode $resourceNode = null,
-    ) {}
+        ?array $resourceLinkListFromEntity = null,
+    ) {
+        $this->resourceLinkListFromEntity = $resourceLinkListFromEntity;
+    }
 }
diff --git a/src/CoreBundle/DataTransformer/CalendarEventTransformer.php b/src/CoreBundle/DataTransformer/CalendarEventTransformer.php
index 22bfeaf4d5..84ca91694b 100644
--- a/src/CoreBundle/DataTransformer/CalendarEventTransformer.php
+++ b/src/CoreBundle/DataTransformer/CalendarEventTransformer.php
@@ -38,6 +38,8 @@ class CalendarEventTransformer implements DataTransformerInterface
     {
         \assert($object instanceof CCalendarEvent);
 
+        $object->setResourceLinkListFromEntity();
+
         return new CalendarEvent(
             'calendar_event_'.$object->getIid(),
             $object->getTitle(),
@@ -46,7 +48,13 @@ class CalendarEventTransformer implements DataTransformerInterface
             $object->getEndDate(),
             $object->isAllDay(),
             null,
+            $object->getInvitationType(),
+            $object->isCollective(),
+            $object->getSubscriptionVisibility(),
+            $object->getSubscriptionItemId(),
+            $object->getMaxAttendees(),
             $object->getResourceNode(),
+            $object->getResourceLinkListFromEntity(),
         );
     }
 
diff --git a/src/CourseBundle/Entity/CCalendarEvent.php b/src/CourseBundle/Entity/CCalendarEvent.php
index c2b6817ab3..200007ae1c 100644
--- a/src/CourseBundle/Entity/CCalendarEvent.php
+++ b/src/CourseBundle/Entity/CCalendarEvent.php
@@ -84,21 +84,21 @@ class CCalendarEvent extends AbstractResource implements ResourceInterface, Stri
     #[ORM\GeneratedValue]
     protected ?int $iid = null;
 
-    #[Groups(['calendar_event:read', 'calendar_event:write'])]
+    #[Groups(['calendar_event:write'])]
     #[Assert\NotBlank]
     #[ORM\Column(name: 'title', type: 'string', length: 255, nullable: false)]
     protected string $title;
 
-    #[Groups(['calendar_event:read', 'calendar_event:write'])]
+    #[Groups(['calendar_event:write'])]
     #[Assert\NotBlank]
     #[ORM\Column(name: 'content', type: 'text', nullable: true)]
     protected ?string $content = null;
 
-    #[Groups(['calendar_event:read', 'calendar_event:write'])]
+    #[Groups(['calendar_event:write'])]
     #[ORM\Column(name: 'start_date', type: 'datetime', nullable: true)]
     protected ?DateTime $startDate = null;
 
-    #[Groups(['calendar_event:read', 'calendar_event:write'])]
+    #[Groups(['calendar_event:write'])]
     #[ORM\Column(name: 'end_date', type: 'datetime', nullable: true)]
     protected ?DateTime $endDate = null;
 
@@ -143,24 +143,24 @@ class CCalendarEvent extends AbstractResource implements ResourceInterface, Stri
     #[ORM\OneToMany(mappedBy: 'event', targetEntity: CCalendarEventAttachment::class, cascade: ['persist', 'remove'])]
     protected Collection $attachments;
 
-    #[Groups(['calendar_event:read', 'calendar_event:write'])]
+    #[Groups(['calendar_event:write'])]
     #[ORM\Column(name: 'invitation_type', type: 'string', nullable: true)]
     protected ?string $invitationType = null;
 
-    #[Groups(['calendar_event:read', 'calendar_event:write'])]
+    #[Groups(['calendar_event:write'])]
     #[Assert\NotNull]
     #[ORM\Column(name: 'collective', type: 'boolean')]
     protected bool $collective = false;
 
-    #[Groups(['calendar_event:read', 'calendar_event:write'])]
+    #[Groups(['calendar_event:write'])]
     #[ORM\Column(name: 'subscription_visibility', type: 'integer')]
     protected int $subscriptionVisibility = self::SUBSCRIPTION_VISIBILITY_NO;
 
-    #[Groups(['calendar_event:read', 'calendar_event:write'])]
+    #[Groups(['calendar_event:write'])]
     #[ORM\Column(name: 'subscription_item_id', type: 'integer', nullable: true)]
     protected ?int $subscriptionItemId = null;
 
-    #[Groups(['calendar_event:read', 'calendar_event:write'])]
+    #[Groups(['calendar_event:write'])]
     #[ORM\Column(name: 'max_attendees', type: 'integer')]
     protected int $maxAttendees = 0;
 
@@ -385,7 +385,7 @@ class CCalendarEvent extends AbstractResource implements ResourceInterface, Stri
         return $this;
     }
 
-    public function getInvitationType(): string
+    public function getInvitationType(): ?string
     {
         return $this->invitationType;
     }

From d1c2a22df572fd09c2af0276b8ac7b9fb1989d62 Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Thu, 7 Mar 2024 15:00:18 +0100
Subject: [PATCH 7/7] Display: Update colors for button btn--plain background

---
 assets/css/scss/atoms/_buttons.scss | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/assets/css/scss/atoms/_buttons.scss b/assets/css/scss/atoms/_buttons.scss
index 9f77bd8ffd..a3bee6055b 100644
--- a/assets/css/scss/atoms/_buttons.scss
+++ b/assets/css/scss/atoms/_buttons.scss
@@ -40,11 +40,11 @@
   }
 
   &--plain {
-    @apply bg-gray-90 text-white mr-1.5;
+    @apply bg-gray-30 text-white mr-1.5;
 
     &:hover,
     &:focus {
-      @apply bg-black;
+      @apply bg-gray-90;
     }
   }
 
@@ -53,7 +53,7 @@
 
     &:hover,
     &:focus {
-      @apply bg-gray-90 border-gray-90 text-white;
+      @apply bg-gray-30 border-gray-30 text-white;
     }
   }
 
@@ -165,7 +165,7 @@ $border-color_12: #9333EA;
   $textColor: 'white';
 
   @if('warning' == $color) {
-    $textColor: 'gray-90';
+    $textColor: 'gray-30';
   }
 
   @apply bg-#{$color} text-#{$textColor};
@@ -194,7 +194,7 @@ $border-color_12: #9333EA;
       @if ('warning' == $color) {
         @apply bg-#{$color} border-#{$color} text-gray-90;
       } @else if('black' == $color) {
-        @apply bg-gray-90 border-gray-90 text-white;
+        @apply bg-gray-30 border-gray-30 text-white;
       } @else {
         @apply bg-#{$color} border-#{$color} text-white;
       }
@@ -321,7 +321,7 @@ $border-color_12: #9333EA;
 
 // plain button
 .p-button.p-button-plain {
-  @include filled-style('gray-90', 'black');
+  @include filled-style('gray-30', 'black');
 
   &.p-button-outlined {
     @include outlined-style('black');
@@ -334,7 +334,7 @@ $border-color_12: #9333EA;
 
 .p-buttonset.p-button-plain {
   > .p-button {
-    @include filled-style('gray-90', 'black');
+    @include filled-style('gray-30', 'black');
 
     &.p-button-outlined {
       @include outlined-style('black');