fix bug of user filter not being combined with other filters

.changes/unreleased/DX-20230623-122408.yaml

@@ -0,0 +1,5 @@
+kind: DX
+body: '[FilterOrderHelper] add entity choice and singleCheckbox'
+time: 2023-06-23T12:24:08.133491895+02:00
+custom:
+  Issue: ""

.changes/unreleased/Feature-20230623-122530.yaml

@@ -0,0 +1,5 @@
+kind: Feature
+body: '[activity list] add filtering for activities list'
+time: 2023-06-23T12:25:30.49643551+02:00
+custom:
+  Issue: ""

.changes/unreleased/Feature-20230623-122702.yaml

@@ -0,0 +1,6 @@
+kind: Feature
+body: '[activity list] in person context, show also the activities from the accompanying
+  periods where the person participates'
+time: 2023-06-23T12:27:02.159041095+02:00
+custom:
+  Issue: ""

.changes/unreleased/Feature-20230623-124438.yaml

@@ -0,0 +1,5 @@
+kind: Feature
+body: '[activity list] add pagination to the list of activities'
+time: 2023-06-23T12:44:38.879098862+02:00
+custom:
+  Issue: ""

.changes/unreleased/Feature-20230705-140336.yaml

@@ -0,0 +1,5 @@
+kind: Feature
+body: Allow filtering on the basis of a user within general tasks list
+time: 2023-07-05T14:03:36.664880092+02:00
+custom:
+  Issue: ""

.changes/v2.5.0.md

@@ -1,37 +0,0 @@
-## v2.5.0 - 2023-07-14
-### Feature
-* Allow filtering on the basis of a user within general tasks lists
-* ([#120](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/120)) Adding OrderFilter to the list of social actions.
-* ([#125](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/125)) [export] Add a list for people with their associated course
-* [export] Add ordering by person's lastname or course opening date in list which concerns accompanying course or peoples
-* ([#128](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/128)) [Export] allow to group activities by localisation
-* ([#129](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/129)) [export] Add a filter "filter course having an activity between two dates"
-* ([#112](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/112)) [addresses] Add a cronjob to re-associate addresses with addresses reference every 6 hours
-
-### Fixed
-* reimplement the visualization of all calculator results
-* ([#117](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/117)) Repair my unread notification list with actions and evaluations documents
-* ([#126](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/126)) Correct bug in thirdparty API search query: simplify address joins clause for child and parent kind
-
-### DX
-* Documentation for database principles
-* [cronjob] when a cronjob is executed, it may return an array of data that will be passed as argument on the next execution
-
-### UX
-* ([#93](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/93)) Better integration of address details button: look, position, title tag
-* ([#93](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/93)) Show address detail button on person and household banners
-* Improve residential address position on show onthefly modale
-
-### Traduction francophone des principaux changements
-
-* Ajout d'un filtre "par utilisateur" aux pages de tâche
-* Filtre des actions d'accompagnement par date, type, intervenant
-* export: liste des usagers concernés avec détail de leurs parcours
-* export: ajout d'un regroupement des échanges par localisation
-* export: ajout d'un filtre "parcours ayant reçu un échange entre deux dates"
-* ajout d'une tâche cron pour associer les adresses à une adresse de référence
-* correction: réparation de la liste des notifications sur la page d'accueil, dans le cas où une notification concerne une action ou un document dans une évaluation
-* correction: réparation de la recherche des tiers ayant des codes postaux similaires entre les parents et enfants
-* meilleure intégration du bouton "détail d'une adresse": améliration de la taille et de la position
-* bouton permettant de visualiser les détails d'une adresse (modale avec carte) dans la bannière "Usager" et "Ménage"
-* amélioration de la modale permettant de voir les détails d'un usager: les adresses de résidence sont dans la continuité des autres adresses, et non plus dans une colonne séparée

.changes/v2.5.1.md

@@ -1,3 +0,0 @@
-## v2.5.1 - 2023-07-14
-### Fixed
-* [collate addresses] block collating addresses to another address reference where the address reference is already the best match 

.changie.yaml

@@ -7,7 +7,7 @@ versionFormat: '## {{.Version}} - {{.Time.Format "2006-01-02"}}'
 kindFormat: '### {{.Kind}}'
 # Note: it is possible to add a `.custom.Long` text manually into the yaml file produced by `changie new`. This will add a long description.
 changeFormat: >-
-    * {{ if not (eq .Custom.Issue "") }}([#{{ .Custom.Issue }}](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/{{ .Custom.Issue }})) {{ end }}{{.Body}} {{ if and (.Custom.Long) (not (eq .Custom.Long "")) }}
+    * {{ if not (eq .Custom.Issue "") }}([#{{ .Custom.Issue }}](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/{{ .Custom.Issue }})) {{ end }}{{.Body}} {{ if not (eq .Custom.Long "") }}
 
       {{ .Custom.Long }}{{ end }}
 custom:
@@ -30,8 +30,6 @@ kinds:
         auto: patch
     -   label: DX
         auto: patch
-    -   label: UX
-        auto: patch
 newlines:
     afterChangelogHeader: 1
     beforeChangelogVersion: 1

CHANGELOG.md

@@ -6,48 +6,6 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
-## v2.5.1 - 2023-07-14
-### Fixed
-* [collate addresses] block collating addresses to another address reference where the address reference is already the best match 
-
-## v2.5.0 - 2023-07-14
-### Feature
-* Allow filtering on the basis of a user within general tasks lists
-* ([#120](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/120)) Adding OrderFilter to the list of social actions.
-* ([#125](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/125)) [export] Add a list for people with their associated course
-* [export] Add ordering by person's lastname or course opening date in list which concerns accompanying course or peoples
-* ([#128](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/128)) [Export] allow to group activities by localisation
-* ([#129](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/129)) [export] Add a filter "filter course having an activity between two dates"
-* ([#112](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/112)) [addresses] Add a cronjob to re-associate addresses with addresses reference every 6 hours
-
-### Fixed
-* reimplement the visualization of all calculator results
-* ([#117](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/117)) Repair my unread notification list with actions and evaluations documents
-* ([#126](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/126)) Correct bug in thirdparty API search query: simplify address joins clause for child and parent kind
-
-### DX
-* Documentation for database principles
-* [cronjob] when a cronjob is executed, it may return an array of data that will be passed as argument on the next execution
-
-### UX
-* ([#93](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/93)) Better integration of address details button: look, position, title tag
-* ([#93](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/93)) Show address detail button on person and household banners
-* Improve residential address position on show onthefly modale
-
-### Traduction francophone des principaux changements
-
-* Ajout d'un filtre "par utilisateur" aux pages de tâche
-* Filtre des actions d'accompagnement par date, type, intervenant
-* export: liste des usagers concernés avec détail de leurs parcours
-* export: ajout d'un regroupement des échanges par localisation
-* export: ajout d'un filtre "parcours ayant reçu un échange entre deux dates"
-* ajout d'une tâche cron pour associer les adresses à une adresse de référence
-* correction: réparation de la liste des notifications sur la page d'accueil, dans le cas où une notification concerne une action ou un document dans une évaluation
-* correction: réparation de la recherche des tiers ayant des codes postaux similaires entre les parents et enfants
-* meilleure intégration du bouton "détail d'une adresse": améliration de la taille et de la position
-* bouton permettant de visualiser les détails d'une adresse (modale avec carte) dans la bannière "Usager" et "Ménage"
-* amélioration de la modale permettant de voir les détails d'un usager: les adresses de résidence sont dans la continuité des autres adresses, et non plus dans une colonne séparée
-
 ## v2.4.0 - 2023-07-07
 
 ### Feature

docs/source/development/database-principles.rst

@@ -1,84 +0,0 @@
-
-.. database-principles:
-
-Principes de la base de données
-###############################
-
-Cette page donne une compréhension globale de la base de donnée de Chill, et explique quelques détails d'implémentations qui permettent d'accélérer les traitements à partir de la base de donnée, ou de l'exploiter plus aisément.
-
-Cette page est rédigée en français.
-
-.. note::
-
-    La stabilité du schéma de la base de donnée n'est pas garantie.
-
-    Toutefois, ce dernier évolue relativement peu. Il est rare que des tables ou des colonnes soient supprimées ou renommées. Mais il n'est pas garanti que cela puisse arriver.
-
-Généralités
-===========
-
-Une liste commentée de toutes les tables :download:`est disponible au format CSV <./database/table_list.csv`.
-
-Schéma et conventions de nommage
---------------------------------
-
-Au début de l'histoire de Chill, les schémas postgresql n'étaient pas exploités. Les données étaient stockées dans le schéma :code:`public`.
-
-Par la suite, des nouveaux bundles sont apparus, et les tables ont été classées dans des schémas dédiés.
-
-A l'heure actuelle:
-
-- pour les anciens bundle, ceux qui ont déjà des tables dans le schéma public, les nouvelles tables sont ajoutées à ce schéma. Elles sont préfixées par :code:`chill_<nom du bundle>_`;
-- pour les bundles plus récents, les tables sont créées dans le schéma dédié
-
-Données avec de l'historicité
------------------------------
-
-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;
-- 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.
-
-Dans certains cas, la donnée actuelle (référent d'un parcours, par exemple) est également répétée au niveau de la table en elle-même. Par exemple, la table des parcours :code:`chill_person_accompanying_period` comporte une colonne :code:`step` (le statut du parcours) et :code:`user_id` (id du référent) en plus de l'historique. Bien que redondant, cela simplifie les traitements.
-
-Relations particulières
-=======================
-
-Usagers, ménages, adresses
---------------------------
-
-Les usagers ont une adresse au travers des ménages: dans l'interface, l'adresse est inscrite dans le dossier du ménage, et elle est "donnée" aux usagers membres du ménage, **et** qui partagent l'adresse de ce ménage. En effet, il est possible que des usagers "appartiennent" à un ménage sans y être domicilié: c'est le cas, par exemple, des enfants en garde alternée.
-
-L'historique de l'appartenance des usagers au ménage est conservée, de même que l'historique des adresses pour un même ménage.
-
-Les tables en jeu sont les suivantes:
-
-- la table :code:`chill_person_person` liste les usagers;
-- la table :code:`chill_person_household_members` liste les appartenances au ménage: il s'agit de la jointure entre les usagers et les ménages:
-  - les colonnes :code:`startDate` et :code:`endDate` indiquent la date de début et la date de fin de l'appartenance;
-  - la colonne :code:`shareHousehold` indique si l'utilisateur partage l'adresse du ménage (si oui, sa valeur est :code:`TRUE`)
-- la table :code:`chill_person_household` liste les ménages
-- la table :code:`chill_person_household_to_addresses` associe les ménages aux adresses;
-- la table :code:`chill_main_address` contient les adresses, en indiquant la date de début de validité (:code:`validFrom`) et la fin de validité (:code:`validTo`).
-
-Pour simplifier la résolution des adresses et des usagers, deux vues ont été mises en œuvre:
-
-- la vue :code:`view_chill_person_household_address` reprend, pour chaque usager, l'historique des appartenances au ménage découpée par l'historique des adresses d'un ménage.
-  Autrement dit, une ligne est créée à chaque fois qu'un usager change de ménage, ou qu'un ménage change d'adresse. Il est donc possible de retrouver l'historique complet des adresses pour un usager donné via cette table.
-- la vue :code:`view_chill_person_current_address` reprend l'adresse actuelle des usagers.
-
-Adresses et unités géographiques
---------------------------------
-
-Chill propose des statistiques sur la localisation des adresses par rapport à des zones géographiques (:code:`chill_main_geographical_unit`).
-
-Comme la résolution géographique des adresses est coûteuse en CPU et en temps de traitement, une vue matérialisée a été créée: :code:`view_chill_main_address_geographical_unit`. Elle est rafraichie quotidiennement dans la base de donnée de production.
-
-Liste des tables et commentaires
-================================
-
-Une liste commentée de toutes les tables :download:`est disponible au format CSV <./database/table_list.csv`.

docs/source/development/database/table_list.csv

@@ -1,155 +0,0 @@
-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é)
-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
-6,chill_asideactivity,asideactivity,Activités annexes
-7,chill_asideactivity,asideactivitycategory,Catégories d'activités annexes
-8,chill_budget,charge,Charges du budget
-9,chill_budget,charge_type,Types de charges
-10,chill_budget,resource,Ressources du budget
-11,chill_budget,resource_type,Types de ressources
-12,chill_calendar,calendar,Rendez-vous
-13,chill_calendar,calendar_doc,Document du rendez-vous
-14,chill_calendar,calendar_range,Plage de disponibilité
-15,chill_calendar,calendar_to_persons,association rendez-vous - usagers
-16,chill_calendar,calendar_to_thirdparties,association rendez-vous - tiers
-17,chill_calendar,cancel_reason,Motifs d'annulations
-18,chill_calendar,invite,Invitation aux rendez-vous
-19,chill_doc,accompanyingcourse_document,Documents associés aux parcours
-20,chill_doc,document_category,Catégories de documents
-21,chill_doc,person_document,Documents associés à l'usagers
-22,chill_doc,stored_object,Documents
-23,chill_task,recurring_task,Tâches récurrentes (non utilisé)
-24,chill_task,single_task,Tâches
-25,chill_task,single_task_place_event,Historique des transitions des tâches
-26,chill_vendee,adressederelais,
-27,chill_vendee,center_polygon
-28,chill_vendee,entourage,
-29,chill_vendee,geographical_unit
-30,chill_vendee,geographical_unit_association
-31,chill_vendee,mobilite
-32,chill_vendee,niveauetude
-33,chill_vendee,security_profile
-34,chill_vendee,security_profile_action
-35,chill_vendee,security_profile_jobs
-36,chill_vendee,situationprofessionelle
-37,chill_vendee,statutlogement
-38,chill_vendee,tempsdetravail
-39,chill_vendee,titredesejour
-40,chill_vendee,vendee_person
-41,chill_vendee,vendee_person_mineur
-42,chill_vendee,vendeeperson_entourage
-43,chill_vendee,vendeepersonmineur_adressederelais
-44,public,accompanying_periods_scopes,Services associés aux parcours
-45,public,activity,Échanges
-46,public,activity_activityreason,s
-47,public,activity_person,
-48,public,activity_storedobject,
-49,public,activity_thirdparty,
-50,public,activity_user,
-51,public,activityreason,Sujets d'échange
-52,public,activityreasoncategory,Catégories de sujets
-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.)"
-57,public,chill_activity_activity_chill_person_socialaction,
-58,public,chill_activity_activity_chill_person_socialissue
-59,public,chill_docgen_template,Gabarits de documents
-60,public,chill_main_address,Adresses
-61,public,chill_main_address_legacy,Anciennes adresses (dépréciés)
-62,public,chill_main_address_reference,Adresses de référence
-63,public,chill_main_civility,Civilités
-64,public,chill_main_cronjob_execution,Dernière exécution des tâche cron
-65,public,chill_main_geographical_unit,Unités géographiques
-66,public,chill_main_geographical_unit_layer,Couches d'unités géographiques
-67,public,chill_main_location,Localisations
-68,public,chill_main_location_type,Types de localisations
-69,public,chill_main_notification,Notifications
-70,public,chill_main_notification_addresses_unread
-71,public,chill_main_notification_addresses_user
-72,public,chill_main_notification_comment,
-73,public,chill_main_postal_code,Code postaux
-74,public,chill_main_saved_export,Exports enregistrés
-75,public,chill_main_user_job,Métiers
-76,public,chill_main_workflow_entity,Workflows
-77,public,chill_main_workflow_entity_comment
-78,public,chill_main_workflow_entity_step,Etapes du workflow
-79,public,chill_main_workflow_entity_step_cc_user,
-80,public,chill_main_workflow_entity_step_user
-81,public,chill_main_workflow_entity_step_user_by_accesskey,
-82,public,chill_main_workflow_entity_subscriber_to_final,
-83,public,chill_main_workflow_entity_subscriber_to_step
-84,public,chill_person_accompanying_period,Parcours d'accompagnement
-85,public,chill_person_accompanying_period_closingmotive,Motifs de cloture des parcours
-86,public,chill_person_accompanying_period_comment,Commentaires des parcours
-87,public,chill_person_accompanying_period_location_history,Historique de la localisatio ndes parcours
-88,public,chill_person_accompanying_period_origin,Origine des parcours
-89,public,chill_person_accompanying_period_participation,Appartenance des usagers au parcours
-90,public,chill_person_accompanying_period_resource,Personnes ressources d'un parcours
-91,public,chill_person_accompanying_period_social_issues,
-92,public,chill_person_accompanying_period_step_history
-93,public,chill_person_accompanying_period_user_history
-94,public,chill_person_accompanying_period_work,Actions d'accompagnements
-95,public,chill_person_accompanying_period_work_evaluation,Évaluations (dans les actions d'accompagnements)
-96,public,chill_person_accompanying_period_work_evaluation_document,Documents des évaluations
-97,public,chill_person_accompanying_period_work_goal,Objectifs d'une actions
-98,public,chill_person_accompanying_period_work_goal_result,Objectifs et résultats d'une action
-99,public,chill_person_accompanying_period_work_person,Usagers associés à une actions
-100,public,chill_person_accompanying_period_work_referrer,Référents d'une actions
-101,public,chill_person_accompanying_period_work_result,Résultats d'une action
-102,public,chill_person_accompanying_period_work_third_party,Tiers traitants d'une action
-103,public,chill_person_alt_name,"Noms supplémentaires d'un usager (nom marital, etc.)"
-104,public,chill_person_household,Ménages
-105,public,chill_person_household_composition,
-106,public,chill_person_household_composition_type,Types de composition de ménage
-107,public,chill_person_household_members,Membres du ménages
-108,public,chill_person_household_position,Positions dans le ménage
-109,public,chill_person_household_to_addresses,Association adresses - ménages
-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
-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
-117,public,chill_person_relationships,Relations de filiations
-118,public,chill_person_residential_address,Adresses de résidences
-119,public,chill_person_resource,Personnes ressources (pour les personnes)
-120,public,chill_person_resource_kind,Type de personnes ressources
-121,public,chill_person_social_action,Liste des actions d'accompagnement
-122,public,chill_person_social_action_goal,Objectifs associés à une action
-123,public,chill_person_social_action_result,Résultats associés à une action
-124,public,chill_person_social_issue,Problématiques sociales
-125,public,chill_person_social_work_evaluation,Evaluations disponibles
-126,public,chill_person_social_work_evaluation_action,Associations entre les évaluations et les actions
-127,public,chill_person_social_work_goal,Objectifs disponibles pour une actions
-128,public,chill_person_social_work_goal_result,Objectifs et résultats disponible pour une action
-129,public,chill_person_social_work_result,Résultats disponibles pour une action
-130,public,country,Pays
-131,public,custom_field_long_choice_options,
-132,public,customfield
-133,public,customfieldsdefaultgroup
-134,public,customfieldsgroup
-135,public,geography_columns,Table liée à postgis
-136,public,geometry_columns,Table liée à postgis
-137,public,group_centers,
-138,public,language,Langues
-139,public,messenger_messages,Table système
-140,public,migration_versions,Table système
-141,public,permission_groups
-142,public,permissionsgroup_rolescope
-143,public,persons_spoken_languages
-144,public,regroupment,Regroupement de centres
-145,public,regroupment_center,
-146,public,role_scopes,
-147,public,scopes,Services
-148,public,spatial_ref_sys,Table système (postgis)
-149,public,user_groupcenter,
-150,public,users,Utilisateurs
-151,public,view_chill_person_accompanying_period_info,
-152,public,view_chill_person_current_address
-153,public,view_chill_person_household_address
-154,public,view_chill_person_person_center_history_current

docs/source/development/index.rst

@@ -36,7 +36,6 @@ As Chill rely on the `symfony <http://symfony.com>`_ framework, reading the fram
     Assets <assets.rst>
     Cron Jobs <cronjob.rst>
     Info about entities <entity-info.rst>
-    Info about database (in French) <database-principles.rst>
 
 Layout and UI
 **************

src/Bundle/ChillActivityBundle/Controller/ActivityController.php

@@ -259,8 +259,8 @@ final class ActivityController extends AbstractController
 
         $filterArgs = [
             'my_activities' => $filter->getSingleCheckboxData('my_activities'),
-            'types' => $filter->hasEntityChoice('activity_types') ? $filter->getEntityChoiceData('activity_types') : [],
-            'jobs' => $filter->hasEntityChoice('jobs') ? $filter->getEntityChoiceData('jobs') : [],
+            'types' => $filter->getEntityChoiceData('activity_types'),
+            'jobs' => $filter->getEntityChoiceData('jobs'),
             'before' => $filter->getDateRangeData('activity_date')['to'],
             'after' => $filter->getDateRangeData('activity_date')['from'],
         ];
@@ -327,28 +327,21 @@ final class ActivityController extends AbstractController
 
         $filterBuilder
             ->addDateRange('activity_date', 'activity.date')
-            ->addSingleCheckbox('my_activities', 'activity_filter.My activities');
+            ->addSingleCheckbox('my_activities', 'activity_filter.My activities')
+            ->addEntityChoice('activity_types', 'activity_filter.Types', \Chill\ActivityBundle\Entity\ActivityType::class, $types, [
+                'choice_label' => function (\Chill\ActivityBundle\Entity\ActivityType $activityType) {
+                    $text = match ($activityType->hasCategory()) {
+                        true => $this->translatableStringHelper->localize($activityType->getCategory()->getName()) . ' > ',
+                        false => '',
+                    };
 
-        if (1 < count($types)) {
-            $filterBuilder
-                ->addEntityChoice('activity_types', 'activity_filter.Types', \Chill\ActivityBundle\Entity\ActivityType::class, $types, [
-                    'choice_label' => function (\Chill\ActivityBundle\Entity\ActivityType $activityType) {
-                        $text = match ($activityType->hasCategory()) {
-                            true => $this->translatableStringHelper->localize($activityType->getCategory()->getName()) . ' > ',
-                            false => '',
-                        };
-
-                        return $text . $this->translatableStringHelper->localize($activityType->getName());
-                    }
-                ]);
-        }
-
-        if (1 < count($jobs)) {
-            $filterBuilder
-                ->addEntityChoice('jobs', 'activity_filter.Jobs', UserJob::class, $jobs, [
-                    'choice_label' => fn (UserJob $u) => $this->translatableStringHelper->localize($u->getLabel())
-                ]);
-        }
+                    return $text . $this->translatableStringHelper->localize($activityType->getName());
+                }
+            ])
+            ->addEntityChoice('jobs', 'activity_filter.Jobs', UserJob::class, $jobs, [
+                'choice_label' => fn (UserJob $u) => $this->translatableStringHelper->localize($u->getLabel())
+            ])
+        ;
 
         return $filterBuilder->build();
     }

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityLocationAggregator.php

@@ -1,80 +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\ActivityBundle\Export\Aggregator;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Repository\LocationRepository;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Closure;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
-
-final readonly class ActivityLocationAggregator implements AggregatorInterface
-{
-    public const KEY = 'activity_location_aggregator';
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('actloc', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('activity.location', 'actloc');
-        }
-        $qb->addSelect(sprintf('actloc.name AS %s', self::KEY));
-        $qb->addGroupBy(self::KEY);
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form required for this aggregator
-    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }
-
-    public function getLabels($key, array $values, $data): Closure
-    {
-        return function ($value): string {
-            if ('_header' === $value) {
-                return 'export.aggregator.activity.by_location.Activity Location';
-            }
-
-            if (null === $value || '' === $value) {
-                return '';
-            }
-
-            return $value;
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return [self::KEY];
-    }
-
-    public function getTitle()
-    {
-        return 'export.aggregator.activity.by_location.Title';
-    }
-}

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/PeriodHavingActivityBetweenDatesFilter.php

@@ -1,90 +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\ActivityBundle\Export\Filter\ACPFilters;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Form\Type\PickRollingDateType;
-use Chill\MainBundle\Service\RollingDate\RollingDate;
-use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-
-final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInterface
-{
-    public function __construct(
-        private RollingDateConverterInterface $rollingDateConverter,
-    ) {
-    }
-
-    public function getTitle()
-    {
-        return 'export.filter.activity.course_having_activity_between_date.Title';
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder
-            ->add('start_date', PickRollingDateType::class, [
-                'label' => 'export.filter.activity.course_having_activity_between_date.Receiving an activity after'
-            ])
-            ->add('end_date', PickRollingDateType::class, [
-                'label' => 'export.filter.activity.course_having_activity_between_date.Receiving an activity before'
-            ]);
-    }
-
-    public function getFormDefaultData(): array
-    {
-        return [
-            'start_date' => new RollingDate(RollingDate::T_YEAR_CURRENT_START),
-            'end_date' => new RollingDate(RollingDate::T_TODAY)
-        ];
-    }
-
-    public function describeAction($data, $format = 'string')
-    {
-        return [
-            'export.filter.activity.course_having_activity_between_date.Only course having an activity between from and to',
-            [
-                'from' => $this->rollingDateConverter->convert($data['start_date']),
-                'to' => $this->rollingDateConverter->convert($data['end_date']),
-            ]
-        ];
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $alias = 'act_period_having_act_betw_date_alias';
-        $from = 'act_period_having_act_betw_date_start';
-        $to = 'act_period_having_act_betw_date_end';
-
-        $qb->andWhere(
-            $qb->expr()->exists(
-                'SELECT 1 FROM ' . Activity::class . " {$alias} WHERE {$alias}.date >= :{$from} AND {$alias}.date < :{$to} AND {$alias}.accompanyingPeriod = acp"
-            )
-        );
-
-        $qb
-            ->setParameter($from, $this->rollingDateConverter->convert($data['start_date']))
-            ->setParameter($to, $this->rollingDateConverter->convert($data['end_date']));
-    }
-
-    public function applyOn()
-    {
-        return \Chill\PersonBundle\Export\Declarations::ACP_TYPE;
-    }
-}

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

@@ -135,10 +135,6 @@ services:
         tags:
             - { name: chill.export_filter, alias: 'accompanyingcourse_has_no_activity_filter' }
 
-    Chill\ActivityBundle\Export\Filter\ACPFilters\PeriodHavingActivityBetweenDatesFilter:
-        tags:
-            - { name: chill.export_filter, alias: 'period_having_activity_betw_dates_filter' }
-
     ## Aggregators
     Chill\ActivityBundle\Export\Aggregator\PersonAggregators\ActivityReasonAggregator:
         tags:
@@ -148,10 +144,6 @@ services:
         tags:
             - { name: chill.export_aggregator, alias: activity_common_type_aggregator }
 
-    Chill\ActivityBundle\Export\Aggregator\ActivityLocationAggregator:
-        tags:
-            - { name: chill.export_aggregator, alias: activity_common_location_aggregator }
-
     chill.activity.export.user_aggregator:
         class: Chill\ActivityBundle\Export\Aggregator\ActivityUserAggregator
         tags:

src/Bundle/ChillActivityBundle/translations/messages+intl-icu.fr.yml

@@ -1,5 +0,0 @@
-export:
-    filter:
-        activity:
-            course_having_activity_between_date:
-                Only course having an activity between from and to: Seulement les parcours ayant reçu au moins un échange entre le {from, date, short} et le {to, date, short}

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

@@ -96,6 +96,9 @@ activity_filter:
     My activities: Mes échanges (où j'interviens)
     Types: Par type d'échange
     Jobs: Par métier impliqué
+    By: Filtrer par
+    Search: Chercher dans la liste
+    By date: Filtrer par date
 
 #timeline
 '%user% has done an %activity_type%': '%user% a effectué un échange de type "%activity_type%"'
@@ -373,12 +376,6 @@ export:
             by_usersscope:
                 Filter by users scope: Filtrer les échanges par services d'au moins un utilisateur participant
                 'Filtered activity by users scope: only %scopes%': 'Filtré par service d''au moins un utilisateur participant: seulement %scopes%'
-            course_having_activity_between_date:
-                Title: Filtre les parcours ayant reçu un échange entre deux dates
-                Receiving an activity after: Ayant reçu un échange après le
-                Receiving an activity before: Ayant reçu un échange avant le
-
-
     aggregator:
         activity:
             by_sent_received:
@@ -386,9 +383,6 @@ export:
                 is sent: envoyé
                 is received: reçu
                 Group activity by sentreceived: Grouper les échanges par envoyé / reçu
-            by_location:
-                Activity Location: Localisation de l'échange
-                Title: Grouper les échanges par localisation de l'échange
 
 generic_doc:
     filter:

src/Bundle/ChillBudgetBundle/Resources/views/Budget/_macros.html.twig

@@ -1,12 +1,11 @@
-{% macro table_elements(elements, type) %}
-
+{% macro table_elements(elements, family) %}
 <table class="table table-bordered border-dark budget-table">
     <thead>
         <tr>
-            <th class="{{ type }} el-type">{{ 'Budget element type'|trans }}</th>
-            <th class="{{ type }}">{{ 'Amount'|trans }}</th>
-            <th class="{{ type }}">{{ 'Validity period'|trans }}</th>
-            <th class="{{ type }}">&nbsp;</th>
+            <th class="{{ family }} el-type">{{ 'Budget element type'|trans }}</th>
+            <th class="{{ family }}">{{ 'Amount'|trans }}</th>
+            <th class="{{ family }}">{{ 'Validity period'|trans }}</th>
+            <th class="{{ family }}">&nbsp;</th>
         </tr>
     </thead>
     <tbody>
@@ -39,17 +38,17 @@
                 <ul class="record_actions">
                     {% if is_granted('CHILL_BUDGET_ELEMENT_SEE', f) %}
                         <li>
-                            <a href="{{ path('chill_budget_' ~ type ~ '_view', { 'id': f.id } ) }}" class="btn btn-sm btn-show"></a>
+                            <a href="{{ path('chill_budget_' ~ family ~ '_view', { 'id': f.id } ) }}" class="btn btn-sm btn-show"></a>
                         </li>
                     {% endif %}
                     {% if is_granted('CHILL_BUDGET_ELEMENT_UPDATE', f) %}
                         <li>
-                            <a href="{{ path('chill_budget_' ~ type ~'_edit', { 'id': f.id } ) }}" class="btn btn-sm btn-edit"></a>
+                            <a href="{{ path('chill_budget_' ~ family ~'_edit', { 'id': f.id } ) }}" class="btn btn-sm btn-edit"></a>
                         </li>
                     {% endif %}
                     {% if is_granted('CHILL_BUDGET_ELEMENT_DELETE', f) %}
                         <li>
-                            <a href="{{ path('chill_budget_' ~ type ~ '_delete', { 'id': f.id } ) }}" class="btn btn-sm btn-delete"></a>
+                            <a href="{{ path('chill_budget_' ~ family ~ '_delete', { 'id': f.id } ) }}" class="btn btn-sm btn-delete"></a>
                         </li>
                     {% endif %}
                 </ul>
@@ -70,7 +69,7 @@
 </table>
 {% endmacro %}
 
-{% macro table_results(actualCharges, actualResources, results) %}
+{% macro table_results(actualCharges, actualResources) %}
 
 {% set totalCharges = 0 %}
 {% for c in actualCharges %}
@@ -98,20 +97,6 @@
                 {{ result|format_currency('EUR') }}
             </td>
         </tr>
-        {% for result in results %}
-            <tr>
-                <td>{{ result.label }}</td>
-                <td>
-                    {% if result.type == 'currency' %}
-                        {{ result.result|format_currency('EUR') }}
-                    {% elseif result.type == 'percentage' %}
-                        {{ result.result|round(2, 'ceil') ~ '%' }}
-                    {% else %}
-                        {{ result.result|round(2, 'common') }}
-                    {% endif %}
-                </td>
-            </tr>
-        {% endfor %}
     </tbody>
 </table>
 {% endmacro %}

src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig

@@ -25,7 +25,7 @@
 
 <div class="mt-5">
     <h3 class="subtitle">{{ 'Budget calculator'|trans }}</h3>
-    {{ table_results(charges, resources, results) }}
+    {{ table_results(charges, resources) }}
 </div>
 
 {% if is_granted('CHILL_BUDGET_ELEMENT_CREATE', person) %}

src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php

@@ -46,7 +46,8 @@ class AccompanyingCourseDocumentWorkflowHandler implements EntityWorkflowHandler
 
     public function getEntityData(EntityWorkflow $entityWorkflow, array $options = []): array
     {
-        $course = $this->getRelatedEntity($entityWorkflow)?->getCourse();
+        $course = $this->getRelatedEntity($entityWorkflow)
+            ->getCourse();
         $persons = [];
 
         if (null !== $course) {

src/Bundle/ChillMainBundle/Cron/CronJobInterface.php

@@ -19,13 +19,5 @@ interface CronJobInterface
 
     public function getKey(): string;
 
-    /**
-     * Execute the cronjob
-     *
-     * If data is returned, this data is passed as argument on the next execution
-     *
-     * @param array $lastExecutionData the data which was returned from the previous execution
-     * @return array|null optionally return an array with the same data than the previous execution
-     */
-    public function run(array $lastExecutionData): null|array;
+    public function run(): void;
 }

src/Bundle/ChillMainBundle/Cron/CronManager.php

@@ -14,7 +14,6 @@ namespace Chill\MainBundle\Cron;
 use Chill\MainBundle\Entity\CronJobExecution;
 use Chill\MainBundle\Repository\CronJobExecutionRepositoryInterface;
 use DateTimeImmutable;
-use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Exception;
 use Psr\Log\LoggerInterface;
@@ -47,8 +46,6 @@ class CronManager implements CronManagerInterface
 
     private const UPDATE_BEFORE_EXEC = 'UPDATE ' . CronJobExecution::class . ' cr SET cr.lastStart = :now WHERE cr.key = :key';
 
-    private const UPDATE_LAST_EXECUTION_DATA = 'UPDATE ' . CronJobExecution::class . ' cr SET cr.lastExecutionData = :data WHERE cr.key = :key';
-
     private CronJobExecutionRepositoryInterface $cronJobExecutionRepository;
 
     private EntityManagerInterface $entityManager;
@@ -88,9 +85,6 @@ class CronManager implements CronManagerInterface
         foreach ($orderedJobs as $job) {
             if ($job->canRun($lasts[$job->getKey()] ?? null)) {
                 if (array_key_exists($job->getKey(), $lasts)) {
-
-                    $executionData = $lasts[$job->getKey()]->getLastExecutionData();
-
                     $this->entityManager
                         ->createQuery(self::UPDATE_BEFORE_EXEC)
                         ->setParameters([
@@ -102,17 +96,12 @@ class CronManager implements CronManagerInterface
                     $execution = new CronJobExecution($job->getKey());
                     $this->entityManager->persist($execution);
                     $this->entityManager->flush();
-
-                    $executionData = $execution->getLastExecutionData();
                 }
                 $this->entityManager->clear();
 
-                // note: at this step, the entity manager does not have any entity CronJobExecution
-                // into his internal memory
-
                 try {
                     $this->logger->info(sprintf('%sWill run job', self::LOG_PREFIX), ['job' => $job->getKey()]);
-                    $result = $job->run($executionData);
+                    $job->run();
 
                     $this->entityManager
                         ->createQuery(self::UPDATE_AFTER_EXEC)
@@ -123,14 +112,6 @@ class CronManager implements CronManagerInterface
                         ])
                         ->execute();
 
-                    if (null !== $result) {
-                        $this->entityManager
-                            ->createQuery(self::UPDATE_LAST_EXECUTION_DATA)
-                            ->setParameter('data', $result, Types::JSON)
-                            ->setParameter('key', $job->getKey(), Types::STRING)
-                            ->execute();
-                    }
-
                     $this->logger->info(sprintf('%sSuccessfully run job', self::LOG_PREFIX), ['job' => $job->getKey()]);
 
                     return;
@@ -152,7 +133,7 @@ class CronManager implements CronManagerInterface
     }
 
     /**
-     * @return array{0: array<CronJobInterface>, 1: array<string, CronJobExecution>}
+     * @return array<0: CronJobInterface[], 1: array<string, CronJobExecution>>
      */
     private function getOrderedJobs(): array
     {
@@ -193,7 +174,7 @@ class CronManager implements CronManagerInterface
     {
         foreach ($this->jobs as $job) {
             if ($job->getKey() === $forceJob) {
-                $job->run([]);
+                $job->run();
             }
         }
     }

src/Bundle/ChillMainBundle/Entity/CronJobExecution.php

@@ -31,6 +31,7 @@ class CronJobExecution
     private string $key;
 
     /**
+     * @var DateTimeImmutable
      * @ORM\Column(type="datetime_immutable", nullable=true, options={"default": null})
      */
     private ?DateTimeImmutable $lastEnd = null;
@@ -45,11 +46,6 @@ class CronJobExecution
      */
     private ?int $lastStatus = null;
 
-    /**
-     * @ORM\Column(type="json", options={"default": "'{}'::jsonb", "jsonb": true})
-     */
-    private array $lastExecutionData = [];
-
     public function __construct(string $key)
     {
         $this->key = $key;
@@ -96,16 +92,4 @@ class CronJobExecution
 
         return $this;
     }
-
-    public function getLastExecutionData(): array
-    {
-        return $this->lastExecutionData;
-    }
-
-    public function setLastExecutionData(array $lastExecutionData): CronJobExecution
-    {
-        $this->lastExecutionData = $lastExecutionData;
-
-        return $this;
-    }
 }

src/Bundle/ChillMainBundle/Export/ExportInterface.php

@@ -97,7 +97,7 @@ interface ExportInterface extends ExportElementInterface
      * @param mixed[] $values The values from the result. if there are duplicates, those might be given twice. Example: array('FR', 'BE', 'CZ', 'FR', 'BE', 'FR')
      * @param mixed $data The data from the export's form (as defined in `buildForm`)
      *
-     * @return (callable(null|string|int|float|'_header' $value): string|int|\DateTimeInterface) where the first argument is the value, and the function should return the label to show in the formatted file. Example : `function($countryCode) use ($countries) { return $countries[$countryCode]->getName(); }`
+     * @return callable(null|string|int|float|'_header' $value): string|int|\DateTimeInterface where the first argument is the value, and the function should return the label to show in the formatted file. Example : `function($countryCode) use ($countries) { return $countries[$countryCode]->getName(); }`
      */
     public function getLabels($key, array $values, $data);
 

src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php

@@ -40,7 +40,7 @@ final class FilterOrderType extends \Symfony\Component\Form\AbstractType
                 'label' => false,
                 'required' => false,
                 'attr' => [
-                    'placeholder' => 'filter_order.Search',
+                    'placeholder' => 'activity_filter.Search',
                 ]
             ]);
         }
@@ -48,7 +48,16 @@ final class FilterOrderType extends \Symfony\Component\Form\AbstractType
         $checkboxesBuilder = $builder->create('checkboxes', null, ['compound' => true]);
 
         foreach ($helper->getCheckboxes() as $name => $c) {
-            $choices = self::buildCheckboxChoices($c['choices'], $c['trans']);
+            $choices = array_combine(
+                array_map(static function ($c, $t) {
+                    if (null !== $t) {
+                        return $t;
+                    }
+
+                    return $c;
+                }, $c['choices'], $c['trans']),
+                $c['choices']
+            );
 
             $checkboxesBuilder->add($name, ChoiceType::class, [
                 'choices' => $choices,
@@ -139,20 +148,6 @@ final class FilterOrderType extends \Symfony\Component\Form\AbstractType
 
     }
 
-    public static function buildCheckboxChoices(array $choices, array $trans = []): array
-    {
-        return array_combine(
-            array_map(static function ($c, $t) {
-                if (null !== $t) {
-                    return $t;
-                }
-
-                return $c;
-            }, $choices, $trans),
-            $choices
-        );
-    }
-
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         /** @var FilterOrderHelper $helper */

src/Bundle/ChillMainBundle/Resources/public/chill/scss/forms.scss

@@ -44,5 +44,13 @@ form {
 }
 
 .chill_filter_order {
-    background: $gray-100;
+    background: $gray-100; /*
+    border: 3px dashed $white;
+    background: repeating-linear-gradient(
+        -45deg,
+        $gray-100,
+        $gray-100 2px,
+        $white 2px,
+        $white 6px
+    ); */
 }

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue

@@ -66,10 +66,6 @@ export default {
                return appMessages.fr.the_activity;
             case 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod':
                return appMessages.fr.the_course;
-            case 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork':
-               return appMessages.fr.the_action;
-            case 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument':
-               return appMessages.fr.the_evaluation_document;
             case 'Chill\\MainBundle\\Entity\\Workflow\\EntityWorkflow':
                return appMessages.fr.the_workflow;
             default:
@@ -82,10 +78,6 @@ export default {
                return `/fr/activity/${n.relatedEntityId}/show`
             case 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod':
                return `/fr/parcours/${n.relatedEntityId}`
-            case 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork':
-               return `/fr/person/accompanying-period/work/${n.relatedEntityId}/show`
-            case 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument':
-               return `/fr/person/accompanying-period/work/evaluation/document/${n.relatedEntityId}/show`
             case 'Chill\\MainBundle\\Entity\\Workflow\\EntityWorkflow':
                return `/fr/main/workflow/${n.relatedEntityId}/show`
             default:

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js

@@ -46,7 +46,6 @@ const appMessages = {
         the_course: "le parcours",
         the_action: "l'action",
         the_evaluation: "l'évaluation",
-        the_evaluation_document: "le document",
         the_task: "la tâche",
         the_workflow: "le workflow",
         StartDate: "Date d'ouverture",

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/AddressDetailsButton.vue

@@ -1,7 +1,7 @@
 <template>
   <span v-if="data.working_ref_status === 'to_review'" class="badge bg-danger address-details-button-warning">L'adresse de référence a été modifiée</span>
-  <a v-if="data.loading === false" @click.prevent="clickOrOpen" class="btn btn-sm address-details-button" title="Plus de détails">
-    <span class="fa fa-map-o"></span>
+  <a v-if="data.loading === false" @click.prevent="clickOrOpen" class="btn btn-misc address-details-button">
+    <span class="fa fa-map"></span> <!-- button -->
   </a>
   <span v-if="data.loading" class="fa fa-spin fa-spinner "></span>
   <AddressModal :address="data.working_address" @update-address="onUpdateAddress" ref="address_modal"></AddressModal>

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue

@@ -1,6 +1,6 @@
 <template>
 
-   <component :is="component" class="chill-entity entity-address">
+   <component :is="component" class="chill-entity entity-address my-3">
 
       <component :is="component" class="address" :class="multiline">
 

src/Bundle/ChillMainBundle/Resources/views/FilterOrder/base.html.twig

@@ -1,144 +1,110 @@
 {{ form_start(form) }}
-<div class="accordion my-3" id="filterOrderAccordion">
-    <h2 class="accordion-header" id="filterOrderHeading">
-        <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#filterOrderCollapse" aria-expanded="true" aria-controls="filterOrderCollapse">
-            <strong><i class="fa fa-fw fa-filter"></i>Filtrer la liste</strong>
-        </button>
-    </h2>
-    <div class="accordion-collapse collapse" id="filterOrderCollapse" aria-labelledby="filterOrderHeading" data-bs-parent="#filterOrderAccordion">
-        {% set btnSubmit = 0 %}
-        <div class="accordion-body chill_filter_order container-xxl p-5 py-2">
-            <div class="row my-2">
-                {% if form.vars.has_search_box %}
-                    <div class="col-sm-12">
-                        <div class="input-group">
-                            {{ form_widget(form.q) }}
-                            <button type="submit" class="btn btn-misc"><i class="fa fa-search"></i></button>
-                        </div>
-                    </div>
-                {% endif %}
-            </div>
-
-            {% if form.dateRanges is defined %}
-                {% set btnSubmit = 1 %}
-                {% if form.dateRanges|length > 0 %}
-                    {% for dateRangeName, _o in form.dateRanges %}
-                        <div class="row my-2">
-                            {% if form.dateRanges[dateRangeName].vars.label is not same as(false) %}
-                                {{ form_label(form.dateRanges[dateRangeName])}}
-                            {% else %}
-                                <div class="col-sm-4 col-form-label">{{ 'filter_order.By date'|trans }}</div>
-                            {% endif %}
-                            <div class="col-sm-8 pt-1">
-                                <div class="input-group">
-                                    <span class="input-group-text">{{ 'chill_calendar.From'|trans }}</span>
-                                    {{ form_widget(form.dateRanges[dateRangeName]['from']) }}
-                                    <span class="input-group-text">{{ 'chill_calendar.To'|trans }}</span>
-                                    {{ form_widget(form.dateRanges[dateRangeName]['to']) }}
-                                </div>
-                            </div>
-                        </div>
-                    {% endfor %}
-                {% endif %}
+    {% set btnSubmit = 0 %}
+    <div class="chill_filter_order container-xxl p-5 py-2 my-3">
+        <div class="row my-2">
+            {% if form.vars.has_search_box %}
+              <div class="col-sm-12">
+                  <div class="input-group">
+                      {{ form_widget(form.q) }}
+                      <button type="submit" class="btn btn-misc"><i class="fa fa-search"></i></button>
+                  </div>
+              </div>
             {% endif %}
-
-            {% if form.checkboxes is defined %}
-                {% set btnSubmit = 1 %}
-                {% if form.checkboxes|length > 0 %}
-                    {% for checkbox_name, options in form.checkboxes %}
-                        <div class="row my-2">
-                            <div class="col-sm-4 col-form-label">{{ 'filter_order.By'|trans }}</div>
-                            <div class="col-sm-8 pt-2">
-                                {% for c in form['checkboxes'][checkbox_name].children %}
-                                    {{ form_widget(c) }}
-                                    {{ form_label(c) }}
-                                {% endfor %}
-                            </div>
-                        </div>
-                    {% endfor %}
-                {% endif %}
-            {% endif %}
-
-            {% if form.entity_choices is defined %}
-                {% set btnSubmit = 1 %}
-                {% if form.entity_choices |length > 0 %}
-                    {% for checkbox_name, options in form.entity_choices %}
-                        <div class="row my-2">
-                            {% if form.entity_choices[checkbox_name].vars.label is not same as(false) %}
-                                {{ form_label(form.entity_choices[checkbox_name])}}
-                            {% endif %}
-                            <div class="col-sm-8 pt-2">
-                                {% for c in form['entity_choices'][checkbox_name].children %}
-                                    {{ form_widget(c) }}
-                                    {{ form_label(c) }}
-                                {% endfor %}
-                            </div>
-                        </div>
-                    {% endfor %}
-                {% endif %}
-            {% endif %}
-
-            {% if form.user_pickers is defined %}
-                {% set btnSubmit = 1 %}
-                {% if form.user_pickers.children|length > 0 %}
-                    {% for name, options in form.user_pickers %}
-                        <div class="row my-2">
-                            {% if form.user_pickers[name].vars.label is not same as(false) %}
-                                {{ form_label(form.user_pickers[name]) }}
-                            {% else %}
-                                {{ form_label(form.user_pickers[name].vars.label) }}
-                            {% endif %}
-                            <div class="col-sm-8 pt-2">
-                                {{ form_widget(form.user_pickers[name]) }}
-                            </div>
-                        </div>
-                    {% endfor %}
-                {% endif %}
-            {% endif %}
-
-            {% if form.single_checkboxes is defined %}
-                {% set btnSubmit = 1 %}
-                {% for name, _o in form.single_checkboxes %}
+        </div>
+        {% if form.dateRanges is defined %}
+            {% set btnSubmit = 1 %}
+            {% if form.dateRanges|length > 0 %}
+                {% for dateRangeName, _o in form.dateRanges %}
                     <div class="row my-2">
-                        <div class="col-sm-4 col-form-label">{{ 'filter_order.By'|trans }}</div>
-                        <div class="col-sm-8 pt-2">
-                            {{ form_widget(form.single_checkboxes[name]) }}
+                        {% if form.dateRanges[dateRangeName].vars.label is not same as(false) %}
+                            {{ form_label(form.dateRanges[dateRangeName])}}
+                        {% else %}
+                            <div class="col-sm-4 col-form-label">{{ 'activity_filter.By date'|trans }}</div>
+                        {% endif %}
+                        <div class="col-sm-8 pt-1">
+                            <div class="input-group">
+                                <span class="input-group-text">{{ 'chill_calendar.From'|trans }}</span>
+                                {{ form_widget(form.dateRanges[dateRangeName]['from']) }}
+                                <span class="input-group-text">{{ 'chill_calendar.To'|trans }}</span>
+                                {{ form_widget(form.dateRanges[dateRangeName]['to']) }}
+                            </div>
                         </div>
                     </div>
                 {% endfor %}
             {% endif %}
-
-            {% if btnSubmit == 1 %}
-                <div class="row my-2">
-                    <button type="submit" class="btn btn-sm btn-misc"><i class="fa fa-fw fa-filter"></i>{{ 'Filter'|trans }}</button>
-                </div>
+        {% endif %}
+        {% if form.checkboxes is defined %}
+            {% set btnSubmit = 1 %}
+            {% if form.checkboxes|length > 0 %}
+                {% for checkbox_name, options in form.checkboxes %}
+                    <div class="row my-2">
+                        <div class="col-sm-4 col-form-label">{{ 'activity_filter.By'|trans }}</div>
+                        <div class="col-sm-8 pt-2">
+                            {% for c in form['checkboxes'][checkbox_name].children %}
+                                {{ form_widget(c) }}
+                                {{ form_label(c) }}
+                            {% endfor %}
+                        </div>
+                    </div>
+                {% endfor %}
             {% endif %}
+        {% endif %}
+        {% if form.entity_choices is defined %}
+            {% set btnSubmit = 1 %}
+            {% if form.entity_choices |length > 0 %}
+                {% for checkbox_name, options in form.entity_choices %}
+                    <div class="row my-2">
+                        {% if form.entity_choices[checkbox_name].vars.label is not same as(false) %}
+                            {{ form_label(form.entity_choices[checkbox_name])}}
+                        {% endif %}
+                        <div class="col-sm-8 pt-2">
+                            {% for c in form['entity_choices'][checkbox_name].children %}
+                                {{ form_widget(c) }}
+                                {{ form_label(c) }}
+                            {% endfor %}
+                        </div>
+                    </div>
+                {% endfor %}
+            {% endif %}
+        {% endif %}
+        {% if form.user_pickers is defined %}
+            {% set btnSubmit = 1 %}
+            {% if form.user_pickers.children|length > 0 %}
+                {% for name, options in form.user_pickers %}
+                    <div class="row my-2">
+                        {% if form.user_pickers[name].vars.label is not same as(false) %}
+                            {{ form_label(form.user_pickers[name]) }}
+                        {% else %}
+                            {{ form_label(form.user_pickers[name].vars.label) }}
+                        {% endif %}
+                        <div class="col-sm-8 pt-2">
+                            {{ form_widget(form.user_pickers[name]) }}
+                        </div>
+                    </div>
+                {% endfor %}
+            {% endif %}
+        {% endif %}
 
-        </div>
-    </div>
-
-    {% if active|length > 0 %}
-        <div class="activeFilters mt-3">
-            {% for f in active %}
-                <span class="badge rounded-pill bg-secondary ms-1 {{ f.position }} {{ f.name }}">
-                    {%- if f.label != '' %}
-                        <span class="text-dark">{{ f.label|trans }}&nbsp;: </span>
-                    {% endif -%}
-                    {%- if f.position == 'search_box' and f.value is not null %}
-                        <span class="text-dark">{{ 'filter_order.search_box'|trans ~ ' :' }}</span>
-                    {% endif -%}
-                    {{ f.value}}{#
-                #}</span>
+        {% if form.single_checkboxes is defined %}
+            {% set btnSubmit = 1 %}
+            {% for name, _o in form.single_checkboxes %}
+                <div class="row my-2">
+                    <div class="col-sm-4 col-form-label">{{ 'activity_filter.By'|trans }}</div>
+                    <div class="col-sm-8 pt-2">
+                        {{ form_widget(form.single_checkboxes[name]) }}
+                    </div>
+                </div>
             {% endfor %}
-        </div>
-    {% endif %}
-    <div>
+        {% endif %}
 
+        {% if btnSubmit == 1 %}
+            <div class="row my-2">
+                <button type="submit" class="btn btn-sm btn-misc"><i class="fa fa-fw fa-filter"></i>{{ 'Filter'|trans }}</button>
+            </div>
+        {% endif %}
     </div>
-</div>
 
-{% for k,v in otherParameters %}
-    <input type="hidden" name="{{ k }}" value="{{ v }}" />
-{% endfor %}
+    {% for k,v in otherParameters %}
+        <input type="hidden" name="{{ k }}" value="{{ v }}" />
+    {% endfor %}
 {{ form_end(form) }}
-

src/Bundle/ChillMainBundle/Service/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCode.php

@@ -1,144 +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\Service\AddressGeographicalUnit;
-
-use Doctrine\DBAL\Connection;
-use Psr\Log\LoggerInterface;
-
-final readonly class CollateAddressWithReferenceOrPostalCode implements CollateAddressWithReferenceOrPostalCodeInterface
-{
-    private const LOG_PREFIX = '[collate addresses] ';
-    /**
-     * For the address having an "invented" postal code, find the postal code "reference" with the same code,
-     * and the most similar name. When two reference code match, we add
-     *
-     * This query intentionally includes also address with reference, as the reference may be wrong.
-     */
-    private const FORCE_ORIGINAL_POSTAL_CODE = <<<'SQL'
-        WITH recollate AS (
-            SELECT * FROM (
-                              SELECT cma.id AS address_id, cmpc.id, cmpc.label, cmpc.code, cmpc_reference.id AS cmpc_reference_id, cmpc_reference.label, cmpc_reference.code,
-                                     RANK() OVER (PARTITION BY cma.id ORDER BY SIMILARITY(cmpc.label, cmpc_reference.label) DESC, cmpc_reference.id ASC) AS ranked
-                              FROM
-                                  chill_main_address cma JOIN chill_main_postal_code cmpc on cma.postcode_id = cmpc.id,
-                                  chill_main_postal_code cmpc_reference
-                              WHERE
-                                -- use only postal code which are reference
-                                      cmpc_reference.id != cmpc.id AND cmpc_reference.origin = 0
-                                -- only where cmpc is created manually
-                                AND cmpc.origin != 0
-                                -- only when postal code match
-                                AND TRIM(REPLACE(LOWER(cmpc.code), ' ', '')) = LOWER(cmpc_reference.code)
-                                AND cmpc.country_id = cmpc_reference.country_id
-                                AND cma.id > :since_id -- to set the first id
-                          ) sq
-            WHERE ranked = 1)
-        UPDATE chill_main_address SET postcode_id = cmpc_reference_id FROM recollate WHERE recollate.address_id = chill_main_address.id;
-    SQL;
-
-    /**
-     * associate the address with the most similar address reference.
-     *
-     * This query intentionally ignores the existing addressreference_id, to let fixing the address match the
-     * most similar address reference.
-     */
-    private const FORCE_MOST_SIMILAR_ADDRESS_REFERENCE = <<<'SQL'
-        WITH recollate AS (
-            SELECT * FROM (
-                  SELECT cma.id AS address_id, cma.streetnumber, cma.street,  cmpc.code, cmpc.label, cmar.id AS address_reference_id, cmar.streetnumber, cmar.street, cmpc_reference.code, cmpc_reference.label,
-                         similarity(cma.street, cmar.street),
-                         RANK() OVER (PARTITION BY cma.id ORDER BY SIMILARITY (cma.street, cmar.street) DESC, SIMILARITY (cma.streetnumber, cmar.streetnumber), cmar.id ASC) AS ranked
-                  FROM
-                      chill_main_address cma
-                          JOIN chill_main_postal_code cmpc on cma.postcode_id = cmpc.id,
-                      chill_main_address_reference cmar JOIN chill_main_postal_code cmpc_reference ON cmar.postcode_id = cmpc_reference.id
-                  WHERE
-                    -- only if cmpc is a reference (must be matched before executing this query)
-                    cma.postcode_id = cmar.postcode_id
-                    -- join cmpc to cma
-                    AND SIMILARITY(LOWER(cma.street), LOWER(cmar.street)) > 0.6 AND LOWER(cma.streetnumber) = LOWER(cmar.streetnumber)
-                    -- only addresses which match the address reference - let the user decide if the reference has changed
-                    AND cma.refstatus = 'match'
-                    -- only the most recent
-                    AND cma.id > :since_id
-              ) AS sq
-            WHERE ranked = 1
-        )
-        UPDATE chill_main_address SET addressreference_id = recollate.address_reference_id FROM recollate WHERE chill_main_address.id = recollate.address_id;
-    SQL;
-
-    private const UPDATE_POINT = <<<'SQL'
-        WITH address_geom AS (
-            SELECT cma.id AS address_id, COALESCE(cmar.point, cmpc.center) AS point
-            FROM chill_main_address cma
-            LEFT JOIN chill_main_address_reference cmar ON cma.addressreference_id = cmar.id
-            LEFT JOIN chill_main_postal_code cmpc ON cma.postcode_id = cmpc.id
-            WHERE cma.id > :since_id
-        )
-        UPDATE chill_main_address SET point = address_geom.point FROM address_geom WHERE address_geom.address_id = chill_main_address.id
-    SQL;
-
-    private const MAX_ADDRESS_ID = <<<'SQL'
-        SELECT MAX(id) AS max_id FROM chill_main_address;
-    SQL;
-
-
-    public function __construct(
-        private Connection $connection,
-        private LoggerInterface $logger,
-    ) {
-    }
-
-    /**
-     * @throws \Throwable
-     */
-    public function __invoke(int $sinceId = 0): int
-    {
-        try {
-            [
-                $postCodeSetReferenceFromMostSimilar,
-                $addressReferenceMatch,
-                $pointUpdates,
-                $lastId,
-            ] = $this->connection->transactional(function () use ($sinceId) {
-                $postCodeSetReferenceFromMostSimilar = $this->connection->executeStatement(self::FORCE_ORIGINAL_POSTAL_CODE, ['since_id' => $sinceId]);
-                $addressReferenceMatch = $this->connection->executeStatement(self::FORCE_MOST_SIMILAR_ADDRESS_REFERENCE, ['since_id' => $sinceId]);
-                $pointUpdates = $this->connection->executeStatement(self::UPDATE_POINT, ['since_id' => $sinceId]);
-                $lastId = $this->connection->fetchOne(self::MAX_ADDRESS_ID);
-
-                return [
-                    $postCodeSetReferenceFromMostSimilar,
-                    $addressReferenceMatch,
-                    $pointUpdates,
-                    $lastId,
-                ];
-            });
-        } catch (\Throwable $e) {
-            $this->logger->error(self::LOG_PREFIX . "error while re-collating addresses", [
-                'message' => $e->getMessage(),
-                'trace' => $e->getTraceAsString()
-            ]);
-
-            throw $e;
-        }
-
-        $this->logger->info(self::LOG_PREFIX . "Collate the addresses with reference", [
-            'set_postcode_from_most_similar' => $postCodeSetReferenceFromMostSimilar,
-            'address_reference_match' => $addressReferenceMatch,
-            'point_update' => $pointUpdates,
-            'since_id' => $sinceId,
-            'last_id' => $lastId,
-        ]);
-
-        return $lastId;
-    }
-}

src/Bundle/ChillMainBundle/Service/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCodeCronJob.php

@@ -1,50 +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\Service\AddressGeographicalUnit;
-
-use Chill\MainBundle\Cron\CronJobInterface;
-use Chill\MainBundle\Entity\CronJobExecution;
-use Symfony\Component\Clock\ClockInterface;
-
-final readonly class CollateAddressWithReferenceOrPostalCodeCronJob implements CronJobInterface
-{
-    private const LAST_MAX_ID = 'last-max-id';
-
-    public function __construct(
-        private ClockInterface $clock,
-        private CollateAddressWithReferenceOrPostalCodeInterface $collateAddressWithReferenceOrPostalCode,
-    ) {
-    }
-
-    public function canRun(?CronJobExecution $cronJobExecution): bool
-    {
-        if (null === $cronJobExecution) {
-            return true;
-        }
-
-        $now = $this->clock->now();
-
-        return $now->sub(new \DateInterval('PT6H')) > $cronJobExecution->getLastStart();
-    }
-
-    public function getKey(): string
-    {
-        return 'collate-address';
-    }
-
-    public function run(array $lastExecutionData): null|array
-    {
-        $maxId = ($this->collateAddressWithReferenceOrPostalCode)($lastExecutionData[self::LAST_MAX_ID] ?? 0);
-
-        return [self::LAST_MAX_ID => $maxId];
-    }
-}

src/Bundle/ChillMainBundle/Service/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCodeInterface.php

@@ -1,20 +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\Service\AddressGeographicalUnit;
-
-interface CollateAddressWithReferenceOrPostalCodeInterface
-{
-    /**
-     * @throws \Throwable
-     */
-    public function __invoke(int $sinceId = 0): int;
-}

src/Bundle/ChillMainBundle/Service/AddressGeographicalUnit/RefreshAddressToGeographicalUnitMaterializedViewCronJob.php

@@ -49,10 +49,8 @@ class RefreshAddressToGeographicalUnitMaterializedViewCronJob implements CronJob
         return 'refresh-materialized-view-address-to-geog-units';
     }
 
-    public function run(array $lastExecutionData): null|array
+    public function run(): void
     {
         $this->connection->executeQuery('REFRESH MATERIALIZED VIEW view_chill_main_address_geographical_unit');
-
-        return null;
     }
 }

src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderGetActiveFilterHelper.php

@@ -1,92 +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\Templating\Listing;
-
-use Chill\MainBundle\Templating\Entity\UserRender;
-use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
-use Symfony\Component\PropertyAccess\PropertyPathInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-final readonly class FilterOrderGetActiveFilterHelper
-{
-    public function __construct(
-        private TranslatorInterface $translator,
-        private PropertyAccessorInterface $propertyAccessor,
-        private UserRender $userRender,
-    ) {
-    }
-
-    /**
-     * Return all the data required to display the active filters
-     *
-     * @param FilterOrderHelper $filterOrderHelper
-     * @return array<array{label: string, value: string, position: string, name: string}>
-     */
-    public function getActiveFilters(FilterOrderHelper $filterOrderHelper): array
-    {
-        $result = [];
-
-        if ($filterOrderHelper->hasSearchBox() && '' !== $filterOrderHelper->getQueryString()) {
-            $result[] = ['label' => '', 'value' => $filterOrderHelper->getQueryString(), 'position' => FilterOrderPositionEnum::SearchBox->value, 'name' => 'q'];
-        }
-
-        foreach ($filterOrderHelper->getDateRanges() as $name => ['label' => $label]) {
-            $base = ['position' => FilterOrderPositionEnum::DateRange->value, 'name' => $name, 'label' => (string)$label];
-
-            if (null !== ($from = $filterOrderHelper->getDateRangeData($name)['from'] ?? null)) {
-                $result[] = ['value' => $this->translator->trans('filter_order.by_date.From', ['from_date' => $from]), ...$base];
-            }
-            if (null !== ($to = $filterOrderHelper->getDateRangeData($name)['to'] ?? null)) {
-                $result[] = ['value' => $this->translator->trans('filter_order.by_date.To', ['to_date' => $to]), ...$base];
-            }
-        }
-
-        foreach ($filterOrderHelper->getCheckboxes() as $name => ['choices' => $choices, 'trans' => $trans]) {
-            $translatedChoice = array_combine($choices, [...$trans]);
-            foreach ($filterOrderHelper->getCheckboxData($name) as $keyChoice) {
-                $result[] = ['value' => $this->translator->trans($translatedChoice[$keyChoice]), 'label' => '', 'position' => FilterOrderPositionEnum::Checkboxes->value, 'name' => $name];
-            }
-        }
-
-        foreach ($filterOrderHelper->getEntityChoices() as $name => ['label' => $label, 'class' => $class, 'choices' => $choices, 'options' => $options]) {
-            foreach ($filterOrderHelper->getEntityChoiceData($name) as $selected) {
-                if (is_callable($options['choice_label'])) {
-                    $value = call_user_func($options['choice_label'], $selected);
-                } elseif ($options['choice_label'] instanceof PropertyPathInterface || is_string($options['choice_label'])) {
-                    $value = $this->propertyAccessor->getValue($selected, $options['choice_label']);
-                } else {
-                    if (!$selected instanceof \Stringable) {
-                        throw new \UnexpectedValueException(sprintf("we are not able to transform the value of %s to a string. Implements \\Stringable or add a 'choice_label' option to the filterFormBuilder", get_class($selected)));
-                    }
-
-                    $value = (string)$selected;
-                }
-
-                $result[] = ['value' => $this->translator->trans($value), 'label' => $label, 'position' => FilterOrderPositionEnum::EntityChoice->value, 'name' => $name];
-            }
-        }
-
-        foreach ($filterOrderHelper->getUserPickers() as $name => ['label' => $label, 'options' => $options]) {
-            foreach ($filterOrderHelper->getUserPickerData($name) as $user) {
-                $result[] = ['value' => $this->userRender->renderString($user, []), 'label' => (string) $label, 'position' => FilterOrderPositionEnum::UserPicker->value, 'name' => $name];
-            }
-        }
-
-        foreach ($filterOrderHelper->getSingleCheckbox() as $name => ['label' => $label]) {
-            if (true === $filterOrderHelper->getSingleCheckboxData($name)) {
-                $result[] = ['label' => '', 'value' => $this->translator->trans($label), 'position' => FilterOrderPositionEnum::SingleCheckbox->value, 'name' => $name];
-            }
-        }
-
-        return $result;
-    }
-}

src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php

@@ -11,16 +11,18 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Templating\Listing;
 
-use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\Type\Listing\FilterOrderType;
 use DateTimeImmutable;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 
 use function array_merge;
+use function count;
 
-final class FilterOrderHelper
+class FilterOrderHelper
 {
     private array $checkboxes = [];
 
@@ -31,12 +33,16 @@ final class FilterOrderHelper
 
     private array $dateRanges = [];
 
+    private FormFactoryInterface $formFactory;
+
     public const FORM_NAME = 'f';
 
     private array $formOptions = [];
 
     private string $formType = FilterOrderType::class;
 
+    private RequestStack $requestStack;
+
     private ?array $searchBoxFields = null;
 
     private ?array $submitted = null;
@@ -52,9 +58,11 @@ final class FilterOrderHelper
     private array $userPickers = [];
 
     public function __construct(
-        private readonly FormFactoryInterface $formFactory,
-        private readonly RequestStack $requestStack,
+        FormFactoryInterface $formFactory,
+        RequestStack $requestStack
     ) {
+        $this->formFactory = $formFactory;
+        $this->requestStack = $requestStack;
     }
 
     public function addSingleCheckbox(string $name, string $label): self
@@ -89,14 +97,14 @@ final class FilterOrderHelper
 
     public function addCheckbox(string $name, array $choices, ?array $default = [], ?array $trans = [], array $options = []): self
     {
-        if ([] === $trans) {
-            $trans = $choices;
-        }
-
+        $missing = count($choices) - count($trans) - 1;
         $this->checkboxes[$name] = [
-            'choices' => $choices,
-            'default' => $default,
-            'trans' => $trans,
+            'choices' => $choices, 'default' => $default,
+            'trans' => array_merge(
+                $trans,
+                0 < $missing ?
+                       array_fill(0, $missing, null) : []
+            ),
             ...$options,
         ];
 
@@ -126,39 +134,21 @@ final class FilterOrderHelper
         return $this->userPickers;
     }
 
-    /**
-     * @return list<User>
-     */
     public function getUserPickerData(string $name): array
     {
         return $this->getFormData()['user_pickers'][$name];
     }
 
-    public function hasCheckboxData(string $name): bool
-    {
-        return array_key_exists($name, $this->checkboxes);
-    }
-
     public function getCheckboxData(string $name): array
     {
         return $this->getFormData()['checkboxes'][$name];
     }
 
-    public function hasSingleCheckboxData(string $name): bool
-    {
-        return array_key_exists($name, $this->singleCheckbox);
-    }
-
     public function getSingleCheckboxData(string $name): ?bool
     {
         return $this->getFormData()['single_checkboxes'][$name];
     }
 
-    public function hasEntityChoice(string $name): bool
-    {
-        return array_key_exists($name, $this->entityChoices);
-    }
-
     public function getEntityChoiceData($name): mixed
     {
         return $this->getFormData()['entity_choices'][$name];
@@ -182,11 +172,6 @@ final class FilterOrderHelper
         return $this->singleCheckbox;
     }
 
-    public function hasDateRangeData(string $name): bool
-    {
-        return array_key_exists($name, $this->dateRanges);
-    }
-
     /**
      * @return array{to: ?DateTimeImmutable, from: ?DateTimeImmutable}
      */
@@ -253,6 +238,7 @@ final class FilterOrderHelper
         }
 
         return $r;
+
     }
 
     private function getFormData(): array

src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperBuilder.php

@@ -14,8 +14,6 @@ namespace Chill\MainBundle\Templating\Listing;
 use DateTimeImmutable;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 class FilterOrderHelperBuilder
 {
@@ -46,7 +44,7 @@ class FilterOrderHelperBuilder
 
     public function __construct(
         FormFactoryInterface $formFactory,
-        RequestStack $requestStack,
+        RequestStack $requestStack
     ) {
         $this->formFactory = $formFactory;
         $this->requestStack = $requestStack;
@@ -101,7 +99,7 @@ class FilterOrderHelperBuilder
     {
         $helper = new FilterOrderHelper(
             $this->formFactory,
-            $this->requestStack,
+            $this->requestStack
         );
 
         $helper->setSearchBox($this->searchBoxFields);

src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactory.php

@@ -13,8 +13,6 @@ namespace Chill\MainBundle\Templating\Listing;
 
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 class FilterOrderHelperFactory implements FilterOrderHelperFactoryInterface
 {
@@ -24,7 +22,7 @@ class FilterOrderHelperFactory implements FilterOrderHelperFactoryInterface
 
     public function __construct(
         FormFactoryInterface $formFactory,
-        RequestStack $requestStack,
+        RequestStack $requestStack
     ) {
         $this->formFactory = $formFactory;
         $this->requestStack = $requestStack;

src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderPositionEnum.php

@@ -1,22 +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\Templating\Listing;
-
-enum FilterOrderPositionEnum: string
-{
-    case SearchBox = 'search_box';
-    case Checkboxes = 'checkboxes';
-    case DateRange = 'date_range';
-    case EntityChoice = 'entity_choice';
-    case SingleCheckbox = 'single_checkbox';
-    case UserPicker = 'user_picker';
-}

src/Bundle/ChillMainBundle/Templating/Listing/Templating.php

@@ -24,7 +24,6 @@ class Templating extends AbstractExtension
 {
     public function __construct(
         private readonly RequestStack $requestStack,
-        private readonly FilterOrderGetActiveFilterHelper $filterOrderGetActiveFilterHelper,
     ) {
     }
 
@@ -69,7 +68,6 @@ class Templating extends AbstractExtension
 
         return $environment->render($template, [
             'helper' => $helper,
-            'active' => $this->filterOrderGetActiveFilterHelper->getActiveFilters($helper),
             'form' => $helper->buildForm()->createView(),
             'options' => $options,
             'otherParameters' => $otherParameters,

src/Bundle/ChillMainBundle/Tests/Cron/CronJobDatabaseInteractionTest.php

@@ -1,87 +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 Cron;
-
-use Chill\MainBundle\Cron\CronJobInterface;
-use Chill\MainBundle\Cron\CronManager;
-use Chill\MainBundle\Entity\CronJobExecution;
-use Chill\MainBundle\Repository\CronJobExecutionRepository;
-use Doctrine\ORM\EntityManagerInterface;
-use Prophecy\Argument;
-use Prophecy\PhpUnit\ProphecyTrait;
-use Psr\Log\NullLogger;
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-
-/**
- * @internal
- * @coversNothing
- */
-class CronJobDatabaseInteractionTest extends KernelTestCase
-{
-    use ProphecyTrait;
-
-    private EntityManagerInterface $entityManager;
-
-    private CronJobExecutionRepository $cronJobExecutionRepository;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-        $this->entityManager = self::$container->get(EntityManagerInterface::class);
-        $this->cronJobExecutionRepository = self::$container->get(CronJobExecutionRepository::class);
-    }
-
-    public function testCompleteLifeCycle(): void
-    {
-        $cronjob = $this->prophesize(CronJobInterface::class);
-        $cronjob->canRun(null)->willReturn(true);
-        $cronjob->canRun(Argument::type(CronJobExecution::class))->willReturn(true);
-        $cronjob->getKey()->willReturn('test-with-data');
-        $cronjob->run([])->willReturn(['test' => 'execution-0']);
-        $cronjob->run(['test' => 'execution-0'])->willReturn(['test' => 'execution-1']);
-
-        $cronjob->run([])->shouldBeCalledOnce();
-        $cronjob->run(['test' => 'execution-0'])->shouldBeCalledOnce();
-
-        $manager = new CronManager(
-            $this->cronJobExecutionRepository,
-            $this->entityManager,
-            [$cronjob->reveal()],
-            new NullLogger()
-        );
-
-        // run a first time
-        $manager->run();
-
-        // run a second time
-        $manager->run();
-    }
-
-}
-
-class JobWithReturn implements CronJobInterface
-{
-    public function canRun(?CronJobExecution $cronJobExecution): bool
-    {
-        return true;
-    }
-
-    public function getKey(): string
-    {
-        return 'with-data';
-    }
-
-    public function run(array $lastExecutionData): null|array
-    {
-        return ['data' => 'test'];
-    }
-}

src/Bundle/ChillMainBundle/Tests/Cron/CronManagerTest.php

@@ -40,7 +40,7 @@ final class CronManagerTest extends TestCase
         $jobToExecute = $this->prophesize(CronJobInterface::class);
         $jobToExecute->getKey()->willReturn('to-exec');
         $jobToExecute->canRun(Argument::type(CronJobExecution::class))->willReturn(true);
-        $jobToExecute->run([])->shouldBeCalled();
+        $jobToExecute->run()->shouldBeCalled();
 
         $executions = [
             ['key' => $jobOld1->getKey(), 'lastStart' => new DateTimeImmutable('yesterday'), 'lastEnd' => new DateTimeImmutable('1 hours ago'), 'lastStatus' => CronJobExecution::SUCCESS],
@@ -64,7 +64,7 @@ final class CronManagerTest extends TestCase
         $jobAlreadyExecuted = new JobCanRun('k');
         $jobNeverExecuted = $this->prophesize(CronJobInterface::class);
         $jobNeverExecuted->getKey()->willReturn('never-executed');
-        $jobNeverExecuted->run([])->shouldBeCalled();
+        $jobNeverExecuted->run()->shouldBeCalled();
         $jobNeverExecuted->canRun(null)->willReturn(true);
 
         $executions = [
@@ -86,7 +86,7 @@ final class CronManagerTest extends TestCase
         $jobAlreadyExecuted = new JobCanRun('k');
         $jobNeverExecuted = $this->prophesize(CronJobInterface::class);
         $jobNeverExecuted->getKey()->willReturn('never-executed');
-        $jobNeverExecuted->run([])->shouldBeCalled();
+        $jobNeverExecuted->run()->shouldBeCalled();
         $jobNeverExecuted->canRun(null)->willReturn(true);
 
         $executions = [
@@ -178,9 +178,8 @@ class JobCanRun implements CronJobInterface
         return $this->key;
     }
 
-    public function run(array $lastExecutionData): null|array
+    public function run(): void
     {
-        return null;
     }
 }
 
@@ -196,8 +195,7 @@ class JobCannotRun implements CronJobInterface
         return 'job-b';
     }
 
-    public function run(array $lastExecutionData): null|array
+    public function run(): void
     {
-        return null;
     }
 }

src/Bundle/ChillMainBundle/Tests/Services/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCodeCronJobTest.php

@@ -1,68 +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 Services\AddressGeographicalUnit;
-
-use Chill\MainBundle\Entity\CronJobExecution;
-use Chill\MainBundle\Service\AddressGeographicalUnit\CollateAddressWithReferenceOrPostalCodeCronJob;
-use Chill\MainBundle\Service\AddressGeographicalUnit\CollateAddressWithReferenceOrPostalCodeInterface;
-use PHPUnit\Framework\TestCase;
-use Prophecy\PhpUnit\ProphecyTrait;
-use Symfony\Component\Clock\MockClock;
-
-/**
- * @internal
- * @coversNothing
- */
-class CollateAddressWithReferenceOrPostalCodeCronJobTest extends TestCase
-{
-    use ProphecyTrait;
-
-    /**
-     * @dataProvider provideDataCanRun
-     */
-    public function testCanRun(\DateTimeImmutable $now, ?\DateTimeImmutable $lastExecution, bool $expected): void
-    {
-        $execution = match ($lastExecution) {
-            null => null,
-            default => (new CronJobExecution('collate-address'))->setLastStart($lastExecution),
-        };
-
-        $clock = new MockClock($now);
-        $collator = $this->prophesize(CollateAddressWithReferenceOrPostalCodeInterface::class);
-
-        $job = new CollateAddressWithReferenceOrPostalCodeCronJob($clock, $collator->reveal());
-
-        self::assertEquals($expected, $job->canRun($execution));
-    }
-
-    public function testRun(): void
-    {
-        $clock = new MockClock();
-        $collator = $this->prophesize(CollateAddressWithReferenceOrPostalCodeInterface::class);
-        $collator->__invoke(0)->shouldBeCalledOnce();
-        $collator->__invoke(0)->willReturn(1);
-
-        $job = new CollateAddressWithReferenceOrPostalCodeCronJob($clock, $collator->reveal());
-
-        $actual = $job->run(['last-max-id' => 0]);
-        self::assertEquals(['last-max-id' => 1], $actual);
-    }
-
-    public static function provideDataCanRun(): iterable
-    {
-        yield [new \DateTimeImmutable('2023-07-10T12:00:00'), new \DateTimeImmutable('2023-07-10T11:00:00'), false];
-        yield [new \DateTimeImmutable('2023-07-10T12:00:00'), new \DateTimeImmutable('2023-07-10T05:00:00'), true];
-        yield [new \DateTimeImmutable('2023-07-10T12:00:00'), new \DateTimeImmutable('2023-07-01T12:00:00'), true];
-        yield [new \DateTimeImmutable('2023-07-10T12:00:00'), null, true];
-    }
-
-}

src/Bundle/ChillMainBundle/Tests/Services/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCodeTest.php

@@ -1,44 +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 Services\AddressGeographicalUnit;
-
-use Chill\MainBundle\Service\AddressGeographicalUnit\CollateAddressWithReferenceOrPostalCode;
-use Doctrine\DBAL\Connection;
-use Psr\Log\NullLogger;
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-
-/**
- * @internal
- * @coversNothing
- */
-class CollateAddressWithReferenceOrPostalCodeTest extends KernelTestCase
-{
-    private Connection $connection;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-        $this->connection = self::$container->get(Connection::class);
-    }
-
-    public function testRun(): void
-    {
-        $collator = new CollateAddressWithReferenceOrPostalCode(
-            $this->connection,
-            new NullLogger()
-        );
-
-        $result = $collator(0);
-
-        self::assertGreaterThan(0, $result);
-    }
-}

src/Bundle/ChillMainBundle/migrations/Version20230711152947.php

@@ -1,33 +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\Migrations\Main;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-final class Version20230711152947 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Add data to ';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_main_cronjob_execution ADD lastExecutionData JSONB DEFAULT \'{}\'::jsonb NOT NULL');
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_main_cronjob_execution DROP COLUMN lastExecutionData');
-    }
-}

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

@@ -54,12 +54,3 @@ duration:
             few {# minutes}
             other {# minutes}
         }
-
-filter_order:
-    by_date:
-        From: Depuis le {from_date, date, long}
-        To: Jusqu'au {to_date, date, long}
-    By: Filtrer par
-    Search: Chercher dans la liste
-    By date: Filtrer par date
-    search_box: Filtrer par contenu

src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeCronjob.php

@@ -39,10 +39,8 @@ readonly class AccompanyingPeriodStepChangeCronjob implements CronJobInterface
         return 'accompanying-period-step-change';
     }
 
-    public function run(array $lastExecutionData): null|array
+    public function run(): void
     {
         ($this->requestor)();
-
-        return null;
     }
 }

src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php

@@ -11,39 +11,45 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Controller;
 
-use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Pagination\PaginatorFactory;
-use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
-use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactoryInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
-use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodWorkVoter;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Form;
-use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-final class AccompanyingCourseWorkController extends AbstractController
+class AccompanyingCourseWorkController extends AbstractController
 {
+    private LoggerInterface $chillLogger;
+
+    private PaginatorFactory $paginator;
+
+    private SerializerInterface $serializer;
+
+    private TranslatorInterface $trans;
+
+    private AccompanyingPeriodWorkRepository $workRepository;
+
     public function __construct(
-        private readonly TranslatorInterface $trans,
-        private readonly SerializerInterface $serializer,
-        private readonly AccompanyingPeriodWorkRepository $workRepository,
-        private readonly PaginatorFactory $paginator,
-        private readonly LoggerInterface $chillLogger,
-        private readonly TranslatableStringHelperInterface $translatableStringHelper,
-        private readonly FilterOrderHelperFactoryInterface $filterOrderHelperFactory
+        TranslatorInterface $trans,
+        SerializerInterface $serializer,
+        AccompanyingPeriodWorkRepository $workRepository,
+        PaginatorFactory $paginator,
+        LoggerInterface $chillLogger
     ) {
+        $this->trans = $trans;
+        $this->serializer = $serializer;
+        $this->workRepository = $workRepository;
+        $this->paginator = $paginator;
+        $this->chillLogger = $chillLogger;
     }
 
     /**
@@ -156,21 +162,11 @@ final class AccompanyingCourseWorkController extends AbstractController
     {
         $this->denyAccessUnlessGranted(AccompanyingPeriodWorkVoter::SEE, $period);
 
-        $filter = $this->buildFilterOrder($period);
-
-        $filterData = [
-            'types' => $filter->hasEntityChoice('typesFilter') ? $filter->getEntityChoiceData('typesFilter') : [],
-            'before' => $filter->getDateRangeData('dateFilter')['to'],
-            'after' => $filter->getDateRangeData('dateFilter')['from'],
-            'user' => $filter->getUserPickerData('userFilter')
-        ];
-
         $totalItems = $this->workRepository->countByAccompanyingPeriod($period);
         $paginator = $this->paginator->create($totalItems);
 
         $works = $this->workRepository->findByAccompanyingPeriodOpenFirst(
             $period,
-            $filterData,
             $paginator->getItemsPerPage(),
             $paginator->getCurrentPageFirstItemNumber()
         );
@@ -179,7 +175,6 @@ final class AccompanyingCourseWorkController extends AbstractController
             'accompanyingCourse' => $period,
             'works' => $works,
             'paginator' => $paginator,
-            'filter' => $filter
         ]);
     }
 
@@ -204,7 +199,7 @@ final class AccompanyingCourseWorkController extends AbstractController
         ]);
     }
 
-    private function createDeleteForm(int $id): FormInterface
+    private function createDeleteForm(int $id): Form
     {
         $params = [];
         $params['id'] = $id;
@@ -215,26 +210,4 @@ final class AccompanyingCourseWorkController extends AbstractController
             ->add('submit', SubmitType::class, ['label' => 'Delete'])
             ->getForm();
     }
-
-    private function buildFilterOrder($associatedPeriod): FilterOrderHelper
-    {
-        $filterBuilder = $this->filterOrderHelperFactory->create(self::class);
-        $types = $this->workRepository->findActionTypeByPeriod($associatedPeriod);
-
-        $filterBuilder
-            ->addDateRange('dateFilter', 'accompanying_course_work.date_filter');
-
-        if (1 < count($types)) {
-            $filterBuilder
-                ->addEntityChoice('typesFilter', 'accompanying_course_work.types_filter', \Chill\PersonBundle\Entity\SocialWork\SocialAction::class, $types, [
-                    'choice_label' => fn (SocialAction $sa) => $this->translatableStringHelper->localize($sa->getTitle())
-                ]);
-        }
-
-        $filterBuilder
-            ->addUserPicker('userFilter', 'accompanying_course_work.user_filter', ['required' => false])
-        ;
-
-        return $filterBuilder->build();
-    }
 }

src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkEvaluationDocumentController.php

@@ -1,46 +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\PersonBundle\Controller;
-
-use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
-use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodWorkVoter;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Security\Core\Security;
-
-class AccompanyingCourseWorkEvaluationDocumentController extends AbstractController
-{
-    public function __construct(private Security $security)
-    {
-    }
-
-    /**
-     * @Route(
-     *     "{_locale}/person/accompanying-period/work/evaluation/document/{id}/show",
-     *     name="chill_person_accompanying_period_work_evaluation_document_show",
-     *     methods={"GET"}
-     * )
-     */
-    public function showAccompanyingCourseWork(AccompanyingPeriodWorkEvaluationDocument $document): Response
-    {
-        $work = $document->getAccompanyingPeriodWorkEvaluation()->getAccompanyingPeriodWork();
-
-        return $this->redirectToRoute(
-            $this->security->isGranted(AccompanyingPeriodWorkVoter::UPDATE, $work) ?
-                'chill_person_accompanying_period_work_edit' : 'chill_person_accompanying_period_work_show',
-            [
-                'id' => $work->getId()
-            ]
-        );
-    }
-}

src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriod.php

@@ -29,7 +29,6 @@ use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
 use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\PersonBundle\Export\Declarations;
-use Chill\PersonBundle\Export\Helper\ListAccompanyingPeriodHelper;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
@@ -46,13 +45,95 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use function strlen;
 
-final readonly class ListAccompanyingPeriod implements ListInterface, GroupedExportInterface
+class ListAccompanyingPeriod implements ListInterface, GroupedExportInterface
 {
+    private const FIELDS = [
+        'id',
+        'step',
+        'stepSince',
+        'openingDate',
+        'closingDate',
+        'referrer',
+        'referrerSince',
+        'administrativeLocation',
+        'locationIsPerson',
+        'locationIsTemp',
+        'locationPersonName',
+        'locationPersonId',
+        'origin',
+        'closingMotive',
+        'confidential',
+        'emergency',
+        'intensity',
+        'job',
+        'isRequestorPerson',
+        'isRequestorThirdParty',
+        'requestorPerson',
+        'requestorPersonId',
+        'requestorThirdParty',
+        'requestorThirdPartyId',
+        'scopes',
+        'socialIssues',
+        'createdAt',
+        'createdBy',
+        'updatedAt',
+        'updatedBy',
+    ];
+
+    private ExportAddressHelper $addressHelper;
+
+    private DateTimeHelper $dateTimeHelper;
+
+    private EntityManagerInterface $entityManager;
+
+    private PersonRenderInterface $personRender;
+
+    private PersonRepository $personRepository;
+
+    private RollingDateConverterInterface $rollingDateConverter;
+
+    private SocialIssueRender $socialIssueRender;
+
+    private SocialIssueRepository $socialIssueRepository;
+
+    private ThirdPartyRender $thirdPartyRender;
+
+    private ThirdPartyRepository $thirdPartyRepository;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    private TranslatorInterface $translator;
+
+    private UserHelper $userHelper;
+
     public function __construct(
-        private EntityManagerInterface $entityManager,
-        private RollingDateConverterInterface $rollingDateConverter,
-        private ListAccompanyingPeriodHelper $listAccompanyingPeriodHelper,
+        ExportAddressHelper $addressHelper,
+        DateTimeHelper $dateTimeHelper,
+        EntityManagerInterface $entityManager,
+        PersonRenderInterface $personRender,
+        PersonRepository $personRepository,
+        ThirdPartyRepository $thirdPartyRepository,
+        ThirdPartyRender $thirdPartyRender,
+        SocialIssueRepository $socialIssueRepository,
+        SocialIssueRender $socialIssueRender,
+        TranslatableStringHelperInterface $translatableStringHelper,
+        TranslatorInterface $translator,
+        RollingDateConverterInterface $rollingDateConverter,
+        UserHelper $userHelper
     ) {
+        $this->addressHelper = $addressHelper;
+        $this->dateTimeHelper = $dateTimeHelper;
+        $this->entityManager = $entityManager;
+        $this->personRender = $personRender;
+        $this->personRepository = $personRepository;
+        $this->socialIssueRender = $socialIssueRender;
+        $this->socialIssueRepository = $socialIssueRepository;
+        $this->thirdPartyRender = $thirdPartyRender;
+        $this->thirdPartyRepository = $thirdPartyRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+        $this->translator = $translator;
+        $this->rollingDateConverter = $rollingDateConverter;
+        $this->userHelper = $userHelper;
     }
 
     public function buildForm(FormBuilderInterface $builder)
@@ -88,12 +169,141 @@ final readonly class ListAccompanyingPeriod implements ListInterface, GroupedExp
 
     public function getLabels($key, array $values, $data)
     {
-        return $this->listAccompanyingPeriodHelper->getLabels($key, $values, $data);
+        if (substr($key, 0, strlen('address_fields')) === 'address_fields') {
+            return $this->addressHelper->getLabel($key, $values, $data, 'address_fields');
+        }
+
+        switch ($key) {
+            case 'stepSince':
+            case 'openingDate':
+            case 'closingDate':
+            case 'referrerSince':
+            case 'createdAt':
+            case 'updatedAt':
+                return $this->dateTimeHelper->getLabel('export.list.acp.' . $key);
+
+            case 'origin':
+            case 'closingMotive':
+            case 'job':
+                return function ($value) use ($key) {
+                    if ('_header' === $value) {
+                        return 'export.list.acp.' . $key;
+                    }
+
+                    if (null === $value) {
+                        return '';
+                    }
+
+                    return $this->translatableStringHelper->localize(json_decode($value, true, 512, JSON_THROW_ON_ERROR));
+                };
+
+            case 'locationPersonName':
+            case 'requestorPerson':
+                return function ($value) use ($key) {
+                    if ('_header' === $value) {
+                        return 'export.list.acp.' . $key;
+                    }
+
+                    if (null === $value || null === $person = $this->personRepository->find($value)) {
+                        return '';
+                    }
+
+                    return $this->personRender->renderString($person, []);
+                };
+
+            case 'requestorThirdParty':
+                return function ($value) use ($key) {
+                    if ('_header' === $value) {
+                        return 'export.list.acp.' . $key;
+                    }
+
+                    if (null === $value || null === $thirdparty = $this->thirdPartyRepository->find($value)) {
+                        return '';
+                    }
+
+                    return $this->thirdPartyRender->renderString($thirdparty, []);
+                };
+
+            case 'scopes':
+                return function ($value) use ($key) {
+                    if ('_header' === $value) {
+                        return 'export.list.acp.' . $key;
+                    }
+
+                    if (null === $value) {
+                        return '';
+                    }
+
+                    return implode(
+                        '|',
+                        array_map(
+                            fn ($s) => $this->translatableStringHelper->localize($s),
+                            json_decode($value, true, 512, JSON_THROW_ON_ERROR)
+                        )
+                    );
+                };
+
+            case 'socialIssues':
+                return function ($value) use ($key) {
+                    if ('_header' === $value) {
+                        return 'export.list.acp.' . $key;
+                    }
+
+                    if (null === $value) {
+                        return '';
+                    }
+
+                    return implode(
+                        '|',
+                        array_map(
+                            fn ($s) => $this->socialIssueRender->renderString($this->socialIssueRepository->find($s), []),
+                            json_decode($value, true, 512, JSON_THROW_ON_ERROR)
+                        )
+                    );
+                };
+
+            case 'step':
+                return fn ($value) => match ($value) {
+                    '_header' => 'export.list.acp.step',
+                    null => '',
+                    AccompanyingPeriod::STEP_DRAFT => $this->translator->trans('course.draft'),
+                    AccompanyingPeriod::STEP_CONFIRMED => $this->translator->trans('course.confirmed'),
+                    AccompanyingPeriod::STEP_CLOSED => $this->translator->trans('course.closed'),
+                    AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_SHORT => $this->translator->trans('course.inactive_short'),
+                    AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_LONG => $this->translator->trans('course.inactive_long'),
+                    default => $value,
+                };
+
+            case 'intensity':
+                return fn ($value) => match ($value) {
+                    '_header' => 'export.list.acp.intensity',
+                    null => '',
+                    AccompanyingPeriod::INTENSITY_OCCASIONAL => $this->translator->trans('occasional'),
+                    AccompanyingPeriod::INTENSITY_REGULAR => $this->translator->trans('regular'),
+                    default => $value,
+                };
+
+            default:
+                return static function ($value) use ($key) {
+                    if ('_header' === $value) {
+                        return 'export.list.acp.' . $key;
+                    }
+
+                    if (null === $value) {
+                        return '';
+                    }
+
+                    return $value;
+                };
+        }
     }
 
     public function getQueryKeys($data)
     {
-        return $this->listAccompanyingPeriodHelper->getQueryKeys($data);
+        return array_merge(
+            self::FIELDS,
+            $this->addressHelper->getKeys(ExportAddressHelper::F_ALL, 'address_fields')
+        );
     }
 
     public function getResult($query, $data)
@@ -131,12 +341,7 @@ final readonly class ListAccompanyingPeriod implements ListInterface, GroupedExp
             ->setParameter('list_acp_step', AccompanyingPeriod::STEP_DRAFT)
             ->setParameter('authorized_centers', $centers);
 
-        $this->listAccompanyingPeriodHelper->addSelectClauses($qb, $this->rollingDateConverter->convert($data['calc_date']));
-
-        $qb
-            ->addOrderBy('acp.openingDate')
-            ->addOrderBy('acp.closingDate')
-            ->addOrderBy('acp.id');
+        $this->addSelectClauses($qb, $this->rollingDateConverter->convert($data['calc_date']));
 
         return $qb;
     }
@@ -152,4 +357,91 @@ final readonly class ListAccompanyingPeriod implements ListInterface, GroupedExp
             Declarations::ACP_TYPE,
         ];
     }
+
+    private function addSelectClauses(QueryBuilder $qb, DateTimeImmutable $calcDate): void
+    {
+        // add the regular fields
+        foreach (['id', 'openingDate', 'closingDate', 'confidential', 'emergency', 'intensity', 'createdAt', 'updatedAt'] as $field) {
+            $qb->addSelect(sprintf('acp.%s AS %s', $field, $field));
+        }
+
+        // add the field which are simple association
+        foreach (['origin' => 'label', 'closingMotive' => 'name', 'job' => 'label', 'createdBy' => 'label', 'updatedBy' => 'label', 'administrativeLocation' => 'name'] as $entity => $field) {
+            $qb
+                ->leftJoin(sprintf('acp.%s', $entity), "{$entity}_t")
+                ->addSelect(sprintf('%s_t.%s AS %s', $entity, $field, $entity));
+        }
+
+        // step at date
+        $qb
+            ->addSelect('stepHistory.step AS step')
+            ->addSelect('stepHistory.startDate AS stepSince')
+            ->leftJoin('acp.stepHistories', 'stepHistory')
+            ->andWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->lte('stepHistory.startDate', ':calcDate'),
+                    $qb->expr()->orX($qb->expr()->isNull('stepHistory.endDate'), $qb->expr()->gt('stepHistory.endDate', ':calcDate'))
+                )
+            );
+
+        // referree at date
+        $qb
+            ->addSelect('referrer_t.label AS referrer')
+            ->addSelect('userHistory.startDate AS referrerSince')
+            ->leftJoin('acp.userHistories', 'userHistory')
+            ->leftJoin('userHistory.user', 'referrer_t')
+            ->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->isNull('userHistory'),
+                    $qb->expr()->andX(
+                        $qb->expr()->lte('userHistory.startDate', ':calcDate'),
+                        $qb->expr()->orX($qb->expr()->isNull('userHistory.endDate'), $qb->expr()->gt('userHistory.endDate', ':calcDate'))
+                    )
+                )
+            );
+
+        // location of the acp
+        $qb
+            ->addSelect('CASE WHEN locationHistory.personLocation IS NOT NULL THEN 1 ELSE 0 END AS locationIsPerson')
+            ->addSelect('CASE WHEN locationHistory.personLocation IS NOT NULL THEN 0 ELSE 1 END AS locationIsTemp')
+            ->addSelect('IDENTITY(locationHistory.personLocation) AS locationPersonName')
+            ->addSelect('IDENTITY(locationHistory.personLocation) AS locationPersonId')
+            ->leftJoin('acp.locationHistories', 'locationHistory')
+            ->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->isNull('locationHistory'),
+                    $qb->expr()->andX(
+                        $qb->expr()->lte('locationHistory.startDate', ':calcDate'),
+                        $qb->expr()->orX($qb->expr()->isNull('locationHistory.endDate'), $qb->expr()->gt('locationHistory.endDate', ':calcDate'))
+                    )
+                )
+            )
+            ->leftJoin(
+                PersonHouseholdAddress::class,
+                'personAddress',
+                Join::WITH,
+                'locationHistory.personLocation = personAddress.person AND (personAddress.validFrom <= :calcDate AND (personAddress.validTo IS NULL OR personAddress.validTo > :calcDate))'
+            )
+            ->leftJoin(Address::class, 'acp_address', Join::WITH, 'COALESCE(IDENTITY(locationHistory.addressLocation), IDENTITY(personAddress.address)) = acp_address.id');
+
+        $this->addressHelper->addSelectClauses(ExportAddressHelper::F_ALL, $qb, 'acp_address', 'address_fields');
+
+        // requestor
+        $qb
+            ->addSelect('CASE WHEN acp.requestorPerson IS NULL THEN 1 ELSE 0 END AS isRequestorPerson')
+            ->addSelect('CASE WHEN acp.requestorPerson IS NULL THEN 0 ELSE 1 END AS isRequestorThirdParty')
+            ->addSelect('IDENTITY(acp.requestorPerson) AS requestorPersonId')
+            ->addSelect('IDENTITY(acp.requestorThirdParty) AS requestorThirdPartyId')
+            ->addSelect('IDENTITY(acp.requestorPerson) AS requestorPerson')
+            ->addSelect('IDENTITY(acp.requestorThirdParty) AS requestorThirdParty');
+
+        $qb
+            // scopes
+            ->addSelect('(SELECT AGGREGATE(scope.name) FROM ' . Scope::class . ' scope WHERE scope MEMBER OF acp.scopes) AS scopes')
+            // social issues
+            ->addSelect('(SELECT AGGREGATE(socialIssue.id) FROM ' . SocialIssue::class . ' socialIssue WHERE socialIssue MEMBER OF acp.socialIssues) AS socialIssues');
+
+        // add parameter
+        $qb->setParameter('calcDate', $calcDate);
+    }
 }

src/Bundle/ChillPersonBundle/Export/Export/ListPersonWithAccompanyingPeriod.php

@@ -35,12 +35,7 @@ use function count;
 use function in_array;
 use function strlen;
 
-/**
- * List the persons, having an accompanying period.
- *
- * Details of the accompanying period are not included
- */
-class ListPersonHavingAccompanyingPeriod implements ExportElementValidatedInterface, ListInterface, GroupedExportInterface
+class ListPersonWithAccompanyingPeriod implements ExportElementValidatedInterface, ListInterface, GroupedExportInterface
 {
     private ExportAddressHelper $addressHelper;
 
@@ -190,11 +185,6 @@ class ListPersonHavingAccompanyingPeriod implements ExportElementValidatedInterf
 
         $this->listPersonHelper->addSelect($qb, $fields, $data['address_date']);
 
-        $qb
-            ->addOrderBy('person.lastName')
-            ->addOrderBy('person.firstName')
-            ->addOrderBy('person.id');
-
         return $qb;
     }
 

src/Bundle/ChillPersonBundle/Export/Export/ListPersonWithAccompanyingPeriodDetails.php

@@ -1,155 +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\PersonBundle\Export\Export;
-
-use Chill\MainBundle\Export\ExportElementValidatedInterface;
-use Chill\MainBundle\Export\FormatterInterface;
-use Chill\MainBundle\Export\GroupedExportInterface;
-use Chill\MainBundle\Export\Helper\ExportAddressHelper;
-use Chill\MainBundle\Export\ListInterface;
-use Chill\MainBundle\Form\Type\ChillDateType;
-use Chill\MainBundle\Form\Type\PickRollingDateType;
-use Chill\MainBundle\Service\RollingDate\RollingDate;
-use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
-use Chill\PersonBundle\Export\Declarations;
-use Chill\PersonBundle\Export\Helper\ListAccompanyingPeriodHelper;
-use Chill\PersonBundle\Export\Helper\ListPersonHelper;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use DateTimeImmutable;
-use Doctrine\ORM\AbstractQuery;
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Validator\Constraints\Callback;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use function array_key_exists;
-use function count;
-use function in_array;
-use function strlen;
-
-/**
- * List the persons having an accompanying period, with the accompanying period details
- *
- */
-final readonly class ListPersonWithAccompanyingPeriodDetails implements ListInterface, GroupedExportInterface
-{
-    public function __construct(
-        private ListPersonHelper $listPersonHelper,
-        private ListAccompanyingPeriodHelper $listAccompanyingPeriodHelper,
-        private EntityManagerInterface $entityManager,
-        private RollingDateConverterInterface $rollingDateConverter,
-    ) {
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('address_date', PickRollingDateType::class, [
-            'label' => 'Data valid at this date',
-            'help' => 'Data regarding center, addresses, and so on will be computed at this date',
-        ]);
-    }
-    public function getFormDefaultData(): array
-    {
-        return ['address_date' => new RollingDate(RollingDate::T_TODAY)];
-    }
-
-    public function getAllowedFormattersTypes()
-    {
-        return [FormatterInterface::TYPE_LIST];
-    }
-
-    public function getDescription()
-    {
-        return 'export.list.person_with_acp.Create a list of people having an accompaying periods with details of period, according to various filters.';
-    }
-
-    public function getGroup(): string
-    {
-        return 'Exports of persons';
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        if (in_array($key, $this->listPersonHelper->getAllKeys(), true)) {
-            return $this->listPersonHelper->getLabels($key, $values, $data);
-        }
-
-        return $this->listAccompanyingPeriodHelper->getLabels($key, $values, $data);
-    }
-
-    public function getQueryKeys($data)
-    {
-        return array_merge(
-            $this->listPersonHelper->getAllKeys(),
-            $this->listAccompanyingPeriodHelper->getQueryKeys($data),
-        );
-    }
-
-    public function getResult($query, $data)
-    {
-        return $query->getQuery()->getResult(AbstractQuery::HYDRATE_SCALAR);
-    }
-
-    public function getTitle()
-    {
-        return 'export.list.person_with_acp.List peoples having an accompanying period with period details';
-    }
-
-    public function getType()
-    {
-        return Declarations::PERSON_TYPE;
-    }
-
-    /**
-     * param array{fields: string[], address_date: DateTimeImmutable} $data.
-     */
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
-    {
-        $centers = array_map(static fn ($el) => $el['center'], $acl);
-
-        $qb = $this->entityManager->createQueryBuilder();
-
-        $qb->from(Person::class, 'person')
-            ->join('person.accompanyingPeriodParticipations', 'acppart')
-            ->join('acppart.accompanyingPeriod', 'acp')
-            ->andWhere($qb->expr()->neq('acp.step', "'" . AccompanyingPeriod::STEP_DRAFT . "'"))
-            ->andWhere(
-                $qb->expr()->exists(
-                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' pch WHERE pch.person = person.id AND pch.center IN (:authorized_centers)'
-                )
-            )->setParameter('authorized_centers', $centers);
-
-        $this->listPersonHelper->addSelect($qb, ListPersonHelper::FIELDS, $this->rollingDateConverter->convert($data['address_date']));
-        $this->listAccompanyingPeriodHelper->addSelectClauses($qb, $this->rollingDateConverter->convert($data['address_date']));
-
-        $qb
-            ->addOrderBy('person.lastName')
-            ->addOrderBy('person.firstName')
-            ->addOrderBy('person.id')
-            ->addOrderBy('acp.id');
-
-        return $qb;
-    }
-
-    public function requiredRole(): string
-    {
-        return PersonVoter::LISTS;
-    }
-
-    public function supportsModifiers()
-    {
-        return [Declarations::PERSON_TYPE, Declarations::PERSON_IMPLIED_IN, Declarations::ACP_TYPE];
-    }
-}

src/Bundle/ChillPersonBundle/Export/Helper/ListAccompanyingPeriodHelper.php

@@ -1,317 +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\PersonBundle\Export\Helper;
-
-use Chill\MainBundle\Entity\Address;
-use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Export\Helper\DateTimeHelper;
-use Chill\MainBundle\Export\Helper\ExportAddressHelper;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
-use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
-use Chill\PersonBundle\Repository\PersonRepository;
-use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
-use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
-use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
-use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
-use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
-use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-final readonly class ListAccompanyingPeriodHelper
-{
-    public const FIELDS = [
-        'acpId',
-        'step',
-        'stepSince',
-        'openingDate',
-        'closingDate',
-        'referrer',
-        'referrerSince',
-        'administrativeLocation',
-        'locationIsPerson',
-        'locationIsTemp',
-        'locationPersonName',
-        'locationPersonId',
-        'origin',
-        'closingMotive',
-        'confidential',
-        'emergency',
-        'intensity',
-        'job',
-        'isRequestorPerson',
-        'isRequestorThirdParty',
-        'requestorPerson',
-        'requestorPersonId',
-        'requestorThirdParty',
-        'requestorThirdPartyId',
-        'scopes',
-        'socialIssues',
-        'acpCreatedAt',
-        'acpCreatedBy',
-        'acpUpdatedAt',
-        'acpUpdatedBy',
-    ];
-
-    public function __construct(
-        private ExportAddressHelper $addressHelper,
-        private DateTimeHelper $dateTimeHelper,
-        private PersonRenderInterface $personRender,
-        private PersonRepository $personRepository,
-        private ThirdPartyRepository $thirdPartyRepository,
-        private ThirdPartyRender $thirdPartyRender,
-        private SocialIssueRepository $socialIssueRepository,
-        private SocialIssueRender $socialIssueRender,
-        private TranslatableStringHelperInterface $translatableStringHelper,
-        private TranslatorInterface $translator,
-    ) {
-    }
-
-    public function getQueryKeys($data)
-    {
-        return array_merge(
-            ListAccompanyingPeriodHelper::FIELDS,
-            $this->addressHelper->getKeys(ExportAddressHelper::F_ALL, 'acp_address_fields')
-        );
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        if (str_starts_with($key, 'acp_address_fields')) {
-            return $this->addressHelper->getLabel($key, $values, $data, 'acp_address_fields');
-        }
-
-        switch ($key) {
-            case 'stepSince':
-            case 'openingDate':
-            case 'closingDate':
-            case 'referrerSince':
-            case 'acpCreatedAt':
-            case 'acpUpdatedAt':
-                return $this->dateTimeHelper->getLabel('export.list.acp.' . $key);
-
-            case 'origin':
-            case 'closingMotive':
-            case 'job':
-                return function ($value) use ($key) {
-                    if ('_header' === $value) {
-                        return 'export.list.acp.' . $key;
-                    }
-
-                    if (null === $value) {
-                        return '';
-                    }
-
-                    return $this->translatableStringHelper->localize(json_decode($value, true, 512, JSON_THROW_ON_ERROR));
-                };
-
-            case 'locationPersonName':
-            case 'requestorPerson':
-                return function ($value) use ($key) {
-                    if ('_header' === $value) {
-                        return 'export.list.acp.' . $key;
-                    }
-
-                    if (null === $value || null === $person = $this->personRepository->find($value)) {
-                        return '';
-                    }
-
-                    return $this->personRender->renderString($person, []);
-                };
-
-            case 'requestorThirdParty':
-                return function ($value) use ($key) {
-                    if ('_header' === $value) {
-                        return 'export.list.acp.' . $key;
-                    }
-
-                    if (null === $value || null === $thirdparty = $this->thirdPartyRepository->find($value)) {
-                        return '';
-                    }
-
-                    return $this->thirdPartyRender->renderString($thirdparty, []);
-                };
-
-            case 'scopes':
-                return function ($value) use ($key) {
-                    if ('_header' === $value) {
-                        return 'export.list.acp.' . $key;
-                    }
-
-                    if (null === $value) {
-                        return '';
-                    }
-
-                    return implode(
-                        '|',
-                        array_map(
-                            fn ($s) => $this->translatableStringHelper->localize($s),
-                            json_decode($value, true, 512, JSON_THROW_ON_ERROR)
-                        )
-                    );
-                };
-
-            case 'socialIssues':
-                return function ($value) use ($key) {
-                    if ('_header' === $value) {
-                        return 'export.list.acp.' . $key;
-                    }
-
-                    if (null === $value) {
-                        return '';
-                    }
-
-                    return implode(
-                        '|',
-                        array_map(
-                            fn ($s) => $this->socialIssueRender->renderString($this->socialIssueRepository->find($s), []),
-                            json_decode($value, true, 512, JSON_THROW_ON_ERROR)
-                        )
-                    );
-                };
-
-            case 'step':
-                return fn ($value) => match ($value) {
-                    '_header' => 'export.list.acp.step',
-                    null => '',
-                    AccompanyingPeriod::STEP_DRAFT => $this->translator->trans('course.draft'),
-                    AccompanyingPeriod::STEP_CONFIRMED => $this->translator->trans('course.confirmed'),
-                    AccompanyingPeriod::STEP_CLOSED => $this->translator->trans('course.closed'),
-                    AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_SHORT => $this->translator->trans('course.inactive_short'),
-                    AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_LONG => $this->translator->trans('course.inactive_long'),
-                    default => $value,
-                };
-
-            case 'intensity':
-                return fn ($value) => match ($value) {
-                    '_header' => 'export.list.acp.intensity',
-                    null => '',
-                    AccompanyingPeriod::INTENSITY_OCCASIONAL => $this->translator->trans('occasional'),
-                    AccompanyingPeriod::INTENSITY_REGULAR => $this->translator->trans('regular'),
-                    default => $value,
-                };
-
-            default:
-                return static function ($value) use ($key) {
-                    if ('_header' === $value) {
-                        return 'export.list.acp.' . $key;
-                    }
-
-                    if (null === $value) {
-                        return '';
-                    }
-
-                    return $value;
-                };
-        }
-    }
-
-    public function addSelectClauses(QueryBuilder $qb, \DateTimeImmutable $calcDate): void
-    {
-        $qb->addSelect('acp.id AS acpId');
-        $qb->addSelect('acp.createdAt AS acpCreatedAt');
-        $qb->addSelect('acp.updatedAt AS acpUpdatedAt');
-
-        // add the regular fields
-        foreach (['openingDate', 'closingDate', 'confidential', 'emergency', 'intensity'] as $field) {
-            $qb->addSelect(sprintf('acp.%s AS %s', $field, $field));
-        }
-
-        // add the field which are simple association
-        $qb
-            ->leftJoin('acp.createdBy', "acp_created_by_t")
-            ->addSelect('acp_created_by_t.label AS acpCreatedBy');
-        $qb
-            ->leftJoin('acp.updatedBy', "acp_updated_by_t")
-            ->addSelect('acp_updated_by_t.label AS acpUpdatedBy');
-
-        foreach (['origin' => 'label', 'closingMotive' => 'name', 'job' => 'label', 'administrativeLocation' => 'name'] as $entity => $field) {
-            $qb
-                ->leftJoin(sprintf('acp.%s', $entity), "{$entity}_t")
-                ->addSelect(sprintf('%s_t.%s AS %s', $entity, $field, $entity));
-        }
-
-        // step at date
-        $qb
-            ->addSelect('stepHistory.step AS step')
-            ->addSelect('stepHistory.startDate AS stepSince')
-            ->leftJoin('acp.stepHistories', 'stepHistory')
-            ->andWhere(
-                $qb->expr()->andX(
-                    $qb->expr()->lte('stepHistory.startDate', ':calcDate'),
-                    $qb->expr()->orX($qb->expr()->isNull('stepHistory.endDate'), $qb->expr()->gt('stepHistory.endDate', ':calcDate'))
-                )
-            );
-
-        // referree at date
-        $qb
-            ->addSelect('referrer_t.label AS referrer')
-            ->addSelect('userHistory.startDate AS referrerSince')
-            ->leftJoin('acp.userHistories', 'userHistory')
-            ->leftJoin('userHistory.user', 'referrer_t')
-            ->andWhere(
-                $qb->expr()->orX(
-                    $qb->expr()->isNull('userHistory'),
-                    $qb->expr()->andX(
-                        $qb->expr()->lte('userHistory.startDate', ':calcDate'),
-                        $qb->expr()->orX($qb->expr()->isNull('userHistory.endDate'), $qb->expr()->gt('userHistory.endDate', ':calcDate'))
-                    )
-                )
-            );
-
-        // location of the acp
-        $qb
-            ->addSelect('CASE WHEN locationHistory.personLocation IS NOT NULL THEN 1 ELSE 0 END AS locationIsPerson')
-            ->addSelect('CASE WHEN locationHistory.personLocation IS NOT NULL THEN 0 ELSE 1 END AS locationIsTemp')
-            ->addSelect('IDENTITY(locationHistory.personLocation) AS locationPersonName')
-            ->addSelect('IDENTITY(locationHistory.personLocation) AS locationPersonId')
-            ->leftJoin('acp.locationHistories', 'locationHistory')
-            ->andWhere(
-                $qb->expr()->orX(
-                    $qb->expr()->isNull('locationHistory'),
-                    $qb->expr()->andX(
-                        $qb->expr()->lte('locationHistory.startDate', ':calcDate'),
-                        $qb->expr()->orX($qb->expr()->isNull('locationHistory.endDate'), $qb->expr()->gt('locationHistory.endDate', ':calcDate'))
-                    )
-                )
-            )
-            ->leftJoin(
-                PersonHouseholdAddress::class,
-                'acpPersonAddress',
-                Join::WITH,
-                'locationHistory.personLocation = acpPersonAddress.person AND (acpPersonAddress.validFrom <= :calcDate AND (acpPersonAddress.validTo IS NULL OR acpPersonAddress.validTo > :calcDate))'
-            )
-            ->leftJoin(Address::class, 'acp_address', Join::WITH, 'COALESCE(IDENTITY(locationHistory.addressLocation), IDENTITY(acpPersonAddress.address)) = acp_address.id');
-
-        $this->addressHelper->addSelectClauses(ExportAddressHelper::F_ALL, $qb, 'acp_address', 'acp_address_fields');
-
-        // requestor
-        $qb
-            ->addSelect('CASE WHEN acp.requestorPerson IS NULL THEN 1 ELSE 0 END AS isRequestorPerson')
-            ->addSelect('CASE WHEN acp.requestorPerson IS NULL THEN 0 ELSE 1 END AS isRequestorThirdParty')
-            ->addSelect('IDENTITY(acp.requestorPerson) AS requestorPersonId')
-            ->addSelect('IDENTITY(acp.requestorThirdParty) AS requestorThirdPartyId')
-            ->addSelect('IDENTITY(acp.requestorPerson) AS requestorPerson')
-            ->addSelect('IDENTITY(acp.requestorThirdParty) AS requestorThirdParty');
-
-        $qb
-            // scopes
-            ->addSelect('(SELECT AGGREGATE(scope.name) FROM ' . Scope::class . ' scope WHERE scope MEMBER OF acp.scopes) AS scopes')
-            // social issues
-            ->addSelect('(SELECT AGGREGATE(socialIssue.id) FROM ' . SocialIssue::class . ' socialIssue WHERE socialIssue MEMBER OF acp.socialIssues) AS socialIssues');
-
-        // add parameter
-        $qb->setParameter('calcDate', $calcDate);
-    }
-}

src/Bundle/ChillPersonBundle/Export/Helper/ListPersonHelper.php

@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Helper;
 
-use Chill\MainBundle\Entity\Language;
 use Chill\MainBundle\Export\Helper\ExportAddressHelper;
 use Chill\MainBundle\Repository\CenterRepositoryInterface;
 use Chill\MainBundle\Repository\CivilityRepositoryInterface;
@@ -43,7 +42,7 @@ use function strlen;
 class ListPersonHelper
 {
     public const FIELDS = [
-        'personId',
+        'id',
         'civility',
         'firstName',
         'lastName',
@@ -115,26 +114,7 @@ class ListPersonHelper
     }
 
     /**
-     * Those keys are the "direct" keys, which are created when we decide to use to list all the keys.
-     *
-     * This method must be used in `getKeys` instead of the `self::FIELDS`
-     *
-     * @return array<string>
-     */
-    public function getAllKeys(): array
-    {
-        return [
-            ...array_filter(
-                ListPersonHelper::FIELDS,
-                fn (string $key) => !in_array($key, ['address_fields', 'lifecycleUpdate'], true)
-            ),
-            ...$this->addressHelper->getKeys(ExportAddressHelper::F_ALL, 'address_fields'),
-            ...['createdAt', 'createdBy', 'updatedAt', 'updatedBy'],
-        ];
-    }
-
-    /**
-     * @param array<value-of<self::FIELDS>> $fields
+     * @param array|value-of<self::FIELDS>[] $fields
      */
     public function addSelect(QueryBuilder $qb, array $fields, DateTimeImmutable $computedDate): void
     {
@@ -144,11 +124,6 @@ class ListPersonHelper
             }
 
             switch ($f) {
-                case 'personId':
-                    $qb->addSelect('person.id AS personId');
-
-                    break;
-
                 case 'countryOfBirth':
                 case 'nationality':
                     $qb->addSelect(sprintf('IDENTITY(person.%s) as %s', $f, $f));
@@ -163,7 +138,25 @@ class ListPersonHelper
                     break;
 
                 case 'spokenLanguages':
-                    $qb->addSelect('(SELECT AGGREGATE(language.id) FROM ' . Language::class . ' language WHERE language MEMBER OF person.spokenLanguages) AS spokenLanguages');
+                    $qb
+                        ->leftJoin('person.spokenLanguages', 'spokenLanguage')
+                        ->addSelect('AGGREGATE(spokenLanguage.id) AS spokenLanguages')
+                        ->addGroupBy('person');
+
+                    if (in_array('center', $fields, true)) {
+                        $qb->addGroupBy('center');
+                    }
+
+                    if (in_array('address_fields', $fields, true)) {
+                        $qb
+                            ->addGroupBy('address_fieldsid')
+                            ->addGroupBy('address_fieldscountry_t.id')
+                            ->addGroupBy('address_fieldspostcode_t.id');
+                    }
+
+                    if (in_array('household_id', $fields, true)) {
+                        $qb->addGroupBy('household_id');
+                    }
 
                     break;
 

src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php

@@ -95,103 +95,29 @@ final class AccompanyingPeriodWorkRepository implements ObjectRepository
      * * then, closed works
      *
      * @return AccompanyingPeriodWork[]
-     * @param array{types?: list<SocialAction>, user?: list<User>, after?: null|\DateTimeImmutable, before?: null|\DateTimeImmutable} $filters
      */
-    public function findByAccompanyingPeriodOpenFirst(AccompanyingPeriod $period, array $filters, int $limit = 10, int $offset = 0): array
+    public function findByAccompanyingPeriodOpenFirst(AccompanyingPeriod $period, int $limit = 10, int $offset = 0): array
     {
         $rsm = new ResultSetMappingBuilder($this->em);
         $rsm->addRootEntityFromClassMetadata(AccompanyingPeriodWork::class, 'w');
 
         $sql = "SELECT {$rsm} FROM chill_person_accompanying_period_work w
-                    LEFT JOIN chill_person_accompanying_period_work_referrer AS rw ON accompanyingperiodwork_id = w.id
-                    WHERE accompanyingPeriod_id = :periodId";
-
-        // implement filters
-
-        if ([] !== ($filters['types'] ?? [])) {
-            $sql .= " AND w.socialaction_id IN (:types)";
-        }
-
-        if ([] !== ($filters['user'] ?? [])) {
-            $sql .= " AND rw.user_id IN ("
-                . implode(
-                    ', ',
-                    // we add a user_xx for each key of the 'user' list
-                    array_map(fn (User $u, int $idx) => ':user_' . $idx, $filters['user'], array_keys($filters['user']))
-                )
-                . ")";
-        }
-
-        $sql .= " AND daterange(:after::date, :before::date) && daterange(w.startDate, w.endDate)";
-
-        // if the start and end date were inversed, we inverse the order to avoid an error
-        if (null !== ($filters['after'] ?? null) && null !== ($filters['before']) && $filters['after'] > $filters['before']) {
-            $before = $filters['after'];
-            $after = $filters['before'];
-        } else {
-            $before = $filters['before'];
-            $after = $filters['after'];
-        }
-
-        // set limit and offset
-        $sql .= " ORDER BY
-                     CASE WHEN enddate IS NULL THEN '-infinity'::timestamp ELSE 'infinity'::timestamp END ASC,
-                     startdate DESC,
-                     enddate DESC,
-                     id DESC";
-
-        $sql .= " LIMIT :limit OFFSET :offset";
-
-        $typeIds = [];
-        foreach ($filters['types'] as $type) {
-            $typeIds[] = $type->getId();
-        }
+                     WHERE accompanyingPeriod_id = :periodId
+                     ORDER BY
+                         CASE WHEN enddate IS NULL THEN '-infinity'::timestamp ELSE 'infinity'::timestamp END ASC,
+                         startdate DESC,
+                         enddate DESC,
+                         id DESC
+        LIMIT :limit OFFSET :offset";
 
         $nq = $this->em->createNativeQuery($sql, $rsm)
             ->setParameter('periodId', $period->getId(), Types::INTEGER)
-            ->setParameter('types', $typeIds)
-            ->setParameter('after', $after)
-            ->setParameter('before', $before)
             ->setParameter('limit', $limit, Types::INTEGER)
             ->setParameter('offset', $offset, Types::INTEGER);
 
-        foreach ($filters['user'] as $key => $user) {
-            $nq->setParameter('user_' . $key, $user);
-        }
-
         return $nq->getResult();
     }
 
-    /**
-     * Return a list of types of social actions associated to the accompanying period
-     *
-     * @return array<SocialAction>
-     */
-    public function findActionTypeByPeriod(AccompanyingPeriod $period): array
-    {
-        $in = $this->em->createQueryBuilder();
-        $in
-            ->select('1')
-            ->from(AccompanyingPeriodWork::class, 'apw');
-
-
-        $in->andWhere('apw.accompanyingPeriod = :period')->setParameter('period', $period);
-
-
-        // join between the embedded exist query and the main query
-        $in->andWhere('apw.socialAction = sa');
-
-        $qb = $this->em->createQueryBuilder()->setParameters($in->getParameters());
-        $qb
-            ->select('sa')
-            ->from(SocialAction::class, 'sa')
-            ->where(
-                $qb->expr()->exists($in->getDQL())
-            );
-
-        return $qb->getQuery()->getResult();
-    }
-
     public function findNearEndDateByUser(User $user, DateTimeImmutable $since, DateTimeImmutable $until, int $limit = 20, int $offset = 0): array
     {
         return $this->buildQueryNearEndDateByUser($user, $since, $until)

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue

@@ -68,45 +68,27 @@
               <ul class="list-content fa-ul">
                 <li v-if="person.current_household_id">
                   <i class="fa fa-li fa-map-marker"></i>
-                  <address-render-box v-if="person.current_household_address" :address="person.current_household_address" :isMultiline="isMultiline"></address-render-box>
-                  <p v-else class="chill-no-data-statement">{{ $t('renderbox.household_without_address') }}</p>
+                  <address-render-box v-if="person.current_household_address"
+                                      :address="person.current_household_address"
+                                      :isMultiline="isMultiline">
+                  </address-render-box>
+                  <p v-else class="chill-no-data-statement">
+                    {{ $t('renderbox.household_without_address') }}
+                  </p>
                   <a v-if="options.addHouseholdLink === true"
                      :href="getCurrentHouseholdUrl"
                      :title="$t('persons_associated.show_household_number', {id: person.current_household_id})">
-                       <span class="badge rounded-pill bg-chill-beige">
-                           <i class="fa fa-fw fa-home"></i><!--{{ $t('persons_associated.show_household') }}-->
-                       </span>
+                                <span class="badge rounded-pill bg-chill-beige">
+                                    <i class="fa fa-fw fa-home"></i><!--{{ $t('persons_associated.show_household') }}-->
+                                </span>
                   </a>
                 </li>
                 <li v-else-if="options.addNoData">
-                  <i class="fa fa-li fa-map-marker"></i><p class="chill-no-data-statement">{{ $t('renderbox.no_data') }}</p>
+                  <i class="fa fa-li fa-map-marker"></i>
+                  <p class="chill-no-data-statement">
+                    {{ $t('renderbox.no_data') }}
+                  </p>
                 </li>
-                
-                <template v-if="this.showResidentialAddresses && (person.current_residential_addresses || []).length > 0">
-                   <li v-for="(addr, i) in person.current_residential_addresses" :key="i">
-                      <i class="fa fa-li fa-map-marker"></i>
-                      <div v-if="addr.address">
-                         <span class="item-key">{{ $t('renderbox.residential_address') }}:</span>
-                         <div style="margin-top: -1em;">
-                           <address-render-box :address="addr.address" :isMultiline="isMultiline"></address-render-box>
-                         </div>
-                      </div>
-                      <div v-else-if="addr.hostPerson" class="mt-3">
-                         <p>{{ $t('renderbox.located_at') }}:</p>
-                         <span class="chill-entity entity-person badge-person">
-                             <person-text v-if="addr.hostPerson" :person="addr.hostPerson"></person-text>
-                         </span>
-                         <address-render-box v-if="addr.hostPerson.address" :address="addr.hostPerson.address" :isMultiline="isMultiline"></address-render-box>
-                      </div>
-                      <div v-else-if="addr.hostThirdParty" class="mt-3">
-                         <p>{{ $t('renderbox.located_at') }}:</p>
-                         <span class="chill-entity entity-person badge-thirdparty">
-                             <third-party-text v-if="addr.hostThirdParty" :thirdparty="addr.hostThirdParty"></third-party-text>
-                         </span>
-                         <address-render-box v-if="addr.hostThirdParty.address" :address="addr.hostThirdParty.address" :isMultiline="isMultiline"></address-render-box>
-                      </div>
-                   </li>
-                </template>
 
                 <li v-if="person.email">
                   <i class="fa fa-li fa-envelope-o"></i>
@@ -149,6 +131,53 @@
           </div>
         </div>
 
+        <div class="item-col mx-3"
+             v-if="this.showResidentialAddresses && (person.current_residential_addresses || []).length > 0">
+          <div class="float-button bottom">
+            <div class="box">
+              <ul class="list-content fa-ul">
+                <li v-for="(addr, i) in person.current_residential_addresses" :key="i">
+                  <i class="fa fa-li fa-map-marker"></i>
+                  <div v-if="addr.address">
+                    <address-render-box
+                        :address="addr.address"
+                        :isMultiline="isMultiline">
+                    </address-render-box>
+                    <p>({{ $t('renderbox.residential_address') }})</p>
+                  </div>
+                  <div v-else-if="addr.hostPerson" class="mt-3">
+                    <p>{{ $t('renderbox.located_at') }}:</p>
+                    <span class="chill-entity entity-person badge-person">
+                                    <person-text
+                                        v-if="addr.hostPerson"
+                                        :person="addr.hostPerson"
+                                    ></person-text>
+                                </span>
+                    <address-render-box v-if="addr.hostPerson.address"
+                                        :address="addr.hostPerson.address"
+                                        :isMultiline="isMultiline">
+                    </address-render-box>
+                  </div>
+                  <div v-else-if="addr.hostThirdParty" class="mt-3">
+                    <p>{{ $t('renderbox.located_at') }}:</p>
+                    <span class="chill-entity entity-person badge-thirdparty">
+                                    <third-party-text
+                                        v-if="addr.hostThirdParty"
+                                        :thirdparty="addr.hostThirdParty"
+                                    ></third-party-text>
+                                </span>
+                    <address-render-box v-if="addr.hostThirdParty.address"
+                                        :address="addr.hostThirdParty.address"
+                                        :isMultiline="isMultiline">
+                    </address-render-box>
+                  </div>
+
+                </li>
+              </ul>
+            </div>
+          </div>
+        </div>
+
       </div>
 
       <slot name="end-bloc"></slot>

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

@@ -5,23 +5,18 @@
 {% block js %}
     {{ parent() }}
     {{ encore_entry_script_tags('mod_entity_workflow_pick') }}
-    {{ encore_entry_script_tags('mod_pickentity_type') }}
 {% endblock %}
 
 {% block css %}
     {{ parent() }}
     {{ encore_entry_link_tags('mod_entity_workflow_pick') }}
-    {{ encore_entry_link_tags('mod_pickentity_type') }}
 {% endblock %}
 
-
 {% block content %}
     <div class="accompanying-course-work">
 
         <h1>{{ block('title') }}</h1>
 
-        {{ filter|chill_render_filter_order_helper }}
-
         {% if works|length == 0 %}
             <p class="chill-no-data-statement">{{ 'accompanying_course_work.Any work'|trans }}</p>
         {% else %}

src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig

@@ -59,7 +59,7 @@
                         <span class=" d-block d-sm-inline-block">
                             {{ address|chill_entity_render_box({
                                 'render': 'inline', 'multiline': false, 'with_picto': true, 'with_delimiter': true,
-                                'details_button': true
+                                'details_button': false
                             }) }}
                         </span>
                     {% endif %}

src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig

@@ -56,12 +56,13 @@
                             {%- if address is not null -%}
                                 {{ address|chill_entity_render_box({
                                     'render': 'inline', 'multiline': false, 'with_picto': true, 'with_delimiter': true,
-                                    'details_button': true
+                                    'details_button': false
                                 }) }}
                             {%- endif -%}
                             {% if person.getCurrentHousehold is not null %}
-                                <a href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id' : person.getCurrentHousehold.id } ) }}"
-                                   class="btn btn-sm household-link" title="{{ 'Show household'|trans }}">
+                                <a class="btn household-link text-end"
+                                    href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id' : person.getCurrentHousehold.id } ) }}"
+                                    title="{{ 'Show household'|trans }}">
                                     <i class="fa fa-lg fa-home"></i>
                                 </a>
                             {% endif %}

src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php

@@ -47,7 +47,8 @@ class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInte
     public function getEntityData(EntityWorkflow $entityWorkflow, array $options = []): array
     {
         return [
-            'persons' => $this->getRelatedEntity($entityWorkflow)?->getPersons() ?? [],
+            'persons' => $this->getRelatedEntity($entityWorkflow)
+                ->getPersons(),
         ];
     }
 

src/Bundle/ChillPersonBundle/config/services/exports_person.yaml

@@ -4,27 +4,35 @@ services:
         autowire: true
 
     ## Indicators
-    Chill\PersonBundle\Export\Export\CountPerson:
+    chill.person.export.count_person:
+        class: Chill\PersonBundle\Export\Export\CountPerson
+        autowire: true
+        autoconfigure: true
         tags:
             - { name: chill.export, alias: count_person }
 
-    Chill\PersonBundle\Export\Export\CountPersonWithAccompanyingCourse:
+    chill.person.export.count_person_with_accompanying_course:
+        class: Chill\PersonBundle\Export\Export\CountPersonWithAccompanyingCourse
+        autowire: true
+        autoconfigure: true
         tags:
             - { name: chill.export, alias: count_person_with_accompanying_course }
 
     Chill\PersonBundle\Export\Export\ListPerson:
+        autowire: true
+        autoconfigure: true
         tags:
             - { name: chill.export, alias: list_person }
 
-    Chill\PersonBundle\Export\Export\ListPersonHavingAccompanyingPeriod:
+    Chill\PersonBundle\Export\Export\ListPersonWithAccompanyingPeriod:
+        autowire: true
+        autoconfigure: true
         tags:
             - { name: chill.export, alias: list_person_with_acp }
 
-    Chill\PersonBundle\Export\Export\ListPersonWithAccompanyingPeriodDetails:
-        tags:
-            - { name: chill.export, alias: list_person_with_acp_details }
-
     Chill\PersonBundle\Export\Export\ListAccompanyingPeriod:
+        autowire: true
+        autoconfigure: true
         tags:
             - { name: chill.export, alias: list_acp }
 

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

@@ -913,9 +913,6 @@ accompanying_course_work:
     social_evaluation: Évaluation
     private_comment: Commentaire privé
     timeSpent: Temps de rédaction
-    date_filter: Filtrer par date
-    types_filter: Filtrer par type d'action
-    user_filter: Filtrer par intervenant
 
 
 #
@@ -1001,8 +998,6 @@ notification:
     Notify referrer: Notifier le référent
     Notify any: Notifier d'autres utilisateurs
 
-personId: Identifiant de l'usager
-
 export:
     export:
         acp_stats:
@@ -1152,15 +1147,13 @@ export:
     list:
         person_with_acp:
             List peoples having an accompanying period: Liste des usagers ayant un parcours d'accompagnement
-            List peoples having an accompanying period with period details: Liste des usagers concernés avec détail de chaque parcours
             Create a list of people having an accompaying periods, according to various filters.: Génère une liste des usagers ayant un parcours d'accompagnement, selon différents critères liés au parcours ou à l'usager
-            Create a list of people having an accompaying periods with details of period, according to various filters.: Génère une liste des usagers ayant un parcours d'accompagnement, selon différents critères liés au parcours ou à l'usager. Ajoute les détails du parcours à la liste.
         acp:
             List of accompanying periods: Liste des parcours d'accompagnements
             Generate a list of accompanying periods, filtered on different parameters.: Génère une liste des parcours d'accompagnement, filtrée sur différents paramètres.
             Date of calculation for associated elements: Date de calcul des éléments associés
             The associated referree, localisation, and other elements will be valid at this date: Les éléments associés, comme la localisation, le référent et d'autres éléments seront valides à cette date
-            acpId: Identifiant du parcours
+            id: Identifiant du parcours
             openingDate: Date d'ouverture du parcours
             closingDate: Date de fermeture du parcours
             closingMotive: Motif de cloture
@@ -1168,14 +1161,14 @@ export:
             confidential: Confidentiel
             emergency: Urgent
             intensity: Intensité
-            acpCreatedAt: Créé le
-            acpUpdatedAt: Dernière mise à jour le
+            createdAt: Créé le
+            updatedAt: Dernière mise à jour le
             acpOrigin: Origine du parcours
             origin: Origine du parcours
             acpClosingMotive: Motif de fermeture
             acpJob: Métier du parcours
-            acpCreatedBy: Créé par
-            acpUpdatedBy: Dernière modification par
+            createdBy: Créé par
+            updatedBy: Dernière modification par
             administrativeLocation: Location administrative
             step: Etape
             stepSince: Dernière modification de l'étape
@@ -1183,7 +1176,7 @@ export:
             referrerSince: Référent depuis le
             locationIsPerson: Parcours localisé auprès d'un usager concerné
             locationIsTemp: Parcours avec une localisation temporaire
-            locationPersonName: Usager auprès duquel le parcours est localisé
+            acpLocationPersonName: Usager auprès duquel le parcours est localisé
             locationPersonId: Identifiant de l'usager auprès duquel le parcours est localisé
             acpaddress_fieldscountry: Pays de l'adresse
             isRequestorPerson: Le demandeur est-il un usager ?

src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php

@@ -26,7 +26,6 @@ use Chill\TaskBundle\Event\TaskEvent;
 use Chill\TaskBundle\Event\UI\UIEvent;
 use Chill\TaskBundle\Form\SingleTaskType;
 use Chill\TaskBundle\Repository\SingleTaskAclAwareRepositoryInterface;
-use Chill\TaskBundle\Repository\SingleTaskStateRepository;
 use Chill\TaskBundle\Security\Authorization\TaskVoter;
 use LogicException;
 use Psr\Log\LoggerInterface;
@@ -72,8 +71,7 @@ final class SingleTaskController extends AbstractController
         EventDispatcherInterface $eventDispatcher,
         TimelineBuilder $timelineBuilder,
         LoggerInterface $logger,
-        FilterOrderHelperFactoryInterface $filterOrderHelperFactory,
-        private SingleTaskStateRepository $singleTaskStateRepository
+        FilterOrderHelperFactoryInterface $filterOrderHelperFactory
     ) {
         $this->eventDispatcher = $eventDispatcher;
         $this->timelineBuilder = $timelineBuilder;
@@ -306,7 +304,7 @@ final class SingleTaskController extends AbstractController
 
         $flags = array_merge(
             $filterOrder->getCheckboxData('status'),
-            array_map(static fn ($i) => 'state_' . $i, $filterOrder->hasCheckboxData('states') ? $filterOrder->getCheckboxData('states') : [])
+            array_map(static fn ($i) => 'state_' . $i, $filterOrder->getCheckboxData('states'))
         );
         $nb = $this->singleTaskAclAwareRepository->countByAllViewable(
             $filterOrder->getQueryString(),
@@ -353,7 +351,7 @@ final class SingleTaskController extends AbstractController
         $filterOrder = $this->buildFilterOrder();
         $flags = array_merge(
             $filterOrder->getCheckboxData('status'),
-            array_map(static fn ($i) => 'state_' . $i, $filterOrder->hasCheckboxData('states') ? $filterOrder->getCheckboxData('states') : [])
+            array_map(static fn ($i) => 'state_' . $i, $filterOrder->getCheckboxData('states'))
         );
         $nb = $this->singleTaskAclAwareRepository->countByCourse(
             $course,
@@ -402,7 +400,7 @@ final class SingleTaskController extends AbstractController
         $filterOrder = $this->buildFilterOrder();
         $flags = array_merge(
             $filterOrder->getCheckboxData('status'),
-            array_map(static fn ($i) => 'state_' . $i, $filterOrder->hasCheckboxData('states') ? $filterOrder->getCheckboxData('states') : [])
+            array_map(static fn ($i) => 'state_' . $i, $filterOrder->getCheckboxData('states'))
         );
         $nb = $this->singleTaskAclAwareRepository->countByPerson(
             $person,
@@ -454,10 +452,10 @@ final class SingleTaskController extends AbstractController
     {
         $this->denyAccessUnlessGranted('ROLE_USER');
 
-        $filterOrder = $this->buildFilterOrder(false);
+        $filterOrder = $this->buildFilterOrder();
         $flags = array_merge(
             $filterOrder->getCheckboxData('status'),
-            array_map(static fn ($i) => 'state_' . $i, $filterOrder->hasCheckboxData('states') ? $filterOrder->getCheckboxData('states') : [])
+            array_map(static fn ($i) => 'state_' . $i, $filterOrder->getCheckboxData('states'))
         );
         $nb = $this->singleTaskAclAwareRepository->countByCurrentUsersTasks(
             $filterOrder->getQueryString(),
@@ -669,7 +667,7 @@ final class SingleTaskController extends AbstractController
         return $form;
     }
 
-    private function buildFilterOrder($includeFilterByUser = true): FilterOrderHelper
+    private function buildFilterOrder(): FilterOrderHelper
     {
         $statuses = ['no-alert', 'warning', 'alert'];
         $statusTrans = [
@@ -677,26 +675,18 @@ final class SingleTaskController extends AbstractController
             'Tasks near deadline',
             'Tasks over deadline',
         ];
+        $states = [
+            // todo: get a list of possible states dynamically
+            'new', 'in_progress', 'closed', 'canceled',
+        ];
 
-        $filterBuilder = $this->filterOrderHelperFactory
+        return $this->filterOrderHelperFactory
             ->create(self::class)
             ->addSearchBox()
-            ->addCheckbox('status', $statuses, $statuses, $statusTrans);
-
-        $states = $this->singleTaskStateRepository->findAllExistingStates();
-        $checked = array_values(array_filter($states, fn (string $state) => !in_array($state, ['closed', 'canceled', 'validated'], true)));
-
-        if ([] !== $states) {
-            $filterBuilder
-                ->addCheckbox('states', $states, $checked);
-        }
-
-        if ($includeFilterByUser) {
-            $filterBuilder
-                ->addUserPicker('userPicker', 'Filter by user', ['multiple' => true, 'required' => false]);
-        }
-
-        return $filterBuilder->build();
+            ->addCheckbox('status', $statuses, $statuses, $statusTrans)
+            ->addCheckbox('states', $states, ['new', 'in_progress'])
+            ->addUserPicker('userPicker', 'Filter by user', ['multiple' => true, 'required' => false])
+            ->build();
     }
 
     /**

src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepository.php

@@ -58,12 +58,12 @@ final class SingleTaskAclAwareRepository implements SingleTaskAclAwareRepository
         $qb
             ->from(SingleTask::class, 't');
 
-        if (null !== $pattern && '' !== $pattern) {
+        if (!empty($pattern)) {
             $qb->andWhere($qb->expr()->like('LOWER(UNACCENT(t.title))', 'LOWER(UNACCENT(:pattern))'))
                 ->setParameter('pattern', '%' . $pattern . '%');
         }
 
-        if (null !== $users && count($users) > 0) {
+        if (count($users) > 0) {
             $orXUser = $qb->expr()->orX();
 
             foreach ($users as $key => $user) {
@@ -77,11 +77,9 @@ final class SingleTaskAclAwareRepository implements SingleTaskAclAwareRepository
             if ($orXUser->count() > 0) {
                 $qb->andWhere($orXUser);
             }
-
-            return $qb;
         }
 
-        if (null !== $flags && count($flags) > 0) {
+        if (count($flags) > 0) {
             $orXDate = $qb->expr()->orX();
             $orXState = $qb->expr()->orX();
             $now = new DateTime();

src/Bundle/ChillTaskBundle/Repository/SingleTaskStateRepository.php

@@ -1,47 +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\TaskBundle\Repository;
-
-use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Exception;
-
-class SingleTaskStateRepository
-{
-    private const FIND_ALL_STATES = <<<'SQL'
-    SELECT DISTINCT jsonb_array_elements_text(current_states) FROM chill_task.single_task
-    SQL;
-
-    public function __construct(
-        private Connection $connection
-    ) {
-    }
-
-    /**
-     * Return a list of all states associated to at least one single task in the database
-     *
-     * @return list<string>
-     * @throws Exception
-     */
-    public function findAllExistingStates(): array
-    {
-        $states = [];
-
-        foreach ($this->connection->fetchAllNumeric(self::FIND_ALL_STATES) as $row) {
-            if ('' !== $row[0] && null !== $row[0]) {
-                $states[] = $row[0];
-            }
-        }
-
-        return $states;
-    }
-
-}

src/Bundle/ChillTaskBundle/config/services/repositories.yaml

@@ -1,8 +1,4 @@
 services:
-    _defaults:
-        autowire: true
-        autoconfigure: true
-
     chill_task.single_task_repository:
         class: Chill\TaskBundle\Repository\SingleTaskRepository
         factory: ['@doctrine.orm.entity_manager', getRepository]
@@ -14,8 +10,8 @@ services:
                   - "@chill.main.security.authorization.helper"
     Chill\TaskBundle\Repository\SingleTaskRepository: '@chill_task.single_task_repository'
 
-    Chill\TaskBundle\Repository\SingleTaskAclAwareRepository: ~
+    Chill\TaskBundle\Repository\SingleTaskAclAwareRepository:
+        autowire: true
+        autoconfigure: true
 
     Chill\TaskBundle\Repository\SingleTaskAclAwareRepositoryInterface: '@Chill\TaskBundle\Repository\SingleTaskAclAwareRepository'
-
-    Chill\TaskBundle\Repository\SingleTaskStateRepository: ~

src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php

@@ -71,9 +71,12 @@ class ThirdPartyApiSearch implements SearchApiInterface
             ->setSelectKey('tparty')
             ->setSelectJsonbMetadata("jsonb_build_object('id', tparty.id)")
             ->setFromClause('chill_3party.third_party AS tparty
+                LEFT JOIN chill_main_address cma ON cma.id = tparty.address_id
+                LEFT JOIN chill_main_postal_code cmpc ON cma.postcode_id = cmpc.id
                 LEFT JOIN chill_3party.third_party AS parent ON tparty.parent_id = parent.id
-                LEFT JOIN chill_main_address cma ON cma.id = COALESCE(parent.address_id, tparty.address_id)
-                LEFT JOIN chill_main_postal_code cmpc ON cma.postcode_id = cmpc.id');
+                LEFT JOIN chill_main_address cma_p ON parent.address_id = cma_p.id
+                LEFT JOIN chill_main_postal_code cmpc_p ON cma_p.postcode_id = cmpc.id')
+            ->andWhereClause('tparty.active IS TRUE');
 
         $strs = explode(' ', $pattern);
         $wheres = [];
@@ -99,8 +102,9 @@ class ThirdPartyApiSearch implements SearchApiInterface
                         (parent.canonicalized LIKE '%s' || LOWER(UNACCENT(?)) || '%')::int
                     ) + " .
                    // take postcode label into account, but lower than the canonicalized field
-                   "COALESCE((LOWER(UNACCENT(cmpc.label)) LIKE '%' || LOWER(UNACCENT(?)) || '%')::int * 0.3, 0)";
-                $pertinenceArgs[] = [$str, $str, $str, $str, $str];
+                   "COALESCE((LOWER(UNACCENT(cmpc.label)) LIKE '%' || LOWER(UNACCENT(?)) || '%')::int * 0.3, 0) + " .
+                   "COALESCE((LOWER(UNACCENT(cmpc_p.label)) LIKE '%' || LOWER(UNACCENT(?)) || '%')::int * 0.3, 0)";
+                $pertinenceArgs[] = [$str, $str, $str, $str, $str, $str];
             }
         }