Fix UserNormalizerTest.php

.changes/unreleased/Feature-20251125-165811.yaml

@@ -1,6 +0,0 @@
-kind: Feature
-body: Add a counter for invitations awaiting reply
-time: 2025-11-25T16:58:11.780678466+01:00
-custom:
-    Issue: "459"
-    SchemaChange: No schema change

.changes/unreleased/Fixed-20251118-140559.yaml

@@ -1,7 +0,0 @@
-kind: Fixed
-body: |
-    Associate activity's creator as a participant by default, and retro-actively append the creator to each activity
-time: 2025-11-18T14:05:59.904993123+01:00
-custom:
-    Issue: "466"
-    SchemaChange: Add columns or tables

.changes/unreleased/Fixed-20251201-185859.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: Do not suggest a user that is no longer active in the activity form.
+time: 2025-12-01T18:58:59.410998029+01:00
+custom:
+    Issue: "475"
+    SchemaChange: No schema change

.changes/unreleased/UX-20251119-153706.yaml

@@ -1,6 +0,0 @@
-kind: UX
-body: Alphabetically order userJobs and mainLocations within user creation form
-time: 2025-11-19T15:37:06.393470745+01:00
-custom:
-    Issue: "470"
-    SchemaChange: No schema change

.changes/unreleased/UX-20251124-151115.yaml

@@ -1,6 +0,0 @@
-kind: UX
-body: Change position and color of confirm parcours button
-time: 2025-11-24T15:11:15.960279853+01:00
-custom:
-    Issue: "437"
-    SchemaChange: No schema change

.changes/v4.8.2.md

@@ -0,0 +1,10 @@
+## v4.8.2 - 2025-11-26
+### Fixed
+* ([#466](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/466)) Associate activity's creator as a participant by default, and retro-actively append the creator to each activity
+   
+
+  **Schema Change**: Add columns or tables
+* Fix template parameter for update_multiple route on event participations   
+### UX
+* ([#470](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/470)) Alphabetically order userJobs and mainLocations within user creation form   
+* ([#437](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/437)) Change position and color of confirm parcours button   

CHANGELOG.md

@@ -6,6 +6,15 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v4.8.2 - 2025-11-26
+### Fixed
+* ([#466](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/466)) Associate activity's creator as a participant by default, and retro-actively append the creator to each activity
+  **Schema Change**: Add columns or tables
+* Fix template parameter for update_multiple route on event participations
+### UX
+* ([#470](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/470)) Alphabetically order userJobs and mainLocations within user creation form
+* ([#437](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/437)) Change position and color of confirm parcours button
+
 ## v4.8.1 - 2025-11-20
 ### Fixed
 * Insert name of file as the document title when uploading

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js

@@ -103,7 +103,7 @@ const store = createStore({
       }
       // console.log("suggested users", suggestedUsers);
 
-      return suggestedUsers;
+      return suggestedUsers.filter((u) => u.enabled === true);
     },
     suggestedResources(state) {
       // const resources = state.activity.accompanyingPeriod.resources;

src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php

@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\CalendarBundle\Menu;
 
-use Chill\CalendarBundle\Repository\InviteRepository;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Security;
@@ -19,12 +18,10 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class UserMenuBuilder implements LocalMenuBuilderInterface
 {
-    public function __construct(private readonly Security $security, public TranslatorInterface $translator, private readonly InviteRepository $inviteRepository) {}
+    public function __construct(private readonly Security $security, public TranslatorInterface $translator) {}
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
-        $invitationsPending = $this->inviteRepository->countPendingInvitesByUser($this->security->getUser());
-
         if ($this->security->isGranted('ROLE_USER')) {
             $menu->addChild('My calendar list', [
                 'route' => 'chill_calendar_calendar_list_my',
@@ -33,14 +30,12 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
                     'order' => 8,
                     'icon' => 'tasks',
                 ]);
-            $menu->addChild(
-                $this->translator->trans('invite.menu with counter', ['nb' => $invitationsPending]),
-                ['route' => 'chill_calendar_invitations_list_my']
-            )
+            $menu->addChild('invite.list.title', [
+                'route' => 'chill_calendar_invitations_list_my',
+            ])
                 ->setExtras([
                     'order' => 9,
                     'icon' => 'tasks',
-                    'counter' => 0 < $invitationsPending ? $invitationsPending : null,
                 ]);
         }
     }

src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php

@@ -75,25 +75,6 @@ class InviteRepository implements ObjectRepository
             ->getSingleScalarResult();
     }
 
-    public function countPendingInvitesByUser(User $user): int
-    {
-        $qb = $this->entityRepository->createQueryBuilder('i');
-
-        $qb->select('COUNT(i)')
-            ->where(
-                $qb->expr()->andX(
-                    $qb->expr()->eq('i.user', ':user'),
-                    $qb->expr()->eq('i.status', ':status')
-                )
-            )
-            ->setParameters([
-                'user' => $user,
-                'status' => Invite::PENDING,
-            ]);
-
-        return $qb->getQuery()->getSingleScalarResult();
-    }
-
     public function buildAcceptedInviteByUserAndDateRangeQuery(User $user, \DateTimeImmutable $from, \DateTimeImmutable $to)
     {
         $qb = $this->entityRepository->createQueryBuilder('i');

src/Bundle/ChillCalendarBundle/translations/messages+intl-icu.fr.yml

@@ -6,11 +6,3 @@ chill_calendar:
             few {# rendez-vous sont ignorés par le filtre de date. Modifiez le filtre de date pour les voir apparaitre.}
             other {# rendez-vous sont ignorés par le filtre de date. Modifiez le filtre de date pour les voir apparaitre.}
         }
-invite:
-    menu with counter: >-
-            {nb, plural,
-                =0 {Mes invitations}
-                one {# invitation}
-                few {# invitations}
-                other {# invitations}
-            }

src/Bundle/ChillCalendarBundle/translations/messages.fr.yml

@@ -96,7 +96,6 @@ invite:
     list:
         none: Il n'y aucun invitation
         title: Mes invitations
-    number of invitations waiting: Invitations en attente
 
 # exports
 Exports of calendar: Exports des rendez-vous

src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts

@@ -52,36 +52,31 @@ interface BaseMetadataWithHtml extends BaseMetadata {
     html: string;
 }
 
-export interface GenericDocForAccompanyingCourseDocument
-    extends GenericDocForAccompanyingPeriod {
+export interface GenericDocForAccompanyingCourseDocument extends GenericDocForAccompanyingPeriod {
     key: "accompanying_course_document";
     metadata: BaseMetadataWithHtml;
     storedObject: StoredObject;
 }
 
-export interface GenericDocForAccompanyingCourseActivityDocument
-    extends GenericDocForAccompanyingPeriod {
+export interface GenericDocForAccompanyingCourseActivityDocument extends GenericDocForAccompanyingPeriod {
     key: "accompanying_course_activity_document";
     metadata: BaseMetadataWithHtml;
     storedObject: StoredObject;
 }
 
-export interface GenericDocForAccompanyingCourseCalendarDocument
-    extends GenericDocForAccompanyingPeriod {
+export interface GenericDocForAccompanyingCourseCalendarDocument extends GenericDocForAccompanyingPeriod {
     key: "accompanying_course_calendar_document";
     metadata: BaseMetadataWithHtml;
     storedObject: StoredObject;
 }
 
-export interface GenericDocForAccompanyingCoursePersonDocument
-    extends GenericDocForAccompanyingPeriod {
+export interface GenericDocForAccompanyingCoursePersonDocument extends GenericDocForAccompanyingPeriod {
     key: "person_document";
     metadata: BaseMetadataWithHtml;
     storedObject: StoredObject;
 }
 
-export interface GenericDocForAccompanyingCourseWorkEvaluationDocument
-    extends GenericDocForAccompanyingPeriod {
+export interface GenericDocForAccompanyingCourseWorkEvaluationDocument extends GenericDocForAccompanyingPeriod {
     key: "accompanying_period_work_evaluation_document";
     metadata: BaseMetadataWithHtml;
     storedObject: StoredObject;

src/Bundle/ChillDocStoreBundle/Resources/public/types/index.ts

@@ -46,8 +46,7 @@ export interface StoredObjectVersionCreated extends StoredObjectVersion {
     persisted: false;
 }
 
-export interface StoredObjectVersionPersisted
-    extends StoredObjectVersionCreated {
+export interface StoredObjectVersionPersisted extends StoredObjectVersionCreated {
     version: number;
     id: number;
     createdAt: DateTime | null;
@@ -61,8 +60,7 @@ export interface StoredObjectStatusChange {
     type: string;
 }
 
-export interface StoredObjectVersionWithPointInTime
-    extends StoredObjectVersionPersisted {
+export interface StoredObjectVersionWithPointInTime extends StoredObjectVersionPersisted {
     "point-in-times": StoredObjectPointInTime[];
     "from-restored": StoredObjectVersionPersisted | null;
 }

src/Bundle/ChillEventBundle/Controller/ParticipationController.php

@@ -486,7 +486,7 @@ final class ParticipationController extends AbstractController
 
             return $this->redirectToRoute(
                 'chill_event__event_show',
-                ['event_id' => $event->getId()]
+                ['id' => $event->getId()]
             );
         }
 

src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts

@@ -20,8 +20,7 @@ export interface TransportExceptionInterface {
     name: string;
 }
 
-export interface ValidationExceptionInterface
-    extends TransportExceptionInterface {
+export interface ValidationExceptionInterface extends TransportExceptionInterface {
     name: "ValidationException";
     error: object;
     violations: string[];
@@ -41,8 +40,7 @@ export interface AccessExceptionInterface extends TransportExceptionInterface {
     violations: string[];
 }
 
-export interface NotFoundExceptionInterface
-    extends TransportExceptionInterface {
+export interface NotFoundExceptionInterface extends TransportExceptionInterface {
     name: "NotFoundException";
 }
 
@@ -53,8 +51,7 @@ export interface ServerExceptionInterface extends TransportExceptionInterface {
     body: string;
 }
 
-export interface ConflictHttpExceptionInterface
-    extends TransportExceptionInterface {
+export interface ConflictHttpExceptionInterface extends TransportExceptionInterface {
     name: "ConflictHttpException";
     violations: string[];
 }

src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php

@@ -41,6 +41,7 @@ class UserNormalizer implements ContextAwareNormalizerInterface, NormalizerAware
         'isAbsent' => false,
         'absenceStart' => null,
         'absenceEnd' => null,
+        'enabled' => true,
     ];
 
     public function __construct(private readonly UserRender $userRender, private readonly ClockInterface $clock) {}
@@ -108,6 +109,7 @@ class UserNormalizer implements ContextAwareNormalizerInterface, NormalizerAware
             'isAbsent' => $object->isAbsent(),
             'absenceStart' => $this->normalizer->normalize($object->getAbsenceStart(), $format, $absenceDatesContext),
             'absenceEnd' => $this->normalizer->normalize($object->getAbsenceEnd(), $format, $absenceDatesContext),
+            'enabled' => $object->isEnabled(),
         ];
 
         if ('docgen' === $format) {

src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/UserNormalizerTest.php

@@ -103,6 +103,7 @@ final class UserNormalizerTest extends TestCase
                 'main_center' => ['context' => Center::class],
                 'absenceStart' => ['context' => \DateTimeImmutable::class],
                 'absenceEnd' => ['context' => \DateTimeImmutable::class],
+                'enabled' => true
             ]];
 
         yield [$userNoPhone, 'docgen', ['docgen:expects' => User::class],
@@ -124,6 +125,7 @@ final class UserNormalizerTest extends TestCase
                 'main_center' => ['context' => Center::class],
                 'absenceStart' => ['context' => \DateTimeImmutable::class],
                 'absenceEnd' => ['context' => \DateTimeImmutable::class],
+                'enabled' => true
             ]];
 
         yield [null, 'docgen', ['docgen:expects' => User::class], [
@@ -144,6 +146,7 @@ final class UserNormalizerTest extends TestCase
             'main_center' => ['context' => Center::class],
             'absenceStart' => null,
             'absenceEnd' => null,
+            'enabled' => true
         ]];
     }
 }