Add a counter to the user menu item

Associate activity's creator as a participant by default, and retro-actively append the creator to each activity

Closes #466

See merge request Chill-Projet/chill-bundles!924

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

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,7 @@
+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/UX-20251119-153706.yaml

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,6 @@
+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

src/Bundle/ChillActivityBundle/Controller/ActivityController.php

@@ -382,6 +382,7 @@ final class ActivityController extends AbstractController
 
         $entity = new Activity();
         $entity->setUser($this->security->getUser());
+        $entity->addUser($this->security->getUser());
 
         if ($person instanceof Person) {
             $entity->setPerson($person);

src/Bundle/ChillActivityBundle/migrations/Version20251118124241.php

@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\Activity;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Migration fixing the automatic association of users to activities (exchanges).
+ *
+ * Originally, the user who created an exchange was not automatically associated
+ * to it (the "TMS" column), which led to incomplete data and biased statistics.
+ *
+ * This migration:
+ *  - retroactively associates the creator of each exchange to the corresponding
+ *    activity;
+ *  - flags these backfilled associations with a temporary column so it is clear
+ *    they were added by this data correction and can be safely cleaned up later.
+ */
+final class Version20251118124241 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Insert the creator of activity into the activity_user table';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activity_user ADD COLUMN by_migration BOOL DEFAULT FALSE');
+        $this->addSql("COMMENT ON COLUMN activity_user.by_migration IS 'For backup purpose - can be safely deleted after a while. See migration \\Chill\\Migrations\\Activity\\Version20251118124241'");
+
+        $this->addSql('INSERT INTO activity_user (activity_id, user_id, by_migration)
+            SELECT id, user_id, true FROM activity
+            ON CONFLICT DO NOTHING');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activity_user DROP COLUMN by_migration');
+    }
+}

src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php

@@ -11,6 +11,7 @@ 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;
@@ -18,10 +19,12 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class UserMenuBuilder implements LocalMenuBuilderInterface
 {
-    public function __construct(private readonly Security $security, public TranslatorInterface $translator) {}
+    public function __construct(private readonly Security $security, public TranslatorInterface $translator, private readonly InviteRepository $inviteRepository) {}
 
     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',
@@ -30,12 +33,14 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
                     'order' => 8,
                     'icon' => 'tasks',
                 ]);
-            $menu->addChild('invite.list.title', [
-                'route' => 'chill_calendar_invitations_list_my',
-            ])
+            $menu->addChild(
+                $this->translator->trans('invite.menu with counter', ['nb' => $invitationsPending]),
+                ['route' => 'chill_calendar_invitations_list_my']
+            )
                 ->setExtras([
                     'order' => 9,
                     'icon' => 'tasks',
+                    'counter' => 0 < $invitationsPending ? $invitationsPending : null,
                 ]);
         }
     }

src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php

@@ -75,6 +75,25 @@ 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,3 +6,11 @@ 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,6 +96,7 @@ 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/ChillMainBundle/Form/UserType.php

@@ -18,6 +18,7 @@ use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ChillPhoneNumberType;
 use Chill\MainBundle\Form\Type\PickCivilityType;
+use Chill\MainBundle\Repository\UserJobRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\EntityRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
@@ -36,7 +37,7 @@ use Symfony\Component\Validator\Constraints\Regex;
 
 class UserType extends AbstractType
 {
-    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper, protected ParameterBagInterface $parameterBag) {}
+    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper, protected ParameterBagInterface $parameterBag, private readonly UserJobRepository $userJobRepository) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -80,12 +81,7 @@ class UserType extends AbstractType
                 'placeholder' => 'choose a job',
                 'class' => UserJob::class,
                 'choice_label' => fn (UserJob $c) => $this->translatableStringHelper->localize($c->getLabel()),
-                'query_builder' => static function (EntityRepository $er) {
-                    $qb = $er->createQueryBuilder('uj');
-                    $qb->where('uj.active = TRUE');
-
-                    return $qb;
-                },
+                'choices' => $this->loadAndSortUserJobs(),
             ])
             ->add('mainLocation', EntityType::class, [
                 'label' => 'Main location',
@@ -96,6 +92,7 @@ class UserType extends AbstractType
                 'query_builder' => static function (EntityRepository $er) {
                     $qb = $er->createQueryBuilder('l');
                     $qb->orderBy('l.locationType');
+                    $qb->orderBy('l.name', 'ASC');
                     $qb->where('l.availableForUsers = TRUE');
 
                     return $qb;
@@ -155,6 +152,20 @@ class UserType extends AbstractType
         }
     }
 
+    private function loadAndSortUserJobs(): array
+    {
+        $items = $this->userJobRepository->findBy(['active' => true]);
+
+        usort(
+            $items,
+            fn ($a, $b) => mb_strtolower((string) $this->translatableStringHelper->localize($a->getLabel()))
+            <=>
+            mb_strtolower((string) $this->translatableStringHelper->localize($b->getLabel()))
+        );
+
+        return $items;
+    }
+
     /**
      * @param OptionsResolverInterface $resolver
      */

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue

@@ -20,16 +20,16 @@
                     </ul>
                 </div>
                 <ul class="record_actions">
-                    <li>
-                        <button class="btn btn-save" disabled>
-                            {{ $t("confirm.ok") }}
-                        </button>
-                    </li>
                     <li>
                         <a class="btn btn-delete" :href="deleteLink">
                             {{ $t("confirm.delete") }}
                         </a>
                     </li>
+                    <li>
+                        <button class="btn btn-save" disabled>
+                            {{ $t("confirm.ok") }}
+                        </button>
+                    </li>
                 </ul>
             </div>
 
@@ -40,6 +40,11 @@
                     "
                 />
                 <ul class="record_actions">
+                    <li>
+                        <a class="btn btn-delete" :href="deleteLink">
+                            {{ $t("confirm.delete") }}
+                        </a>
+                    </li>
                     <li>
                         <button
                             class="btn btn-save"
@@ -48,11 +53,6 @@
                             {{ $t("confirm.ok") }}
                         </button>
                     </li>
-                    <li>
-                        <a class="btn btn-delete" :href="deleteLink">
-                            {{ $t("confirm.delete") }}
-                        </a>
-                    </li>
                 </ul>
             </div>
         </div>
@@ -112,7 +112,7 @@
                 </template>
                 <template #footer>
                     <button
-                        class="btn btn-danger"
+                        class="btn btn-save"
                         :disabled="disableConfirm"
                         @click="confirmCourse"
                     >