Rename concernedUsersCount to concernedPersonsCount + add missing translations

config/packages/chill.yaml

@@ -122,4 +122,4 @@ chill_activity:
                 seconds: 18000
 
 chill_aside_activity:
-    show_concerned_users_count: true
+    show_concerned_persons_count: true

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

@@ -25,7 +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_users_count', $config['show_concerned_users_count']);
+        $container->setParameter('chill_aside_activity.show_concerned_persons_count', $config['show_concerned_persons_count']);
 
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services.yaml');

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

@@ -142,9 +142,9 @@ class Configuration implements ConfigurationInterface
             ->end()
             ->end()
             ->end()
-            ->booleanNode('show_concerned_users_count')
+            ->booleanNode('show_concerned_persons_count')
             ->defaultTrue()
-            ->info('Show the concerned users count field in aside activity forms and views')
+            ->info('Show the concerned persons count field in aside activity forms and views')
             ->end()
             ->end();
 

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

@@ -64,7 +64,7 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
 
     #[Assert\GreaterThanOrEqual(0)]
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER, nullable: true)]
-    private ?int $concernedUsersCount = null;
+    private ?int $concernedPersonsCount = null;
 
     public function getAgent(): ?User
     {
@@ -191,14 +191,14 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function getConcernedUsersCount(): ?int
+    public function getConcernedPersonsCount(): ?int
     {
-        return $this->concernedUsersCount;
+        return $this->concernedPersonsCount;
     }
 
-    public function setConcernedUsersCount(?int $concernedUsersCount): self
+    public function setConcernedPersonsCount(?int $concernedPersonsCount): self
     {
-        $this->concernedUsersCount = $concernedUsersCount;
+        $this->concernedPersonsCount = $concernedPersonsCount;
 
         return $this;
     }

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

@@ -30,13 +30,13 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 final class AsideActivityFormType extends AbstractType
 {
     private readonly array $timeChoices;
-    private readonly bool $showConcernedUsersCount;
+    private readonly bool $showConcernedPersonsCount;
 
     public function __construct(
         ParameterBagInterface $parameterBag,
     ) {
         $this->timeChoices = $parameterBag->get('chill_aside_activity.form.time_duration');
-        $this->showConcernedUsersCount = $parameterBag->get('chill_aside_activity.show_concerned_users_count');
+        $this->showConcernedPersonsCount = $parameterBag->get('chill_aside_activity.show_concerned_persons_count');
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -79,9 +79,9 @@ final class AsideActivityFormType extends AbstractType
             ->add('location', PickUserLocationType::class)
         ;
 
-        if ($this->showConcernedUsersCount) {
+        if ($this->showConcernedPersonsCount) {
-            $builder->add('concernedUsersCount', IntegerType::class, [
+            $builder->add('concernedPersonsCount', IntegerType::class, [
-                'label' => 'Concerned users count',
+                'label' => 'Concerned persons count',
                 'required' => false,
                 'attr' => [
                     'min' => 0,

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

@@ -43,8 +43,8 @@
                                     <div><i class="fa fa-fw fa-map-marker"></i>{{ entity.location.name }}</div>
                                 {%- endif -%}
 
-                                {%- if entity.concernedUsersCount > 0 -%}
+                                {%- if entity.concernedPersonsCount > 0 -%}
-                                    <div><i class="fa fa-fw fa-user"></i>{{ entity.concernedUsersCount }}</div>
+                                    <div><i class="fa fa-fw fa-user"></i>{{ entity.concernedPersonsCount }}</div>
                                 {%- endif -%}
 
 							</div>

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

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

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

@@ -2,6 +2,13 @@
 
 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;
@@ -11,16 +18,16 @@ final class Version20251006113048 extends AbstractMigration
 {
     public function getDescription(): string
     {
-        return 'Add concernedUsersCount property to AsideActivity entity';
+        return 'Add concernedPersonsCount property to AsideActivity entity';
     }
 
     public function up(Schema $schema): void
     {
-        $this->addSql('ALTER TABLE chill_asideactivity.asideactivity ADD concernedUsersCount INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_asideactivity.asideactivity ADD concernedPersonsCount INT DEFAULT NULL');
     }
 
     public function down(Schema $schema): void
     {
-        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity DROP concernedUsersCount');
+        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity DROP concernedPersonsCount');
     }
 }

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

@@ -27,7 +27,7 @@ Emergency: Urgent
 by: "Par "
 location: Lieu
 Asideactivity location: Localisation de l'activité
-Concerned users count: Nombre d'usager concernés
+Concerned persons count: Nombre d'usager concernés
 
 # Crud
 crud:
@@ -191,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é
@@ -211,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