diff --git a/config/packages/chill.yaml b/config/packages/chill.yaml index 2556307ba..290737566 100644 --- a/config/packages/chill.yaml +++ b/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 diff --git a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php index 282186c84..b864a4c5c 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php +++ b/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'); diff --git a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php index 8a60bab5b..fd5838e3d 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php +++ b/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(); diff --git a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php index 98a8ade81..494bd5b0d 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php +++ b/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; } diff --git a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php index 8719c023c..ea04fdc42 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php +++ b/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) { - $builder->add('concernedUsersCount', IntegerType::class, [ - 'label' => 'Concerned users count', + if ($this->showConcernedPersonsCount) { + $builder->add('concernedPersonsCount', IntegerType::class, [ + 'label' => 'Concerned persons count', 'required' => false, 'attr' => [ 'min' => 0, diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig index ebce5f1f6..0d06e5ba9 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig +++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig @@ -43,8 +43,8 @@
{{ entity.location.name }}
{%- endif -%} - {%- if entity.concernedUsersCount > 0 -%} -
{{ entity.concernedUsersCount }}
+ {%- if entity.concernedPersonsCount > 0 -%} +
{{ entity.concernedPersonsCount }}
{%- endif -%} diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig index 60d9756ba..292e6582e 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig +++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig @@ -38,8 +38,8 @@
{{ 'Duration'|trans }}
{{ entity.duration|date('H:i') }}
-
{{ 'Concerned users count'|trans }}
-
{{ entity.concernedUsersCount }}
+
{{ 'Concerned persons count'|trans }}
+
{{ entity.concernedPersonsCount }}
{{ 'Remark'|trans }}
{%- if entity.note is empty -%} diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20251006113048.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20251006113048.php index acb81690a..1c1b35323 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20251006113048.php +++ b/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'); } } diff --git a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml index c70622b43..664cd41b7 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml +++ b/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