Correct visibility condition in ChillAsideActivityExtension.php

config/packages/chill_aside_activity.yaml

@@ -0,0 +1,2 @@
+chill_aside_activity:
+    show_concerned_persons_count: hidden

src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php

@@ -25,6 +25,7 @@ final class ChillAsideActivityExtension extends Extension implements PrependExte
         $config = $this->processConfiguration($configuration, $configs);
 
         $container->setParameter('chill_aside_activity.form.time_duration', $config['form']['time_duration']);
+        $container->setParameter('chill_aside_activity.show_concerned_persons_count', 'visible' === $config['show_concerned_persons_count']);
 
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services.yaml');
@@ -38,6 +39,24 @@ final class ChillAsideActivityExtension extends Extension implements PrependExte
     {
         $this->prependRoute($container);
         $this->prependCruds($container);
+        $this->prependTwigConfig($container);
+    }
+
+    protected function prependTwigConfig(ContainerBuilder $container)
+    {
+        // Get the configuration for this bundle
+        $chillAsideActivityConfig = $container->getExtensionConfig($this->getAlias());
+        $config = $this->processConfiguration($this->getConfiguration($chillAsideActivityConfig, $container), $chillAsideActivityConfig);
+
+        // Add configuration to twig globals
+        $twigConfig = [
+            'globals' => [
+                'chill_aside_activity_config' => [
+                    'show_concerned_persons_count' => 'visible' === $config['show_concerned_persons_count'],
+                ],
+            ],
+        ];
+        $container->prependExtensionConfig('twig', $twigConfig);
     }
 
     protected function prependCruds(ContainerBuilder $container)

src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php

@@ -141,6 +141,12 @@ class Configuration implements ConfigurationInterface
             ->end()
             ->end()
             ->end()
+            ->end()
+            ->enumNode('show_concerned_persons_count')
+            ->values(['hidden', 'visible'])
+            ->defaultValue('hidden')
+            ->info('Show the concerned persons count field in aside activity forms and views')
+            ->end()
             ->end();
 
         return $treeBuilder;

src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php

@@ -62,6 +62,10 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
     #[ORM\ManyToOne(targetEntity: User::class)]
     private User $updatedBy;
 
+    #[Assert\GreaterThanOrEqual(0)]
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER, nullable: true)]
+    private ?int $concernedPersonsCount = 0;
+
     public function getAgent(): ?User
     {
         return $this->agent;
@@ -186,4 +190,16 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
 
         return $this;
     }
+
+    public function getConcernedPersonsCount(): ?int
+    {
+        return $this->concernedPersonsCount;
+    }
+
+    public function setConcernedPersonsCount(?int $concernedPersonsCount): self
+    {
+        $this->concernedPersonsCount = $concernedPersonsCount;
+
+        return $this;
+    }
 }

src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByConcernedPersonsCountAggregator.php

@@ -0,0 +1,86 @@
+<?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\AsideActivityBundle\Export\Aggregator;
+
+use Chill\AsideActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class ByConcernedPersonsCountAggregator implements AggregatorInterface
+{
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    {
+        $qb->addSelect('aside.concernedPersonsCount AS by_concerned_persons_count_aggregator')
+            ->addGroupBy('by_concerned_persons_count_aggregator');
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ASIDE_ACTIVITY_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder): void
+    {
+        // No form needed
+    }
+
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getLabels($key, array $values, $data): callable
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'export.aggregator.Concerned persons count';
+            }
+
+            if (null === $value) {
+                return 'export.aggregator.No concerned persons count specified';
+            }
+
+            return (string) $value;
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['by_concerned_persons_count_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.aggregator.Group by concerned persons count';
+    }
+}

src/Bundle/ChillAsideActivityBundle/src/Export/Export/SumConcernedPersonsCountAsideActivity.php

@@ -0,0 +1,116 @@
+<?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\AsideActivityBundle\Export\Export;
+
+use Chill\AsideActivityBundle\Export\Declarations;
+use Chill\AsideActivityBundle\Repository\AsideActivityRepository;
+use Chill\AsideActivityBundle\Security\AsideActivityVoter;
+use Chill\MainBundle\Export\ExportInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Doctrine\ORM\Query;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class SumConcernedPersonsCountAsideActivity implements ExportInterface, GroupedExportInterface
+{
+    public function __construct(private readonly AsideActivityRepository $repository) {}
+
+    public function buildForm(FormBuilderInterface $builder) {}
+
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getAllowedFormattersTypes(): array
+    {
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
+    public function getDescription(): string
+    {
+        return 'export.Sum concerned persons count for aside activities';
+    }
+
+    public function getGroup(): string
+    {
+        return 'export.Exports of aside activities';
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        if ('export_sum_concerned_persons_count' !== $key) {
+            throw new \LogicException("the key {$key} is not used by this export");
+        }
+
+        $labels = array_combine($values, $values);
+        $labels['_header'] = $this->getTitle();
+
+        return static fn ($value) => $labels[$value];
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['export_sum_concerned_persons_count'];
+    }
+
+    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
+    {
+        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.Sum concerned persons count for aside activities';
+    }
+
+    public function getType(): string
+    {
+        return Declarations::ASIDE_ACTIVITY_TYPE;
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
+    {
+        $qb = $this->repository->createQueryBuilder('aside');
+
+        $qb->select('SUM(COALESCE(aside.concernedPersonsCount, 0)) as export_sum_concerned_persons_count');
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return AsideActivityVoter::STATS;
+    }
+
+    public function supportsModifiers(): array
+    {
+        return [
+            Declarations::ASIDE_ACTIVITY_TYPE,
+        ];
+    }
+}

src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php

@@ -21,6 +21,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\IntegerType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
@@ -29,11 +30,13 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 final class AsideActivityFormType extends AbstractType
 {
     private readonly array $timeChoices;
+    private readonly bool $showConcernedPersonsCount;
 
     public function __construct(
         ParameterBagInterface $parameterBag,
     ) {
         $this->timeChoices = $parameterBag->get('chill_aside_activity.form.time_duration');
+        $this->showConcernedPersonsCount = $parameterBag->get('chill_aside_activity.show_concerned_persons_count');
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -76,6 +79,16 @@ final class AsideActivityFormType extends AbstractType
             ->add('location', PickUserLocationType::class)
         ;
 
+        if ($this->showConcernedPersonsCount) {
+            $builder->add('concernedPersonsCount', IntegerType::class, [
+                'label' => 'Concerned persons count',
+                'required' => false,
+                'attr' => [
+                    'min' => 0,
+                ],
+            ]);
+        }
+
         foreach (['duration'] as $fieldName) {
             $builder->get($fieldName)
                 ->addModelTransformer($durationTimeTransformer);

src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig

@@ -42,6 +42,11 @@
                                 {%- if entity.location.name is defined -%}
                                     <div><i class="fa fa-fw fa-map-marker"></i>{{ entity.location.name }}</div>
                                 {%- endif -%}
+
+                                {%- if entity.concernedPersonsCount > 0 -%}
+                                    <div><i class="fa fa-fw fa-user"></i>{{ entity.concernedPersonsCount }}</div>
+                                {%- endif -%}
+
 							</div>
 							<div class="item-col" style="justify-content: flex-end;">
 								<div class="box">

src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig

@@ -38,6 +38,11 @@
 				<dt class="inline">{{ 'Duration'|trans }}</dt>
 				<dd>{{ entity.duration|date('H:i') }}</dd>
 
+                {% if chill_aside_activity_config.show_concerned_persons_count == 'visible' %}
+                    <dt class="inline">{{ 'Concerned persons count'|trans }}</dt>
+                    <dd>{{ entity.concernedPersonsCount }}</dd>
+                {% endif %}
+
 				<dt class="inline">{{ 'Remark'|trans }}</dt>
 				{%- if entity.note is empty -%}
 					<dd>

src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Aggregator/ByConcernedPersonsCountAggregatorTest.php

@@ -0,0 +1,49 @@
+<?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\AsideActivityBundle\Tests\Export\Aggregator;
+
+use Chill\AsideActivityBundle\Entity\AsideActivity;
+use Chill\AsideActivityBundle\Export\Aggregator\ByConcernedPersonsCountAggregator;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class ByConcernedPersonsCountAggregatorTest extends AbstractAggregatorTest
+{
+    public function getAggregator()
+    {
+        return new ByConcernedPersonsCountAggregator();
+    }
+
+    public static function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public static function getQueryBuilders(): iterable
+    {
+        self::bootKernel();
+        $em = self::getContainer()->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(aside.id)')
+                ->from(AsideActivity::class, 'aside'),
+        ];
+    }
+}

src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Export/SumConcernedPersonsCountAsideActivityTest.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\AsideActivityBundle\Tests\Export\Export;
+
+use Chill\AsideActivityBundle\Export\Export\SumConcernedPersonsCountAsideActivity;
+use Chill\AsideActivityBundle\Repository\AsideActivityRepository;
+use Chill\MainBundle\Test\Export\AbstractExportTest;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+final class SumConcernedPersonsCountAsideActivityTest extends AbstractExportTest
+{
+    protected function setUp(): void
+    {
+        self::bootKernel();
+    }
+
+    public function getExport()
+    {
+        $repository = self::getContainer()->get(AsideActivityRepository::class);
+
+        yield new SumConcernedPersonsCountAsideActivity($repository);
+    }
+
+    public static function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public static function getModifiersCombination(): array
+    {
+        return [
+            ['aside_activity'],
+        ];
+    }
+}

src/Bundle/ChillAsideActivityBundle/src/config/services/export.yaml

@@ -20,6 +20,10 @@ services:
       tags:
           - { name: chill.export, alias: 'avg_aside_activity_duration' }
 
+  Chill\AsideActivityBundle\Export\Export\SumConcernedPersonsCountAsideActivity:
+      tags:
+          - { name: chill.export, alias: 'sum_aside_activity_concerned_persons_count' }
+
   ## Filters
   chill.aside_activity.export.date_filter:
     class: Chill\AsideActivityBundle\Export\Filter\ByDateFilter
@@ -70,3 +74,7 @@ services:
   Chill\AsideActivityBundle\Export\Aggregator\ByLocationAggregator:
       tags:
           - { name: chill.export_aggregator, alias: 'aside_activity_location_aggregator' }
+
+  Chill\AsideActivityBundle\Export\Aggregator\ByConcernedPersonsCountAggregator:
+      tags:
+          - { name: chill.export_aggregator, alias: 'aside_activity_concerned_persons_count_aggregator' }

src/Bundle/ChillAsideActivityBundle/src/migrations/Version20251006113048.php

@@ -9,25 +9,25 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\Migrations\Main;
+namespace Chill\Migrations\AsideActivity;
 
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
-final class Version20251022140718 extends AbstractMigration
+final class Version20251006113048 extends AbstractMigration
 {
     public function getDescription(): string
     {
-        return 'Add locale field to users table for user language preferences';
+        return 'Add concernedPersonsCount property to AsideActivity entity';
     }
 
     public function up(Schema $schema): void
     {
-        $this->addSql('ALTER TABLE users ADD locale VARCHAR(5) DEFAULT \'fr\' NOT NULL');
+        $this->addSql('ALTER TABLE chill_asideactivity.asideactivity ADD concernedPersonsCount INT DEFAULT 0');
     }
 
     public function down(Schema $schema): void
     {
-        $this->addSql('ALTER TABLE users DROP locale');
+        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity DROP concernedPersonsCount');
     }
 }

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

@@ -27,6 +27,7 @@ Emergency: Urgent
 by: "Par "
 location: Lieu
 Asideactivity location: Localisation de l'activité
+Concerned persons count: Nombre d'usager concernés
 
 # Crud
 crud:
@@ -190,6 +191,7 @@ export:
     Count aside activities by various parameters.: Compte le nombre d'activités annexes selon divers critères
     Average aside activities duration: Durée moyenne des activités annexes
     Sum aside activities duration: Durée des activités annexes
+    Sum concerned persons count for aside activities: Nombre d'usager concernés par les activités annexes
     filter:
         Filter by aside activity date: Filtrer les activités annexes par date
         Filter by aside activity type: Filtrer les activités annexes par type d'activité
@@ -210,6 +212,8 @@ export:
         'Filtered by aside activity location: only %location%': "Filtré par localisation: uniquement %location%"
     aggregator:
         Group by aside activity type: Grouper les activités annexes par type d'activité
+        Group by concerned persons count: Grouper les activités annexes par nombre d'usagers conernés
+        Concerned persons count: Nombre d'usagers concernés
         Aside activity type: Type d'activité annexe
         by_user_job:
             Aggregate by user job: Grouper les activités annexes par métier des utilisateurs

src/Bundle/ChillDocGeneratorBundle/Service/Messenger/OnGenerationFails.php

@@ -25,8 +25,6 @@ use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Messenger\Event\WorkerMessageFailedEvent;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-// use Symfony\Component\Translation\LocaleSwitcher;
-
 /**
  * @see OnGenerationFailsTest for test suite
  */
@@ -42,7 +40,6 @@ final readonly class OnGenerationFails implements EventSubscriberInterface
         private StoredObjectRepositoryInterface $storedObjectRepository,
         private TranslatorInterface $translator,
         private UserRepositoryInterface $userRepository,
-        // private LocaleSwitcher $localeSwitcher,
     ) {}
 
     public static function getSubscribedEvents()
@@ -121,25 +118,6 @@ final readonly class OnGenerationFails implements EventSubscriberInterface
             return;
         }
 
-        // Implementation with LocaleSwitcher (commented out - to be activated after migration to sf7.2):
-        /*
-        $this->localeSwitcher->runWithLocale($creator->getLocale(), function () use ($message, $errors, $template, $creator) {
-            $email = (new TemplatedEmail())
-                ->to($message->getSendResultToEmail())
-                ->subject($this->translator->trans('docgen.failure_email.The generation of a document failed'))
-                ->textTemplate('@ChillDocGenerator/Email/on_generation_failed_email.txt.twig')
-                ->context([
-                    'errors' => $errors,
-                    'template' => $template,
-                    'creator' => $creator,
-                    'stored_object_id' => $message->getDestinationStoredObjectId(),
-                ]);
-
-            $this->mailer->send($email);
-        });
-        */
-
-        // Current implementation:
         $email = (new TemplatedEmail())
             ->to($message->getSendResultToEmail())
             ->subject($this->translator->trans('docgen.failure_email.The generation of a document failed'))

src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php

@@ -27,8 +27,6 @@ use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-// use Symfony\Component\Translation\LocaleSwitcher;
-
 /**
  * Handle the request of document generation.
  */
@@ -48,7 +46,6 @@ class RequestGenerationHandler implements MessageHandlerInterface
         private readonly MailerInterface $mailer,
         private readonly TranslatorInterface $translator,
         private readonly StoredObjectManagerInterface $storedObjectManager,
-        // private readonly LocaleSwitcher $localeSwitcher,
     ) {}
 
     public function __invoke(RequestGenerationMessage $message)
@@ -125,30 +122,6 @@ class RequestGenerationHandler implements MessageHandlerInterface
 
     private function sendDataDump(StoredObject $destinationStoredObject, RequestGenerationMessage $message): void
     {
-        // Implementation with LocaleSwitcher (commented out - to be activated after migration to sf7.2):
-        // Note: This method sends emails to admin addresses, not user addresses, so locale switching may not be needed
-        /*
-        $this->localeSwitcher->runWithLocale('fr', function () use ($destinationStoredObject, $message) {
-            // Get the content of the document
-            $content = $this->storedObjectManager->read($destinationStoredObject);
-            $filename = $destinationStoredObject->getFilename();
-            $contentType = $destinationStoredObject->getType();
-
-            // Create the email with the document as an attachment
-            $email = (new TemplatedEmail())
-                ->to($message->getSendResultToEmail())
-                ->textTemplate('@ChillDocGenerator/Email/send_data_dump_to_admin.txt.twig')
-                ->context([
-                    'filename' => $filename,
-                ])
-                ->subject($this->translator->trans('docgen.data_dump_email.subject'))
-                ->attach($content, $filename, $contentType);
-
-            $this->mailer->send($email);
-        });
-        */
-
-        // Current implementation:
         // Get the content of the document
         $content = $this->storedObjectManager->read($destinationStoredObject);
         $filename = $destinationStoredObject->getFilename();

src/Bundle/ChillMainBundle/Action/User/UpdateProfile/UpdateProfileCommand.php

@@ -15,7 +15,6 @@ use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Notification\NotificationFlagManager;
 use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
 use libphonenumber\PhoneNumber;
-use Symfony\Component\Validator\Constraints as Assert;
 
 final class UpdateProfileCommand
 {
@@ -24,13 +23,11 @@ final class UpdateProfileCommand
     public function __construct(
         #[PhonenumberConstraint]
         public ?PhoneNumber $phonenumber,
-        #[Assert\Choice(choices: ['fr', 'nl'], message: 'Locale must be either "fr" or "nl"')]
-        public string $locale = 'fr',
     ) {}
 
     public static function create(User $user, NotificationFlagManager $flagManager): self
     {
-        $updateProfileCommand = new self($user->getPhonenumber(), $user->getLocale());
+        $updateProfileCommand = new self($user->getPhonenumber());
 
         foreach ($flagManager->getAllNotificationFlagProviders() as $provider) {
             $updateProfileCommand->setNotificationFlag(

src/Bundle/ChillMainBundle/Action/User/UpdateProfile/UpdateProfileCommandHandler.php

@@ -18,7 +18,6 @@ final readonly class UpdateProfileCommandHandler
     public function updateProfile(User $user, UpdateProfileCommand $command): void
     {
         $user->setPhonenumber($command->phonenumber);
-        $user->setLocale($command->locale);
 
         foreach ($command->notificationFlags as $flag => $values) {
             $user->setNotificationImmediately($flag, $values['immediate_email']);

src/Bundle/ChillMainBundle/Entity/User.php

@@ -128,12 +128,6 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON, nullable: false, options: ['default' => '[]', 'jsonb' => true])]
     private array $notificationFlags = [];
 
-    /**
-     * User's preferred locale.
-     */
-    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, length: 5, nullable: false, options: ['default' => 'fr'])]
-    private string $locale = 'fr';
-
     /**
      * User constructor.
      */
@@ -722,18 +716,7 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
 
     public function getLocale(): string
     {
-        return $this->locale;
-    }
-
-    public function setLocale(string $locale): self
-    {
-        if (!in_array($locale, ['fr', 'nl'], true)) {
-            throw new \InvalidArgumentException('Locale must be either "fr" or "nl"');
-        }
-
-        $this->locale = $locale;
-
-        return $this;
+        return 'fr';
     }
 
     #[Assert\Callback]

src/Bundle/ChillMainBundle/Form/Type/UserLocaleType.php

@@ -1,38 +0,0 @@
-<?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\Form\Type;
-
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-class UserLocaleType extends AbstractType
-{
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults([
-            'choices' => [
-                'user.locale.choice.french' => 'fr',
-                'user.locale.choice.dutch' => 'nl',
-            ],
-            'placeholder' => 'user.locale.placeholder',
-            'required' => true,
-            'label' => 'user.locale.label',
-            'help' => 'user.locale.help',
-        ]);
-    }
-
-    public function getParent(): string
-    {
-        return ChoiceType::class;
-    }
-}

src/Bundle/ChillMainBundle/Form/UpdateProfileType.php

@@ -14,7 +14,6 @@ namespace Chill\MainBundle\Form;
 use Chill\MainBundle\Action\User\UpdateProfile\UpdateProfileCommand;
 use Chill\MainBundle\Form\Type\ChillPhoneNumberType;
 use Chill\MainBundle\Form\Type\NotificationFlagsType;
-use Chill\MainBundle\Form\Type\UserLocaleType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -27,7 +26,6 @@ class UpdateProfileType extends AbstractType
             ->add('phonenumber', ChillPhoneNumberType::class, [
                 'required' => false,
             ])
-            ->add('locale', UserLocaleType::class)
             ->add('notificationFlags', NotificationFlagsType::class)
         ;
     }

src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php

@@ -24,8 +24,6 @@ use Symfony\Component\Mime\Email;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-// use Symfony\Component\Translation\LocaleSwitcher;
-
 readonly class NotificationMailer
 {
     public function __construct(
@@ -33,7 +31,6 @@ readonly class NotificationMailer
         private LoggerInterface $logger,
         private MessageBusInterface $messageBus,
         private TranslatorInterface $translator,
-        // private LocaleSwitcher $localeSwitcher,
     ) {}
 
     public function postPersistComment(NotificationComment $comment, PostPersistEventArgs $eventArgs): void
@@ -59,7 +56,7 @@ readonly class NotificationMailer
             $email
                 ->to($dest->getEmail())
                 ->subject('Re: '.$comment->getNotification()->getTitle())
-                ->textTemplate('@ChillMain/Notification/email_notification_comment_persist.md.twig')
+                ->textTemplate('@ChillMain/Notification/email_notification_comment_persist.fr.md.twig')
                 ->context([
                     'comment' => $comment,
                     'dest' => $dest,
@@ -140,53 +137,13 @@ readonly class NotificationMailer
             return;
         }
 
-        // Implementation with LocaleSwitcher (commented out - to be activated after migration to sf7.2):
-        /*
-        $this->localeSwitcher->runWithLocale($addressee->getLocale(), function () use ($notification, $addressee) {
-            if ($notification->isSystem()) {
-                $email = new Email();
-                $email->text($notification->getMessage());
-            } else {
-                $email = new TemplatedEmail();
-                $email
-                    ->textTemplate('@ChillMain/Notification/email_non_system_notification_content.md.twig')
-                    ->context([
-                        'notification' => $notification,
-                        'dest' => $addressee,
-                    ]);
-            }
-
-            $email
-                ->subject($notification->getTitle())
-                ->to($addressee->getEmail());
-
-            try {
-                $this->mailer->send($email);
-                $this->logger->info('[NotificationMailer] Email sent successfully', [
-                    'notification_id' => $notification->getId(),
-                    'addressee_email' => $addressee->getEmail(),
-                    'locale' => $addressee->getLocale(),
-                ]);
-            } catch (TransportExceptionInterface $e) {
-                $this->logger->warning('[NotificationMailer] Could not send an email notification', [
-                    'to' => $addressee->getEmail(),
-                    'notification_id' => $notification->getId(),
-                    'error_message' => $e->getMessage(),
-                    'error_trace' => $e->getTraceAsString(),
-                ]);
-                throw $e;
-            }
-        });
-        */
-
-        // Current implementation:
         if ($notification->isSystem()) {
             $email = new Email();
             $email->text($notification->getMessage());
         } else {
             $email = new TemplatedEmail();
             $email
-                ->textTemplate('@ChillMain/Notification/email_non_system_notification_content.md.twig')
+                ->textTemplate('@ChillMain/Notification/email_non_system_notification_content.fr.md.twig')
                 ->context([
                     'notification' => $notification,
                     'dest' => $addressee,
@@ -225,43 +182,9 @@ readonly class NotificationMailer
             return;
         }
 
-        // Implementation with LocaleSwitcher (commented out - to be activated after migration to sf7.2):
-        /*
-        $this->localeSwitcher->runWithLocale($user->getLocale(), function () use ($user, $notifications) {
-            $email = new TemplatedEmail();
-            $email
-                ->htmlTemplate('@ChillMain/Notification/email_daily_digest.md.twig')
-                ->context([
-                    'user' => $user,
-                    'notifications' => $notifications,
-                    'notification_count' => count($notifications),
-                ])
-                ->subject($this->translator->trans('notification.Daily Notification Digest'))
-                ->to($user->getEmail());
-
-            try {
-                $this->mailer->send($email);
-                $this->logger->info('[NotificationMailer] Daily digest email sent successfully', [
-                    'user_email' => $user->getEmail(),
-                    'notification_count' => count($notifications),
-                    'locale' => $user->getLocale(),
-                ]);
-            } catch (TransportExceptionInterface $e) {
-                $this->logger->warning('[NotificationMailer] Could not send daily digest email', [
-                    'to' => $user->getEmail(),
-                    'notification_count' => count($notifications),
-                    'error_message' => $e->getMessage(),
-                    'error_trace' => $e->getTraceAsString(),
-                ]);
-                throw $e;
-            }
-        });
-        */
-
-        // Current implementation:
         $email = new TemplatedEmail();
         $email
-            ->htmlTemplate('@ChillMain/Notification/email_daily_digest.md.twig')
+            ->htmlTemplate('@ChillMain/Notification/email_daily_digest.fr.md.twig')
             ->context([
                 'user' => $user,
                 'notifications' => $notifications,
@@ -299,7 +222,7 @@ readonly class NotificationMailer
 
             $email = new TemplatedEmail();
             $email
-                ->textTemplate('@ChillMain/Notification/email_non_system_notification_content_to_email.md.twig')
+                ->textTemplate('@ChillMain/Notification/email_non_system_notification_content_to_email.fr.md.twig')
                 ->context([
                     'notification' => $notification,
                     'dest' => $emailAddress,

src/Bundle/ChillMainBundle/Resources/views/Notification/email_non_system_notification_content.fr.md.twig

@@ -14,7 +14,7 @@
 
 Vous pouvez visualiser la notification et y répondre ici:
 
-{{ absolute_url(path('chill_main_notification_show', {'_locale': dest.locale, 'id': notification.id }, false)) }}
+{{ absolute_url(path('chill_main_notification_show', {'_locale': 'fr', 'id': notification.id }, false)) }}
 
 --
 Le logiciel Chill

src/Bundle/ChillMainBundle/Resources/views/Notification/email_notification_comment_persist.fr.md.twig

@@ -13,7 +13,7 @@ Commentaire:
 
 Vous pouvez visualiser la notification et y répondre ici:
 
-{{ absolute_url(path('chill_main_notification_show', {'_locale': dest.locale, 'id': comment.notification.id }, false)) }}
+{{ absolute_url(path('chill_main_notification_show', {'_locale': 'fr', 'id': comment.notification.id }, false)) }}
 
 --
 Le logiciel Chill

src/Bundle/ChillMainBundle/Resources/views/User/profile.html.twig

@@ -71,8 +71,6 @@
                 </tbody>
             </table>
 
-            {{ form_row(form.locale) }}
-
             <ul class="record_actions">
                 <li>
                     <button type="submit" class="btn btn-save">{{ 'Save'|trans }}</button>

src/Bundle/ChillMainBundle/Resources/views/Workflow/workflow_notification_on_transition_completed_content.fr.txt.twig

@@ -1,16 +1,16 @@
 {{ dest.label }},
 
-{{ 'workflow.notification.content.new_step_reached'|trans({'%workflow%': workflow.text}) }}
+Un suivi "{{ workflow.text }}" a atteint une nouvelle étape: {{ workflow.text }}
 
-{{ 'workflow.notification.content.workflow_title'|trans({'%title%': title}) }}
+Titre du workflow: "{{ title }}".
 {% if is_dest %}
 
-{{ 'workflow.notification.content.validation_needed'|trans }}
+Vous êtes invités à valider cette étape au plus tôt.
 {% endif %}
 
 
-{{ 'workflow.notification.content.view_workflow'|trans }}
+Vous pouvez visualiser le workflow sur cette page:
 
-{{ absolute_url(path('chill_main_workflow_show', {'id': entity_workflow.id, '_locale': dest.locale|default('fr')})) }}
+{{ absolute_url(path('chill_main_workflow_show', {'id': entity_workflow.id, '_locale': 'fr'})) }}
 
-{{ 'workflow.notification.content.regards'|trans }}
+Cordialement,

src/Bundle/ChillMainBundle/Resources/views/Workflow/workflow_notification_on_transition_completed_title.fr.txt.twig

@@ -1,5 +1,5 @@
 {%- if is_dest -%}
-{{ 'workflow.notification.title.attention_needed'|trans({'%workflow%': workflow.text, '%title%': title}) }}
+Un suivi {{ workflow.text }} demande votre attention: {{ title }}
 {%- else -%}
-{{ 'workflow.notification.title.new_step'|trans({'%workflow%': workflow.text, '%place%': place.text, '%title%': title}) }}
+Un suivi {{ workflow.text }} a atteint une nouvelle étape: {{ place.text }}: {{ title }}
 {%- endif -%}

src/Bundle/ChillMainBundle/Security/PasswordRecover/RecoverPasswordHelper.php

@@ -16,13 +16,11 @@ use Symfony\Bridge\Twig\Mime\TemplatedEmail;
 use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
-// use Symfony\Component\Translation\LocaleSwitcher;
-
 class RecoverPasswordHelper
 {
     final public const RECOVER_PASSWORD_ROUTE = 'password_recover';
 
-    public function __construct(private readonly TokenManager $tokenManager, private readonly UrlGeneratorInterface $urlGenerator, private readonly MailerInterface $mailer/* , private readonly LocaleSwitcher $localeSwitcher */) {}
+    public function __construct(private readonly TokenManager $tokenManager, private readonly UrlGeneratorInterface $urlGenerator, private readonly MailerInterface $mailer) {}
 
     /**
      * @param bool  $absolute
@@ -55,24 +53,6 @@ class RecoverPasswordHelper
             throw new \UnexpectedValueException('No emaail associated to the user');
         }
 
-        // Implementation with LocaleSwitcher (commented out - to be activated after migration to sf7.2):
-        /*
-        $this->localeSwitcher->runWithLocale($user->getLocale(), function () use ($user, $expiration, $template, $templateParameters, $emailSubject, $additionalUrlParameters) {
-            $email = (new TemplatedEmail())
-                ->subject($emailSubject)
-                ->to($user->getEmail())
-                ->textTemplate($template)
-                ->context([
-                    'user' => $user,
-                    'url' => $this->generateUrl($user, $expiration, true, $additionalUrlParameters),
-                    ...$templateParameters,
-                ]);
-
-            $this->mailer->send($email);
-        });
-        */
-
-        // Current implementation:
         $email = (new TemplatedEmail())
             ->subject($emailSubject)
             ->to($user->getEmail())

src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationToUserGroupsOnTransition.php

@@ -22,8 +22,6 @@ use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Workflow\Event\Event;
 use Symfony\Component\Workflow\Registry;
 
-// use Symfony\Component\Translation\LocaleSwitcher;
-
 final readonly class NotificationToUserGroupsOnTransition implements EventSubscriberInterface
 {
     public function __construct(
@@ -33,7 +31,6 @@ final readonly class NotificationToUserGroupsOnTransition implements EventSubscr
         private MailerInterface $mailer,
         private EntityManagerInterface $entityManager,
         private EntityWorkflowManager $entityWorkflowManager,
-        // private LocaleSwitcher $localeSwitcher,
     ) {}
 
     public static function getSubscribedEvents(): array
@@ -90,24 +87,6 @@ final readonly class NotificationToUserGroupsOnTransition implements EventSubscr
                 'title' => $title,
             ];
 
-            // Implementation with LocaleSwitcher (commented out - to be activated after migration to sf7.2):
-            // Note: This sends emails to user groups, not individual users, so locale switching may use default locale
-            /*
-            $this->localeSwitcher->runWithLocale('fr', function () use ($context, $userGroup) {
-                $email = new TemplatedEmail();
-                $email
-                    ->htmlTemplate('@ChillMain/Workflow/workflow_notification_on_transition_completed_content_to_user_group.fr.txt.twig')
-                    ->context($context)
-                    ->subject(
-                        $this->engine->render('@ChillMain/Workflow/workflow_notification_on_transition_completed_title.fr.txt.twig', $context)
-                    )
-                    ->to($userGroup->getEmail());
-
-                $this->mailer->send($email);
-            });
-            */
-
-            // Current implementation:
             $email = new TemplatedEmail();
             $email
                 ->htmlTemplate('@ChillMain/Workflow/workflow_notification_on_transition_completed_content_to_user_group.fr.txt.twig')

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

@@ -56,13 +56,6 @@ user:
         no job: Pas de métier assigné
         no scope: Pas de cercle assigné
         notification_preferences: Préférences pour mes notifications
-    locale:
-        label: Langue de communication
-        help: Langue utilisée pour les notifications par email et autres communications.
-        placeholder: Choisissez une langue
-        choice:
-            french: Français
-            dutch: Nederlands
 
 user_group:
     inactive: Inactif
@@ -675,17 +668,6 @@ workflow:
         reject_are_you_sure: Êtes-vous sûr de vouloir rejeter la signature de %signer%
         waiting_for: En attente de modification de l'état de la signature
 
-    notification:
-        title:
-            attention_needed: "Attention requise dans le workflow %workflow% pour %title%"
-            new_step: "Nouvelle étape dans le workflow %workflow% (%place%) pour %title%"
-        content:
-            new_step_reached: "Une nouvelle étape a été atteinte dans le workflow %workflow%."
-            workflow_title: "Titre du workflow : %title%"
-            validation_needed: "Votre validation est nécessaire pour cette étape."
-            view_workflow: "Vous pouvez consulter le workflow ici :"
-            regards: "Cordialement,"
-
     attachments:
         title: Pièces jointes
 
@@ -763,22 +745,7 @@ notification:
         greeting: "Bonjour %user%"
         intro: "Vous avez reçu %notification_count% nouvelle(s) notification(s)."
         view_notification: "Vous pouvez visualiser la notification et y répondre ici:"
-        signature: "L'équipe Chill"
-
-daily_notifications: "{1}Vous avez 1 nouvelle notification.|]1,Inf[Vous avez %notification_count% nouvelles notifications."
-
-docgen:
-    failure_email:
-        "The generation of a document failed": "La génération d'un document a échoué"
-        "The generation of the document %template_name% failed": "La génération du document %template_name% a échoué"
-        "Forward this email to your administrator for solving": "Transmettez cet email à votre administrateur pour résolution"
-        "References": "Références"
-        "The following errors were encoutered": "Les erreurs suivantes ont été rencontrées"
-    data_dump_email:
-        subject: "Export de données disponible"
-        "Dear": "Cher utilisateur,"
-        "data_dump_ready_and_attached": "Votre export de données est prêt et joint à cet email."
-        "filename": "Nom du fichier : %filename%"
+        signature: "Le logiciel Chill"
 
 CHILL_MAIN_COMPOSE_EXPORT: Exécuter des exports et les sauvegarder
 CHILL_MAIN_GENERATE_SAVED_EXPORT: Exécuter et modifier des exports préalablement sauvegardés

src/Bundle/ChillMainBundle/translations/messages.nl.yml

@@ -46,14 +46,6 @@ No title: Geen titel
 User profile: Mijn gebruikersprofiel
 Phonenumber successfully updated!: Telefoonnummer bijgewerkt!
 
-user:
-    locale:
-        label: Communicatietaal
-        help: Taal gebruikt voor e-mailmeldingen en andere communicatie.
-        placeholder: Kies een taal
-        choice:
-            french: Français
-            dutch: Nederlands
 
 Edit: Bewerken
 Update: Updaten
@@ -431,17 +423,6 @@ workflow:
     For: Pour
     Cc: Cc
 
-    notification:
-        title:
-            attention_needed: "Aandacht vereist in workflow %workflow% voor %title%"
-            new_step: "Nieuwe stap in workflow %workflow% (%place%) voor %title%"
-        content:
-            new_step_reached: "Een nieuwe stap is bereikt in workflow %workflow%."
-            workflow_title: "Workflow titel: %title%"
-            validation_needed: "Uw validatie is nodig voor deze stap."
-            view_workflow: "U kunt de workflow hier bekijken:"
-            regards: "Met vriendelijke groeten,"
-
 
 Subscribe final: Recevoir une notification à l'étape finale
 Subscribe all steps: Recevoir une notification à chaque étape