Merge branch 'master' into 455-results-objectives-display-order

Resolve "Activités annexes: ajouter le nombre d'usagers concernés pour chaque activité annexe"

Closes #405

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

.changes/unreleased/Feature-20251029-152510.yaml

@@ -0,0 +1,6 @@
+kind: Feature
+body: Add columns for comments linked to an activity in the activity list export
+time: 2025-10-29T15:25:10.493968528+01:00
+custom:
+    Issue: "404"
+    SchemaChange: No schema change

.changes/unreleased/Fixed-20251029-124355.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: 'Fix: display also social actions linked to parents of the selected social issue'
+time: 2025-10-29T12:43:55.008647232+01:00
+custom:
+    Issue: "451"
+    SchemaChange: No schema change

.changes/unreleased/Fixed-20251029-143836.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: 'Fix: export actions and their results in csv even when action does not have any goals attached to it.'
+time: 2025-10-29T14:38:36.195220844+01:00
+custom:
+    Issue: "453"
+    SchemaChange: No schema change

.changes/unreleased/Fixed-20251104-135108.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix the possibility to delete a workflow
+time: 2025-11-04T13:51:08.113234488+01:00
+custom:
+    Issue: ""
+    SchemaChange: Drop or rename table or columns, or enforce new constraint that must be manually fixed

.changes/unreleased/UX-20251006-123932.yaml

@@ -0,0 +1,6 @@
+kind: UX
+body: Change the terms 'cercle' and 'centre' to 'service', and 'territoire' respectively.
+time: 2025-10-06T12:39:32.514056818+02:00
+custom:
+    Issue: "425"
+    SchemaChange: No schema change

.changes/unreleased/UX-20251029-110804.yaml

@@ -0,0 +1,6 @@
+kind: UX
+body: Improve the ux for selecting whether user wants to be notified of the final step of a workflow or all steps
+time: 2025-10-29T11:08:04.077020411+01:00
+custom:
+    Issue: "542"
+    SchemaChange: No schema change

.changes/unreleased/UX-20251030-180919.yaml

@@ -0,0 +1,6 @@
+kind: UX
+body: Expand timeSpent choices for evaluation document and translate them to user locale or fallback 'fr'
+time: 2025-10-30T18:09:19.373907522+01:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change

.changes/unreleased/UX-20251103-131554.yaml

@@ -0,0 +1,6 @@
+kind: UX
+body: Change the order of display for results and objectives in the social work/action form
+time: 2025-11-03T13:15:54.837971477+01:00
+custom:
+    Issue: "455"
+    SchemaChange: No schema change

CHANGELOG.md

@@ -780,7 +780,7 @@ Fix color of Chill footer
 - ajout d'un filtre et regroupement par usager participant sur les échanges
 - ajout d'un regroupement: par type d'activité associé au parcours;
 - trie les filtre et regroupements par ordre alphabétique dans els exports
-- ajout d'un paramètre qui permet de désactiver le filtre par centre dans les exports
+- ajout d'un paramètre qui permet de désactiver le filtre par territoire dans les exports
 - correction de l'interface de date dans les filtres et regroupements "par statut du parcours à la date"
 
 ## v2.9.2 - 2023-10-17
@@ -960,7 +960,7 @@ error when trying to reedit a saved export
 - ajout d'un regroupement par métier des intervenants sur un parcours;
 - ajout d'un regroupement par service des intervenants sur un parcours;
 - ajout d'un regroupement par utilisateur intervenant sur un parcours
-- ajout d'un regroupement "par centre de l'usager";
+- ajout d'un regroupement "par territoire de l'usager";
 - ajout d'un filtre "par métier intervenant sur un parcours";
 - ajout d'un filtre "par service intervenant sur un parcours";
 - création d'un rôle spécifique pour voir les parcours confidentiels (et séparer de celui de la liste qui permet de ré-assigner les parcours en lot);

composer.json

@@ -14,7 +14,7 @@
         "ext-openssl": "*",
         "ext-redis": "*",
         "ext-zlib": "*",
-        "champs-libres/wopi-bundle": "dev-master#1be045ee95310d2037683859ecefdbf3a10f7be6 as 0.4.x-dev",
+        "champs-libres/wopi-bundle": "dev-symfony-v5@dev",
         "champs-libres/wopi-lib": "dev-master@dev",
         "doctrine/data-fixtures": "^1.8",
         "doctrine/doctrine-bundle": "^2.1",

config/bundles.php

@@ -2,7 +2,6 @@
 
 return [
     Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
-    loophp\PsrHttpMessageBridgeBundle\PsrHttpMessageBridgeBundle::class => ['all' => true],
     ChampsLibres\WopiBundle\WopiBundle::class => ['all' => true],
     Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
     Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
@@ -37,4 +36,5 @@ return [
     Chill\WopiBundle\ChillWopiBundle::class => ['all' => true],
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
     Symfony\UX\Translator\UxTranslatorBundle::class => ['all' => true],
+    loophp\PsrHttpMessageBridgeBundle\PsrHttpMessageBridgeBundle::class => ['all' => true],
 ];

config/packages/chill_aside_activity.yaml

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

docs/source/_static/bundles/docStore/doc_store_classes.puml

@@ -23,8 +23,8 @@ class "Document" {
     - text description
     - ArrayCollection_DocumentCategory categories
     - varchar_150 content #link to openstack
-    - Center center
-    - Cercle cercle
+    - Territoire territoire
+    - Service service
     - User user
     - DateTime date # Creation date
 }

docs/source/development/database-principles.rst

@@ -38,7 +38,7 @@ Certaines données sont historisées:
 
 - les référents d'un parcours;
 - les statuts d'un parcours;
-- la liaison entre les centres et les usagers;
+- la liaison entre les territoires et les usagers;
 - etc.
 
 Dans ces cas-là, Chill crée généralement deux colonnes, qui sont habituellement nommées :code:`startDate` et :code:`endDate`. Lorsque la colonne :code:`endDate` est à :code:`NULL`, cela signifie que la période n'est pas "fermée". La colonne :code:`startDate` n'est pas nullable.

docs/source/development/database/table_list.csv

@@ -1,6 +1,6 @@
 order,table_schema,table_name,commentaire
 1,chill_3party,party_category,Catégorie de tiers
-2,chill_3party,party_center,Association entre les tiers et les centres (déprécié)
+2,chill_3party,party_center,Association entre les tiers et les territoires (déprécié)
 3,chill_3party,party_profession,Profession du tiers (déprécié)
 4,chill_3party,third_party,Tiers
 5,chill_3party,thirdparty_category,association tiers - catégories
@@ -54,7 +54,7 @@ order,table_schema,table_name,commentaire
 53,public,activitytpresence,Présence aux échanges
 54,public,activitytype,Types d'échanges
 55,public,activitytypecategory,Catégories de types d'échanges
-56,public,centers,"Centres (territoires, agences, etc.)"
+56,public,centers,"Territoires (territoires, agences, etc.)"
 57,public,chill_activity_activity_chill_person_socialaction,
 58,public,chill_activity_activity_chill_person_socialissue
 59,public,chill_docgen_template,Gabarits de documents
@@ -111,7 +111,7 @@ order,table_schema,table_name,commentaire
 110,public,chill_person_marital_status,Etats civils
 111,public,chill_person_not_duplicate,
 112,public,chill_person_person,Usagers
-113,public,chill_person_person_center_history,Historique des centres d'un usagers
+113,public,chill_person_person_center_history,Historique des territoires d'un usagers
 114,public,chill_person_persons_to_addresses,Déprécié
 115,public,chill_person_phone,Numéros d etéléphone supplémentaires d'un usager
 116,public,chill_person_relations,Types de relations de filiation
@@ -142,7 +142,7 @@ order,table_schema,table_name,commentaire
 141,public,permission_groups
 142,public,permissionsgroup_rolescope
 143,public,persons_spoken_languages
-144,public,regroupment,Regroupement de centres
+144,public,regroupment,Regroupement de territoires
 145,public,regroupment_center,
 146,public,role_scopes,
 147,public,scopes,Services

src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php

@@ -66,6 +66,9 @@ class ListActivityHelper
             ->leftJoin('activity.location', 'location')
             ->addSelect('location.name AS locationName')
             ->addSelect('activity.sentReceived')
+            ->addSelect('activity.comment.comment AS commentText')
+            ->addSelect('activity.comment.date AS commentDate')
+            ->addSelect('JSON_BUILD_OBJECT(\'uid\', activity.comment.userId, \'d\', activity.comment.date) AS commentUser')
             ->addSelect('JSON_BUILD_OBJECT(\'uid\', IDENTITY(activity.createdBy), \'d\', activity.createdAt) AS createdBy')
             ->addSelect('activity.createdAt')
             ->addSelect('JSON_BUILD_OBJECT(\'uid\', IDENTITY(activity.updatedBy), \'d\', activity.updatedAt) AS updatedBy')
@@ -87,6 +90,8 @@ class ListActivityHelper
             'createdAt', 'updatedAt' => $this->dateTimeHelper->getLabel($key),
             'createdBy', 'updatedBy' => $this->userHelper->getLabel($key, $values, $key),
             'date' => $this->dateTimeHelper->getLabel(self::MSG_KEY.$key),
+            'commentDate' => $this->dateTimeHelper->getLabel(self::MSG_KEY.'comment_date'),
+            'commentUser' => $this->userHelper->getLabel($key, $values, self::MSG_KEY.'comment_user'),
             'attendeeName' => function ($value) {
                 if ('_header' === $value) {
                     return 'Attendee';
@@ -176,6 +181,9 @@ class ListActivityHelper
             'usersNames',
             'thirdPartiesIds',
             'thirdPartiesNames',
+            'commentText',
+            'commentDate',
+            'commentUser',
             'createdBy',
             'createdAt',
             'updatedBy',

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

@@ -10,7 +10,7 @@ Attendee: Présence de l'usager
 attendee: présence de l'usager
 list_reasons: liste des sujets
 user_username: nom de l'utilisateur
-circle_name: nom du cercle
+circle_name: nom du service
 Remark: Commentaire
 No comments: Aucun commentaire
 Add a new activity: Ajouter une nouvel échange
@@ -20,7 +20,7 @@ not present: absent
 Delete: Supprimer
 Update: Mettre à jour
 Update activity: Modifier l'échange
-Scope: Cercle
+Scope: Service
 Activity data: Données de l'échange
 Activity location: Localisation de l'échange
 No reason associated: Aucun sujet
@@ -398,13 +398,15 @@ export:
             sent received: Envoyé ou reçu
             emergency: Urgence
             accompanying course id: Identifiant du parcours
-            course circles: Cercles du parcours
+            course circles: Services du parcours
             travelTime: Durée de déplacement
             durationTime: Durée
             id: Identifiant
             List activities linked to an accompanying course: Liste les échanges liés à un parcours en fonction de différents filtres.
             List activity linked to a course: Liste des échanges liés à un parcours
-
+            commentText: Commentaire
+            comment_date: Date de la dernière édition du commentaire
+            comment_user: Dernière édition par
 
     filter:
         activity:

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

@@ -0,0 +1,33 @@
+<?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\AsideActivity;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20251006113048 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add concernedPersonsCount property to AsideActivity entity';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_asideactivity.asideactivity ADD concernedPersonsCount INT DEFAULT 0');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $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:
@@ -177,7 +178,7 @@ export:
         agent_id: Utilisateur
         creator_id: Créateur
         main_scope: Service principal de l'utilisateur
-        main_center: Centre principal de l'utilisateur
+        main_center: Territoire principal de l'utilisateur
         aside_activity_type: Catégorie d'activité annexe
         date: Date
         duration: Durée
@@ -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/ChillEventBundle/Controller/EventController.php

@@ -246,7 +246,7 @@ final class EventController extends AbstractController
                 'class' => Center::class,
                 'choices' => $centers,
                 'placeholder' => $this->translator->trans('Pick a center'),
-                'label' => 'To which centre should the event be associated ?',
+                'label' => 'To which territory should the event be associated ?',
             ])
             ->add('submit', SubmitType::class, [
                 'label' => 'Next step',

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

@@ -64,7 +64,7 @@ CHILL_EVENT_PARTICIPATION_SEE_DETAILS: Voir le détail d'une participation
 
 # TODO check place to put this
 Next step: Étape suivante
-To which centre should the event be associated ?: À quel centre doit être associé l'événement ?
+To which territory should the event be associated ?: À quel territoire doit être associé l'événement ?
 
 # timeline
 past: passé
@@ -151,7 +151,7 @@ event:
     filter:
         event_types: Par types d'événement
         event_dates: Par date d'événement
-        center: Par centre
+        center: Par territoire
         by_responsable: Par responsable
         pick_responsable: Filtrer par responsables
     budget:
@@ -188,7 +188,7 @@ event_id: Identifiant
 event_name: Nom
 event_date: Date
 event_type: Type d'évenement
-event_center: Centre
+event_center: Territoire
 event_moderator: Responsable
 event_participants_count: Nombre de participants
 event_location: Localisation

src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php

@@ -123,7 +123,7 @@ class EntityWorkflowStep
     /**
      * @var Collection<int, EntityWorkflowStepHold>
      */
-    #[ORM\OneToMany(mappedBy: 'step', targetEntity: EntityWorkflowStepHold::class)]
+    #[ORM\OneToMany(mappedBy: 'step', targetEntity: EntityWorkflowStepHold::class, cascade: ['remove'])]
     private Collection $holdsOnStep;
 
     /**

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/EntityWorkflowVueSubscriber.vue

@@ -1,40 +1,38 @@
 <template>
     <div class="d-grid gap-2 my-3">
         <button
-            class="btn btn-misc"
+            class="btn btn-outline-primary text-start d-flex align-items-center"
+            :class="{ active: subscriberFinal }"
             type="button"
-            v-if="!subscriberFinal"
-            @click="subscribeTo('subscribe', 'final')"
+            @click="
+                subscribeTo(
+                    subscriberFinal ? 'unsubscribe' : 'subscribe',
+                    'final',
+                )
+            "
         >
-            <i class="fa fa-check fa-fw"></i>
-            {{ trans(WORKFLOW_SUBSCRIBE_FINAL) }}
+            <i
+                class="fa fa-fw me-2"
+                :class="subscriberFinal ? 'fa-check-square-o' : 'fa-square-o'"
+            ></i>
+            <span>{{ trans(WORKFLOW_SUBSCRIBE_FINAL) }}</span>
         </button>
         <button
-            class="btn btn-misc"
+            class="btn btn-outline-primary text-start d-flex align-items-center"
+            :class="{ active: subscriberStep }"
             type="button"
-            v-if="subscriberFinal"
-            @click="subscribeTo('unsubscribe', 'final')"
+            @click="
+                subscribeTo(
+                    subscriberStep ? 'unsubscribe' : 'subscribe',
+                    'step',
+                )
+            "
         >
-            <i class="fa fa-times fa-fw"></i>
-            {{ trans(WORKFLOW_UNSUBSCRIBE_FINAL) }}
-        </button>
-        <button
-            class="btn btn-misc"
-            type="button"
-            v-if="!subscriberStep"
-            @click="subscribeTo('subscribe', 'step')"
-        >
-            <i class="fa fa-check fa-fw"></i>
-            {{ trans(WORKFLOW_SUBSCRIBE_ALL_STEPS) }}
-        </button>
-        <button
-            class="btn btn-misc"
-            type="button"
-            v-if="subscriberStep"
-            @click="subscribeTo('unsubscribe', 'step')"
-        >
-            <i class="fa fa-times fa-fw"></i>
-            {{ trans(WORKFLOW_UNSUBSCRIBE_ALL_STEPS) }}
+            <i
+                class="fa fa-fw me-2"
+                :class="subscriberStep ? 'fa-check-square-o' : 'fa-square-o'"
+            ></i>
+            <span>{{ trans(WORKFLOW_SUBSCRIBE_ALL_STEPS) }}</span>
         </button>
     </div>
 </template>
@@ -45,9 +43,7 @@ import { defineProps, defineEmits } from "vue";
 import {
     trans,
     WORKFLOW_SUBSCRIBE_FINAL,
-    WORKFLOW_UNSUBSCRIBE_FINAL,
     WORKFLOW_SUBSCRIBE_ALL_STEPS,
-    WORKFLOW_UNSUBSCRIBE_ALL_STEPS,
 } from "translator";
 
 // props

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

@@ -61,7 +61,7 @@
                                 {% endif %}
                             </li>
                             <li>
-                                <span class="dt">cercle/centre:</span>
+                                <span class="dt">{{ 'Scope'|trans }}/{{ 'center'|trans }}:</span>
                                 {% if entity.mainScope %}
                                     {{ entity.mainScope.name|localize_translatable_string }}
                                 {% endif %}

src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php

@@ -49,7 +49,7 @@ class AdminUserMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_crud_center_index',
         ])->setExtras(['order' => 1010]);
 
-        $menu->addChild('Regroupements des centres', [
+        $menu->addChild('Regroupements des territoires', [
             'route' => 'chill_crud_regroupment_index',
         ])->setExtras(['order' => 1015]);
 

src/Bundle/ChillMainBundle/Tests/Controller/ScopeControllerTest.php

@@ -35,7 +35,7 @@ final class ScopeControllerTest extends WebTestCase
             $client->getResponse()->getStatusCode(),
             'Unexpected HTTP status code for GET /fr/admin/scope/'
         );
-        $crawler = $client->click($crawler->selectLink('Créer un nouveau cercle')->link());
+        $crawler = $client->click($crawler->selectLink('Créer un nouveau service')->link());
         // Fill in the form and submit it
         $form = $crawler->selectButton('Créer')->form([
             'chill_mainbundle_scope[name][fr]' => 'Test en fr',

src/Bundle/ChillMainBundle/migrations/Version20251104124123.php

@@ -0,0 +1,46 @@
+<?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\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20251104124123 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Delete on cascade EntityWorkflowStepHold';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_workflow_entity_step_hold
+                   DROP CONSTRAINT fk_1be2e7c73b21e9c');
+
+        $this->addSql('ALTER TABLE chill_main_workflow_entity_step_hold
+                   ADD CONSTRAINT fk_1be2e7c73b21e9c
+                   FOREIGN KEY (step_id)
+                   REFERENCES chill_main_workflow_entity_step (id)
+                   ON DELETE CASCADE');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_workflow_entity_step_hold
+                   DROP CONSTRAINT fk_1be2e7c73b21e9c');
+
+        $this->addSql('ALTER TABLE chill_main_workflow_entity_step_hold
+                   ADD CONSTRAINT fk_1be2e7c73b21e9c
+                   FOREIGN KEY (step_id)
+                   REFERENCES chill_main_workflow_entity_step (id)');
+    }
+}

src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml

@@ -127,6 +127,20 @@ duration:
             few {# minutes}
             other {# minutes}
         }
+    hour: >-
+        {h, plural,
+            =0 {Aucune durée}
+            one {# heure}
+            few {# heures}
+            other {# heures}
+        }
+    day: >-
+        {d, plural,
+            =0 {Aucune durée}
+            one {# jour}
+            few {# jours}
+            other {# jours}
+        }
 
 filter_order:
     by_date:

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

@@ -54,7 +54,7 @@ user:
         title: Mon profil
         Profile successfully updated!: Votre profil a été mis à jour!
         no job: Pas de métier assigné
-        no scope: Pas de cercle assigné
+        no scope: Pas de service assigné
         notification_preferences: Préférences pour mes notifications
 
 user_group:
@@ -102,9 +102,9 @@ createdAt: Créé le
 createdBy: Créé par
 
 #elements used in software
-centers: centres
-Centers: Centres
-center: centre
+centers: territoires
+Centers: Territoires
+center: territoire
 comment: commentaire
 Comment: Commentaire
 Comments: Commentaires
@@ -227,12 +227,12 @@ Location Menu: Localisations et types de localisation
 Management of location: Gestion des localisations et types de localisation
 
 #admin section for center's administration
-Create a new center: Créer un nouveau centre
-Center list: Liste des centres
-Center edit: Édition d'un centre
-Center creation: Création d'un centre
-New center: Nouveau centre
-Center: Centre
+Create a new center: Créer une nouveau territoire
+Center list: Liste des territoires
+Center edit: Édition d'un territoire
+Center creation: Création d'un territoire
+New center: Nouveau territoire
+Center: Territoire
 
 #admin section for permissions group
 Permissions group list: Groupes de permissions
@@ -246,15 +246,15 @@ New permission group: Nouveau groupe de permissions
 PermissionsGroup "%name%" edit: Modification du groupe de permission '%name%'
 Role: Rôle
 Choose amongst roles: Choisir un rôle
-Choose amongst scopes: Choisir un cercle
+Choose amongst scopes: Choisir un service
 Add permission: Ajouter les permissions
 This group does not provide any permission: Ce groupe n'attribue aucune permission
 The role '%role%' has been removed: Le rôle "%role%" a été enlevé de ce groupe de permission
-The role '%role%' on circle '%scope%' has been removed: Le rôle "%role%" sur le cercle "%scope%" a été enlevé de ce groupe de permission
+The role '%role%' on circle '%scope%' has been removed: Le rôle "%role%" sur le service "%scope%" a été enlevé de ce groupe de permission
 Unclassified: Non classifié
-Help to pick role and scope: Certains rôles ne nécessitent pas de cercle.
-The role need scope: Ce rôle nécessite un cercle.
-The role does not need scope: Ce rôle ne nécessite pas de cercle !
+Help to pick role and scope: Certains rôles ne nécessitent pas de service.
+The role need scope: Ce rôle nécessite un service.
+The role does not need scope: Ce rôle ne nécessite pas de service !
 
 #admin section for users
 User configuration: Gestion des utilisateurs
@@ -270,7 +270,7 @@ Grant new permissions: Ajout de permissions
 Add a new groupCenter: Ajout de permissions
 The permissions have been successfully added to the user: Les permissions ont été accordées à l'utilisateur
 The permissions where removed.: Les permissions ont été enlevées.
-Center & groups: Centre et groupes
+Center & groups: Territoire et groupes
 User %username%: Utilisateur %username%
 Add a new user: Ajouter un nouvel utilisateur
 The permissions have been added: Les permissions ont été ajoutées
@@ -280,13 +280,13 @@ Back to the user edition: Retour au formulaire d'édition
 Password successfully updated!: Mot de passe mis à jour
 Flags: Drapeaux
 Main location: Localisation principale
-Main scope: Cercle
-Main center: Centre
+Main scope: Service
+Main center: Territoire
 user job: Métier de l'utilisateur
 Job: Métier
 Jobs: Métiers
-Choose a main center: Choisir un centre
-Choose a main scope: Choisir un cercle
+Choose a main center: Choisir un territoire
+Choose a main scope: Choisir un service
 choose a job: Choisir un métier
 choose a location: Choisir une localisation
 
@@ -302,12 +302,12 @@ Current location successfully updated: Localisation actuelle mise à jour
 Pick a location: Choisir un lieu
 
 #admin section for circles (old: scopes)
-List circles: Cercles
-New circle: Nouveau cercle
-Circle: Cercle
-Circle edit: Modification du cercle
-Circle creation: Création d'un cercle
-Create a new circle: Créer un nouveau cercle
+List circles: Services
+New circle: Nouveau service
+Circle: Service
+Circle edit: Modification du service
+Circle creation: Création d'un service
+Create a new circle: Créer un nouveau service
 
 #admin section for location
 Location: Localisation
@@ -347,9 +347,9 @@ Country list: Liste des pays
 Country code: Code du pays
 
 # circles / scopes
-Choose the circle: Choisir le cercle
-Scope: Cercle
-Scopes: Cercles
+Choose the circle: Choisir le service
+Scope: Service
+Scopes: Services
 
 #export
 
@@ -357,14 +357,14 @@ Scopes: Cercles
 Exports list: Liste des exports
 Create an export: Créer un export
 #export creation step 'center' : pick a center
-Pick centers: Choisir les centres
-Pick a center: Choisir un centre
-The export will contains only data from the picked centers.: L'export ne contiendra que les données des centres choisis.
-This will eventually restrict your possibilities in filtering the data.: Les possibilités de filtrages seront adaptées aux droits de consultation pour les centres choisis.
+Pick centers: Choisir les territoires
+Pick a center: Choisir un territoire
+The export will contains only data from the picked centers.: L'export ne contiendra que les données des territoires choisis.
+This will eventually restrict your possibilities in filtering the data.: Les possibilités de filtrages seront adaptées aux droits de consultation pour les territoires choisis.
 Go to export options: Vers la préparation de l'export
-Pick aggregated centers: Regroupement de centres
-uncheck all centers: Désélectionner tous les centres
-check all centers: Sélectionner tous les centres
+Pick aggregated centers: Regroupement de territoires
+uncheck all centers: Désélectionner tous les territoires
+check all centers: Sélectionner tous les territoires
 # export creation step 'export' : choose aggregators, filtering and formatter
 Formatter: Mise en forme
 Choose the formatter: Choisissez le format d'export voulu.
@@ -510,10 +510,10 @@ crud:
         title_edit: Modifier un regroupement
     center:
         index:
-            title: Liste des centres
-            add_new: Ajouter un centre
-        title_new: Nouveau centre
-        title_edit: Modifier un centre
+            title: Liste des territoires
+            add_new: Ajouter un territoire
+        title_new: Nouveau territoire
+        title_edit: Modifier un territoire
     news_item:
         index:
             title: Liste des actualités
@@ -862,7 +862,7 @@ absence:
 admin:
     users:
         export_list_csv: Liste des utilisateurs (format CSV)
-        export_permissions_csv: Association utilisateurs - groupes de permissions - centre (format CSV)
+        export_permissions_csv: Association utilisateurs - groupes de permissions - territoire (format CSV)
         export:
             id: Identifiant
             username: Nom d'utilisateur
@@ -872,8 +872,8 @@ admin:
             civility_abbreviation: Abbréviation civilité
             civility_name: Civilité
             label: Label
-            mainCenter_id: Identifiant centre principal
-            mainCenter_name: Centre principal
+            mainCenter_id: Identifiant territoire principal
+            mainCenter_name: Territoire principal
             mainScope_id: Identifiant service principal
             mainScope_name: Service principal
             userJob_id: Identifiant métier
@@ -883,8 +883,8 @@ admin:
             mainLocation_id: Identifiant localisation principale
             mainLocation_name: Localisation principale
             absenceStart: Absent à partir du
-            center_id: Identifiant du centre
-            center_name: Centre
+            center_id: Identifiant du territoire
+            center_name: Territoire
             permissionsGroup_id: Identifiant du groupe de permissions
             permissionsGroup_name: Groupe de permissions
         job_scope_histories:

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

@@ -1,15 +1,15 @@
 # role_scope constraint
 # scope presence
-The role "%role%" require to be associated with a scope.: Le rôle "%role%" doit être associé à un cercle.
-The role "%role%" should not be associated with a scope.: Le rôle "%role%" ne doit pas être associé à un cercle.
+The role "%role%" require to be associated with a scope.: Le rôle "%role%" doit être associé à un service.
+The role "%role%" should not be associated with a scope.: Le rôle "%role%" ne doit pas être associé à un service.
 "The password must contains one letter, one capitalized letter, one number and one special character as *[@#$%!,;:+\"'-/{}~=µ()£]). Other characters are allowed.": "Le mot de passe doit contenir une majuscule, une minuscule, et au moins un caractère spécial parmi *[@#$%!,;:+\"'-/{}~=µ()£]). Les autres caractères sont autorisés."
 The password fields must match: Les mots de passe doivent correspondre
 The password must be greater than {{ limit }} characters: "[1,Inf] Le mot de passe doit contenir au moins {{ limit }} caractères"
 
-A permission is already present for the same role and scope: Une permission est déjà présente pour le même rôle et cercle.
+A permission is already present for the same role and scope: Une permission est déjà présente pour le même rôle et service.
 
 #UserCircleConsistency
-"{{ username }} is not allowed to see entities published in this circle": "{{ username }} n'est pas autorisé à voir l'élément publié dans ce cercle."
+"{{ username }} is not allowed to see entities published in this circle": "{{ username }} n'est pas autorisé à voir l'élément publié dans ce service."
 
 The user in cc cannot be a dest user in the same workflow step: Un utilisateur en Cc ne peut pas être un utilisateur qui valide.
 

src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php

@@ -122,6 +122,8 @@ class SocialIssue
      * get all the ancestors of the social issue.
      *
      * @param bool $includeThis if the array in the result must include the present SocialIssue
+     *
+     * @return list<SocialIssue>
      */
     public function getAncestors(bool $includeThis = true): array
     {
@@ -176,7 +178,7 @@ class SocialIssue
     }
 
     /**
-     * @return Collection|SocialAction[] All the descendant social actions of the entity
+     * @return Collection<int, SocialAction> All the descendant social actions of the entity
      */
     public function getDescendantsSocialActions(): Collection
     {
@@ -239,18 +241,23 @@ class SocialIssue
     }
 
     /**
-     * @return Collection<SocialAction> All the descendant social actions of all
-     *                                  the descendants of the entity
+     * @return Collection<int, SocialAction> All the social actions of the entity, it's
+     *                                       the descendants and it's parents
      */
     public function getRecursiveSocialActions(): Collection
     {
         $recursiveSocialActions = new ArrayCollection();
 
+        // Get social actions from parent issues
+        foreach ($this->getAncestors(false) as $ancestor) {
+            foreach ($ancestor->getDescendantsSocialActions() as $descendant) {
+                $recursiveSocialActions->add($descendant);
+            }
+        }
+
         foreach ($this->getDescendantsWithThis() as $socialIssue) {
             foreach ($socialIssue->getDescendantsSocialActions() as $descendant) {
-                if (!$recursiveSocialActions->contains($descendant)) {
-                    $recursiveSocialActions->add($descendant);
-                }
+                $recursiveSocialActions->add($descendant);
             }
         }
 

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js

@@ -80,7 +80,7 @@ const appMessages = {
       firstName: "Prénom",
       lastName: "Nom",
       birthdate: "Date de naissance",
-      center: "Centre",
+      center: "Territoire",
       phonenumber: "Téléphone",
       mobilenumber: "Mobile",
       altNames: "Autres noms",

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue

@@ -52,30 +52,6 @@
                 </div>
             </div>
 
-            <!-- results which are not attached to an objective -->
-            <div v-if="hasResultsForAction">
-                <div class="results_without_objective">
-                    {{ $t("results_without_objective") }}
-                </div>
-                <div>
-                    <add-result
-                        :availableResults="resultsForAction"
-                        destination="action"
-                    ></add-result>
-                </div>
-            </div>
-
-            <!-- results which **are** attached to an objective -->
-            <div v-for="g in goalsPicked" :key="g.goal.id">
-                <div class="item-title" @click="removeGoal(g)">
-                    <span class="removable">{{
-                        localizeString(g.goal.title)
-                    }}</span>
-                </div>
-                <div>
-                    <add-result :goal="g.goal" destination="goal"></add-result>
-                </div>
-            </div>
             <div class="accordion" id="expandedSuggestions">
                 <div
                     v-if="availableForCheckGoal.length > 0"
@@ -138,6 +114,31 @@
                     }}</span>
                 </div>
             </div>
+
+            <!-- results which are not attached to an objective -->
+            <div v-if="hasResultsForAction">
+                <div class="results_without_objective">
+                    {{ $t("results_without_objective") }}
+                </div>
+                <div>
+                    <add-result
+                        :availableResults="resultsForAction"
+                        destination="action"
+                    ></add-result>
+                </div>
+            </div>
+
+            <!-- results which **are** attached to an objective -->
+            <div v-for="g in goalsPicked" :key="g.goal.id">
+                <div class="item-title" @click="removeGoal(g)">
+                    <span class="removable">{{
+                        localizeString(g.goal.title)
+                    }}</span>
+                </div>
+                <div>
+                    <add-result :goal="g.goal" destination="goal"></add-result>
+                </div>
+            </div>
         </div>
 
         <div id="evaluations" class="action-row">

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue

@@ -67,37 +67,117 @@ const store = useStore();
 
 const $toast = useToast();
 
-const timeSpentChoices = [
-    { text: "1 minute", value: 60 },
-    { text: "2 minutes", value: 120 },
-    { text: "3 minutes", value: 180 },
-    { text: "4 minutes", value: 240 },
-    { text: "5 minutes", value: 300 },
-    { text: "10 minutes", value: 600 },
-    { text: "15 minutes", value: 900 },
-    { text: "20 minutes", value: 1200 },
-    { text: "25 minutes", value: 1500 },
-    { text: "30 minutes", value: 1800 },
-    { text: "45 minutes", value: 2700 },
-    { text: "1 hour", value: 3600 },
-    { text: "1 hour 15 minutes", value: 4500 },
-    { text: "1 hour 30 minutes", value: 5400 },
-    { text: "1 hour 45 minutes", value: 6300 },
-    { text: "2 hours", value: 7200 },
-    { text: "2 hours 30 minutes", value: 9000 },
-    { text: "3 hours", value: 10800 },
-    { text: "3 hours 30 minutes", value: 12600 },
-    { text: "4 hours", value: 14400 },
-    { text: "4 hours 30 minutes", value: 16200 },
-    { text: "5 hours", value: 18000 },
-    { text: "5 hours 30 minutes", value: 19800 },
-    { text: "6 hours", value: 21600 },
-    { text: "6 hours 30 minutes", value: 23400 },
-    { text: "7 hours", value: 25200 },
-    { text: "7 hours 30 minutes", value: 27000 },
-    { text: "8 hours", value: 28800 },
+const timeSpentValues = [
+    60,
+    120,
+    180,
+    240,
+    300,
+    600,
+    900,
+    1200,
+    1500,
+    1800,
+    2700,
+    3600,
+    4500,
+    5400,
+    6300,
+    7200,
+    9000,
+    10800,
+    12600,
+    14400,
+    16200,
+    18000,
+    19800,
+    21600,
+    23400,
+    25200,
+    27000,
+    28800,
+    43200,
+    57600,
+    72000,
+    86400,
+    100800,
+    115200,
+    129600,
+    144000, // goes from 1 minute to 40 hours
 ];
 
+const formatDuration = (seconds, locale) => {
+    const currentLocale = locale || navigator.language || "fr";
+
+    const totalHours = Math.floor(seconds / 3600);
+    const remainingMinutes = Math.floor((seconds % 3600) / 60);
+
+    if (totalHours >= 8) {
+        const days = Math.floor(totalHours / 8);
+        const remainingHours = totalHours % 8;
+
+        const parts = [];
+
+        if (days > 0) {
+            parts.push(
+                new Intl.NumberFormat(currentLocale, {
+                    style: "unit",
+                    unit: "day",
+                    unitDisplay: "long",
+                }).format(days),
+            );
+        }
+
+        if (remainingHours > 0) {
+            parts.push(
+                new Intl.NumberFormat(currentLocale, {
+                    style: "unit",
+                    unit: "hour",
+                    unitDisplay: "long",
+                }).format(remainingHours),
+            );
+        }
+
+        return parts.join(" ");
+    }
+
+    // For less than 8 hours, use hour and minute format
+    const parts = [];
+
+    if (totalHours > 0) {
+        parts.push(
+            new Intl.NumberFormat(currentLocale, {
+                style: "unit",
+                unit: "hour",
+                unitDisplay: "long",
+            }).format(totalHours),
+        );
+    }
+
+    if (remainingMinutes > 0) {
+        parts.push(
+            new Intl.NumberFormat(currentLocale, {
+                style: "unit",
+                unit: "minute",
+                unitDisplay: "long",
+            }).format(remainingMinutes),
+        );
+    }
+
+    console.log(parts);
+    console.log(parts.join(" "));
+
+    return parts.join(" ");
+};
+
+const timeSpentChoices = computed(() => {
+    const locale = "fr";
+    return timeSpentValues.map((value) => ({
+        text: formatDuration(value, locale),
+        value: parseInt(value),
+    }));
+});
+
 const startDate = computed({
     get() {
         return props.evaluation.startDate;
@@ -194,7 +274,7 @@ function updateWarningInterval(value) {
 }
 
 function updateTimeSpent(value) {
-    timeSpent.value = value;
+    timeSpent.value = parseInt(value);
 }
 
 function updateComment(value) {

src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js

@@ -50,8 +50,8 @@ const visMessages = {
           return "Né·e le";
         }
       },
-      center_id: "Identifiant du centre",
-      center_type: "Type de centre",
+      center_id: "Identifiant du territoire",
+      center_type: "Type de territoire",
       center_name: "Territoire", // vendée
       phonenumber: "Téléphone",
       mobilenumber: "Mobile",

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.ts

@@ -25,8 +25,8 @@ const personMessages = {
                     return "Né·e le";
                 }
             },
-            center_id: "Identifiant du centre",
-            center_type: "Type de centre",
+            center_id: "Identifiant du territoire",
+            center_type: "Type de territoire",
             center_name: "Territoire", // vendée
             phonenumber: "Téléphone",
             mobilenumber: "Mobile",
@@ -53,8 +53,8 @@ const personMessages = {
                     "Un nouveau ménage va être créé. L'usager sera membre de ce ménage.",
             },
             center: {
-                placeholder: "Choisissez un centre",
-                title: "Centre",
+                placeholder: "Choisissez un territoire",
+                title: "territoire",
             },
         },
         error_only_one_person: "Une seule personne peut être sélectionnée !",

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig

@@ -216,9 +216,29 @@
 
                                     {% if e.timeSpent is not null and e.timeSpent > 0 %}
                                         <li>
-                                            {% set minutes = (e.timeSpent / 60) %}
-                                            <span
-                                                class="item-key">{{ 'accompanying_course_work.timeSpent'|trans ~ ' : ' }}</span> {{ 'duration.minute'|trans({ '{m}' : minutes }) }}
+                                            {% set totalHours = (e.timeSpent / 3600)|round(0, 'floor') %}
+                                            {% set totalMinutes = ((e.timeSpent % 3600) / 60)|round(0, 'floor') %}
+
+                                            <span class="item-key">{{ 'accompanying_course_work.timeSpent'|trans ~ ' : ' }}</span>
+
+                                            {% if totalHours >= 8 %}
+                                                {% set days = (totalHours / 8)|round(0, 'floor') %}
+                                                {% set remainingHours = totalHours % 8 %}
+
+                                                {% if days > 0 %}
+                                                    {{ 'duration.day'|trans({ '{d}' : days }) }}
+                                                {% endif %}
+                                                {% if remainingHours > 0 %}
+                                                    {{ 'duration.hour'|trans({ '{h}' : remainingHours }) }}
+                                                {% endif %}
+                                            {% else %}
+                                                {% if totalHours > 0 %}
+                                                    {{ 'duration.hour'|trans({ '{h}' : totalHours }) }}
+                                                {% endif %}
+                                                {% if totalMinutes > 0 %}
+                                                    {{ 'duration.minute'|trans({ '{m}' : totalMinutes }) }}
+                                                {% endif %}
+                                            {% endif %}
                                         </li>
                                     {% elseif displayContent is defined and displayContent == 'long' %}
                                         <li>

src/Bundle/ChillPersonBundle/Service/SocialWork/SocialActionCSVExportService.php

@@ -42,28 +42,41 @@ final readonly class SocialActionCSVExportService
         $csv->insertOne($headers);
 
         foreach ($actions as $action) {
-            if ($action->getGoals()->isEmpty() && $action->getResults()->isEmpty() && $action->getEvaluations()->isEmpty()) {
+            $hasGoals = !$action->getGoals()->isEmpty();
+            $hasResults = !$action->getResults()->isEmpty();
+            $hasEvaluations = !$action->getEvaluations()->isEmpty();
+
+            // If action has no goals, results, or evaluations, insert a single row
+            if (!$hasGoals && !$hasResults && !$hasEvaluations) {
                 $csv->insertOne($this->formatRow($action));
+                continue;
             }
 
-            foreach ($action->getGoals() as $goal) {
-                if ($goal->getResults()->isEmpty()) {
-                    $csv->insertOne($this->formatRow($action, $goal));
-                }
-
-                foreach ($goal->getResults() as $goalResult) {
-                    $csv->insertOne($this->formatRow($action, $goal, $goalResult));
+            // Process goals and their results
+            if ($hasGoals) {
+                foreach ($action->getGoals() as $goal) {
+                    if ($goal->getResults()->isEmpty()) {
+                        $csv->insertOne($this->formatRow($action, $goal));
+                    } else {
+                        foreach ($goal->getResults() as $goalResult) {
+                            $csv->insertOne($this->formatRow($action, $goal, $goalResult));
+                        }
+                    }
                 }
             }
 
-            foreach ($action->getResults() as $result) {
-                if ($result->getGoals()->isEmpty()) {
+            // Process results that are linked to this action (regardless of whether they have goals elsewhere)
+            if ($hasResults && !$hasGoals) {
+                foreach ($action->getResults() as $result) {
                     $csv->insertOne($this->formatRow($action, null, null, $result));
                 }
             }
 
-            foreach ($action->getEvaluations() as $evaluation) {
-                $csv->insertOne($this->formatRow($action, evaluation: $evaluation));
+            // Process evaluations
+            if ($hasEvaluations) {
+                foreach ($action->getEvaluations() as $evaluation) {
+                    $csv->insertOne($this->formatRow($action, evaluation: $evaluation));
+                }
             }
         }
 

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

@@ -376,7 +376,7 @@ Create a list of people according to various filters.: Crée une liste d'usagers
 Fields to include in export: Champs à inclure dans l'export
 Address valid at this date: Addresse valide à cette date
 Data valid at this date: Données valides à cette date
-Data regarding center, addresses, and so on will be computed at this date: Les données concernant le centre, l'adresse, le ménage, sera calculé à cette date.
+Data regarding center, addresses, and so on will be computed at this date: Les données concernant le territoire, l'adresse, le ménage, sera calculé à cette date.
 List duplicates: Liste des doublons
 Create a list of duplicate people: Créer la liste des usagers détectés comme doublons.
 Count people participating in an accompanying course: Nombre d'usagers concernés par un parcours
@@ -1110,9 +1110,9 @@ export:
                 Group course by household composition: Grouper les usagers par composition familiale
                 Calc date: Date de calcul de la composition du ménage
             by_center:
-                title: Grouper les usagers par centre
-                at_date: Date de calcul du centre
-                center: Centre de l'usager
+                title: Grouper les usagers par territoire
+                at_date: Date de calcul du territoire
+                center: Territoire de l'usager
             by_postal_code:
                 title: Grouper les usagers par code postal de l'adresse
                 at_date: Date de calcul de l'adresse
@@ -1437,7 +1437,7 @@ export:
             acpParticipantPersons: Usagers concernés
             acpParticipantPersonsIds: Usagers concernés (identifiants)
             duration: Durée du parcours (en jours)
-            centers: Centres des usagers
+            centers: Territoires des usagers
 
         eval:
             List of evaluations: Liste des évaluations

src/Bundle/ChillPersonBundle/translations/validators.fr.yml

@@ -23,7 +23,7 @@ The gender must be set: Le genre doit être renseigné
 You are not allowed to perform this action: Vous n'avez pas le droit de changer cette valeur.
 Sorry, but someone else has already changed this entity. Please refresh the page and apply the changes again: Désolé, mais quelqu'un d'autre a déjà modifié cette entité. Veuillez actualiser la page et appliquer à nouveau les modifications
 
-A center is required: Un centre est requis
+A center is required: Un territoire est requis
 
 #export list
 You must select at least one element: Vous devez sélectionner au moins un élément

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

@@ -9,7 +9,7 @@
 'Report list': 'Liste des rapports'
 Details: Détails
 Person: Usager
-Scope: Cercle
+Scope: Service
 Date: Date
 User: Utilisateur
 'Report type': 'Type de rapport'

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

@@ -4,7 +4,7 @@ Tasks: "Tâches"
 Title: Titre
 Description: Description
 Assignee: "Personne assignée"
-Scope: Cercle
+Scope: Service
 "Start date": "Date de début"
 "End date": "Date d'échéance"
 "Warning date": "Date d'avertissement"
@@ -106,7 +106,7 @@ My tasks over deadline: Mes tâches à échéance dépassée
 #transition page
 Apply transition on task <em>%title%</em>: Appliquer la transition sur la tâche <em>%title%</em>
 
-All centers: Tous les centres
+All centers: Tous les territoires
 
 # ROLES
 CHILL_TASK_TASK_CREATE: Ajouter une tâche

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

@@ -73,8 +73,8 @@ No acronym given: Aucun sigle renseigné
 No phone given: Aucun téléphone renseigné
 No email given:  Aucune adresse courriel renseignée
 
-The party is visible in those centers: Le tiers est visible dans ces centres
-The party is not visible in any center: Le tiers n'est associé à aucun centre
+The party is visible in those centers: Le tiers est visible dans ces territoires
+The party is not visible in any center: Le tiers n'est associé à aucun territoire
 No third parties: Aucun tiers
 Any third party selected: Aucun tiers sélectionné