Add missing fixtures for proper loading of AccompanyingPeriods

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/DX-20251030-123732.yaml

@@ -0,0 +1,6 @@
+kind: DX
+body: Add missing fixtures for proper loading of AccompanyingPeriods
+time: 2025-10-30T12:37:32.824593456+01:00
+custom:
+    Issue: "280"
+    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/Fixed-20251119-133324.yaml

@@ -1,6 +0,0 @@
-kind: Fixed
-body: Insert name of file as the document title when uploading
-time: 2025-11-19T13:33:24.778116633+01:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change

.changes/unreleased/Fixed-20251119-134802.yaml

@@ -1,6 +0,0 @@
-kind: Fixed
-body: Add missing path paramater 'id' for editing multiple participations
-time: 2025-11-19T13:48:02.078949572+01:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change

.changes/unreleased/Fixed-20251119-161233.yaml

@@ -1,7 +0,0 @@
-kind: Fixed
-body: |
-    Hide the display of inactive user groups in the api
-time: 2025-11-19T16:12:33.803084517+01:00
-custom:
-    Issue: "471"
-    SchemaChange: No schema change

.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

.changes/v4.8.1.md

@@ -0,0 +1,6 @@
+## v4.8.1 - 2025-11-20
+### Fixed
+* Insert name of file as the document title when uploading   
+* Add missing path paramater 'id' for editing multiple participations   
+* ([#471](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/471)) Hide the display of inactive user groups in the api
+   

CHANGELOG.md

@@ -6,6 +6,13 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v4.8.1 - 2025-11-20
+### Fixed
+* Insert name of file as the document title when uploading   
+* Add missing path paramater 'id' for editing multiple participations   
+* ([#471](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/471)) Hide the display of inactive user groups in the api
+   
+
 ## v4.8.0 - 2025-11-17
 ### Feature
 * ([#461](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/461)) Make a calendar item on the 'mes rendez-vous' page clickable. Clicking will navigate to the edit page of the calendar item.   

composer.json

@@ -7,13 +7,6 @@
         "chill",
         "social worker"
     ],
-    "repositories": [{
-        "type": "path",
-        "url": "./packages/ChillZimbraBundle",
-        "options": {
-            "symlink": true
-        }
-    }],
     "require": {
         "php": "^8.2",
         "ext-dom": "*",
@@ -21,7 +14,6 @@
         "ext-openssl": "*",
         "ext-redis": "*",
         "ext-zlib": "*",
-        "chill-project/chill-zimbra-bundle": "@dev",
         "champs-libres/wopi-bundle": "dev-symfony-v5@dev",
         "champs-libres/wopi-lib": "dev-master@dev",
         "doctrine/data-fixtures": "^1.8",

config/bundles.php

@@ -37,5 +37,4 @@ return [
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
     Symfony\UX\Translator\UxTranslatorBundle::class => ['all' => true],
     loophp\PsrHttpMessageBridgeBundle\PsrHttpMessageBridgeBundle::class => ['all' => true],
-    Chill\ZimbraBundle\ChillZimbraBundle::class => ['all' => true],
 ];

package.json

@@ -11,7 +11,6 @@
     "@hotwired/stimulus": "^3.0.0",
     "@luminateone/eslint-baseline": "^1.0.9",
     "@symfony/stimulus-bridge": "^3.2.0",
-    "@symfony/ux-translator": "file:vendor/symfony/ux-translator/assets",
     "@symfony/webpack-encore": "^4.1.0",
     "@tsconfig/node20": "^20.1.4",
     "@types/dompurify": "^3.0.5",

packages/ChillZimbraBundle/composer.json

@@ -1,22 +0,0 @@
-{
-    "name": "chill-project/chill-zimbra-bundle",
-    "description": "Provide connection between Zimbra agenda and Chill",
-    "minimum-stability": "stable",
-    "license": "AGPL-3.0",
-    "type": "library",
-    "keywords": [
-        "chill",
-        "social worker"
-    ],
-    "require": {
-        "chill-project/chill-bundles": "dev-master@dev",
-        "zimbra-api/soap-api": "^3.2.2",
-        "psr/http-client": "^1.0",
-        "nyholm/psr7": "^1.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Chill\\ZimbraBundle\\": "src/"
-        }
-    }
-}

packages/ChillZimbraBundle/src/ChillZimbraBundle.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace Chill\ZimbraBundle;
-
-use Symfony\Component\HttpKernel\Bundle\Bundle;
-
-class ChillZimbraBundle extends Bundle
-{
-
-}

packages/ChillZimbraBundle/src/DependencyInjection/ChillZimbraExtension.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace Chill\ZimbraBundle\DependencyInjection;
-
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Extension\Extension;
-use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
-
-class ChillZimbraExtension extends Extension
-{
-    public function load(array $configs, ContainerBuilder $container)
-    {
-        $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
-        $loader->load('services.yaml');
-    }
-
-}

packages/ChillZimbraBundle/src/config/services.yaml

@@ -1,8 +0,0 @@
-services:
-    _defaults:
-        autoconfigure: true
-        autowire: true
-
-    Chill\ZimbraBundle\Command\:
-        resource: '../Command'
-        tags: ['console.command']

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/ChillMainBundle/DataFixtures/ORM/LoadAdministrativeLocation.php

@@ -0,0 +1,45 @@
+<?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\MainBundle\DataFixtures\ORM;
+
+use Chill\MainBundle\Entity\Location;
+use Chill\MainBundle\Entity\LocationType;
+use Doctrine\Common\DataFixtures\AbstractFixture;
+use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
+
+class LoadAdministrativeLocation extends AbstractFixture implements OrderedFixtureInterface
+{
+    final public const ADMINISTRATIVE_LOCATION = 'administrative_location';
+
+    public function getOrder(): int
+    {
+        return 9000;
+    }
+
+    public function load(ObjectManager $manager): void
+    {
+        $o = new Location();
+        /** @var LocationType $locationType */
+        $locationType = $this->getReference(LoadLocationType::LOCATION_TYPE.'_0');
+        $o->setLocationType($locationType);
+        $o->setName('Commune de Bruxelles');
+        $o->setAvailableForUsers(true);
+
+        $manager->persist($o);
+
+        $this->addReference(self::ADMINISTRATIVE_LOCATION, $o);
+        echo "Adding one Administrative Location\n";
+
+        $manager->flush();
+    }
+}

src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php

@@ -25,6 +25,8 @@ class LoadLocationType extends AbstractFixture implements ContainerAwareInterfac
 {
     private ?ContainerInterface $container = null;
 
+    final public const LOCATION_TYPE = 'location_type';
+
     public function getOrder(): int
     {
         return 52;
@@ -53,13 +55,15 @@ class LoadLocationType extends AbstractFixture implements ContainerAwareInterfac
             ],
         ];
 
-        foreach ($arr as $a) {
+        foreach ($arr as $index => $a) {
             $locationType = (new LocationType())
                 ->setTitle($a['name'])
                 ->setAvailableForUsers(true)
                 ->setActive(true)
                 ->setAddressRequired($a['address_required']);
             $manager->persist($locationType);
+
+            $this->addReference(self::LOCATION_TYPE.'_'.$index, $locationType);
         }
 
         $manager->flush();

src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUserJob.php

@@ -0,0 +1,41 @@
+<?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\MainBundle\DataFixtures\ORM;
+
+use Chill\MainBundle\Entity\UserJob;
+use Doctrine\Common\DataFixtures\AbstractFixture;
+use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
+
+class LoadUserJob extends AbstractFixture implements OrderedFixtureInterface
+{
+    final public const USER_JOB = 'user_job';
+    private array $socialWorker = ['en' => 'social worker', 'fr' => 'travailleur social'];
+
+    public function getOrder(): int
+    {
+        return 9000;
+    }
+
+    public function load(ObjectManager $manager): void
+    {
+        $o = new UserJob();
+        $o->setLabel($this->socialWorker);
+
+        $manager->persist($o);
+
+        $this->addReference(self::USER_JOB, $o);
+        echo "Adding one AccompanyingPeriod User Job\n";
+
+        $manager->flush();
+    }
+}

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) {
+                'choices' => $this->loadAndSortUserJobs(),
-                    $qb = $er->createQueryBuilder('uj');
-                    $qb->where('uj.active = TRUE');
-
-                    return $qb;
-                },
             ])
             ->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/DataFixtures/ORM/LoadPeople.php

@@ -11,15 +11,19 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\DataFixtures\ORM;
 
+use Chill\MainBundle\DataFixtures\ORM\LoadAdministrativeLocation;
 use Chill\MainBundle\DataFixtures\ORM\LoadPostalCodes;
+use Chill\MainBundle\DataFixtures\ORM\LoadUserJob;
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Country;
 use Chill\MainBundle\Entity\Gender;
 use Chill\MainBundle\Entity\GenderEnum;
+use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\PostalCode;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Repository\CenterRepository;
 use Chill\MainBundle\Repository\CountryRepository;
 use Chill\MainBundle\Repository\GenderRepository;
@@ -362,6 +366,10 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
             $origin = $this->getReference(LoadAccompanyingPeriodOrigin::ACCOMPANYING_PERIOD_ORIGIN, AccompanyingPeriod\Origin::class);
             $accompanyingPeriod->setOrigin($origin);
             $accompanyingPeriod->setIntensity('regular');
+            $userJob = $this->getReference(LoadUserJob::USER_JOB, UserJob::class);
+            $accompanyingPeriod->setJob($userJob);
+            $administrativeLocation = $this->getReference(LoadAdministrativeLocation::ADMINISTRATIVE_LOCATION, Location::class);
+            $accompanyingPeriod->setAdministrativeLocation($administrativeLocation);
             $accompanyingPeriod->setAddressLocation($this->createAddress());
             $manager->persist($accompanyingPeriod->getAddressLocation());
             $workflow = $this->workflowRegistry->get($accompanyingPeriod);

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

symfony.lock

@@ -2,9 +2,6 @@
     "champs-libres/wopi-bundle": {
         "version": "dev-master"
     },
-    "chill-project/chill-zimbra-bundle": {
-        "version": "dev-472-zimbra-connector"
-    },
     "doctrine/annotations": {
         "version": "1.14",
         "recipe": {