Update chill bundles to v4.8.2

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/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/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/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/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"
                     >