Add translation and return historical records back to original state

form field addressesEmail removed

.changes/unreleased/Fixed-20251003-224044.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix the rendering of list of StoredObjectVersions, where there are kept version (before converting to pdf) and intermediate versions deleted
+time: 2025-10-03T22:40:44.685474863+02:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change

.changes/unreleased/Fixed-20251006-121315.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: 'Notification: fix editing of sent notification by removing form.addressesEmails, a field that no longer exists'
+time: 2025-10-06T12:13:15.45905994+02:00
+custom:
+    Issue: "434"
+    SchemaChange: No schema change

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

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

CHANGELOG.md

@@ -8,57 +8,57 @@ and is generated by [Changie](https://github.com/miniscruff/changie).
 
 ## v4.5.1 - 2025-10-03
 ### Fixed
-* Add missing javascript dependency   
-* Add exception handling for conversion of attachment on sending external, when documens are already in pdf   
+* Add missing javascript dependency
+* Add exception handling for conversion of attachment on sending external, when documens are already in pdf
 
 ## v4.5.0 - 2025-10-03
 ### Feature
-* Only allow delete of attachment on workflows that are not final   
-* Move up signature buttons on index workflow page for easier access   
-* Filter out document from attachment list if it is the same as the workflow document   
-* Block edition on attached document on workflow, if the workflow is finalized or sent external   
-* Convert workflow's attached document to pdf while sending them external   
-* After a signature is canceled or rejected, going to a waiting page until the post-process routines apply a workflow transition   
+* Only allow delete of attachment on workflows that are not final
+* Move up signature buttons on index workflow page for easier access
+* Filter out document from attachment list if it is the same as the workflow document
+* Block edition on attached document on workflow, if the workflow is finalized or sent external
+* Convert workflow's attached document to pdf while sending them external
+* After a signature is canceled or rejected, going to a waiting page until the post-process routines apply a workflow transition
 ### Fixed
-* ([#426](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/426)) Increased the number of required characters when setting a new password in Chill from 9 to 14 - GDPR compliance   
-* Fix permissions on storedObject which are subject by a workflow   
+* ([#426](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/426)) Increased the number of required characters when setting a new password in Chill from 9 to 14 - GDPR compliance
+* Fix permissions on storedObject which are subject by a workflow
 ### DX
-* Introduce a WaitingScreen component to display a waiting screen   
+* Introduce a WaitingScreen component to display a waiting screen
 
 ## v4.4.2 - 2025-09-12
 ### Fixed
-* Fix document generation and workflow generation do not work on accompanying period work documents   
+* Fix document generation and workflow generation do not work on accompanying period work documents
 
 ## v4.4.1 - 2025-09-11
 ### Fixed
-* fix translations in duplicate evaluation document modal and realign close modal button   
+* fix translations in duplicate evaluation document modal and realign close modal button
 
 ## v4.4.0 - 2025-09-11
 ### Feature
-* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Allow the merge of two accompanying period works   
-* ([#369](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/369)) Duplication of a document to another accompanying period work evaluation   
-* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Fusion of two accompanying period works   
+* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Allow the merge of two accompanying period works
+* ([#369](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/369)) Duplication of a document to another accompanying period work evaluation
+* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Fusion of two accompanying period works
 ### Fixed
-* Fix display of 'duplicate' and 'merge' buttons in CRUD templates   
-* Fix saving notification preferences in user's profile   
+* Fix display of 'duplicate' and 'merge' buttons in CRUD templates
+* Fix saving notification preferences in user's profile
 
 ## v4.3.0 - 2025-09-08
 ### Feature
-* ([#409](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/409)) Add 45 and 60 min calendar ranges   
-* Add a command to generate a list of permissions   
-* ([#412](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/412)) Add an absence end date   
+* ([#409](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/409)) Add 45 and 60 min calendar ranges
+* Add a command to generate a list of permissions
+* ([#412](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/412)) Add an absence end date
 
   **Schema Change**: Add columns or tables
 ### Fixed
-* fix date formatting in calendar range display   
-* Change route URL to avoid clash with person duplicate controller method   
+* fix date formatting in calendar range display
+* Change route URL to avoid clash with person duplicate controller method
 
 ## v4.2.1 - 2025-09-03
 ### Fixed
-* Fix exports to work with DirectExportInterface   
+* Fix exports to work with DirectExportInterface
 ### DX
 * Improve error message when a stored object cannot be written on local disk
-   
+
 
 ## v4.2.0 - 2025-09-02
 ### Feature
@@ -73,26 +73,26 @@ and is generated by [Changie](https://github.com/miniscruff/changie).
 
 ## v4.1.0 - 2025-08-26
 ### Feature
-* ([#400](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/400)) Add filter to social actions list to filter out actions where current user intervenes   
-* ([#399](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/399)) Show filters on list pages unfolded by default   
-* Expansion of event module with new fields in the creation form: thematic, internal/external animator, responsable, and budget elements. Filtering options in the event list + adapted exports   
+* ([#400](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/400)) Add filter to social actions list to filter out actions where current user intervenes
+* ([#399](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/399)) Show filters on list pages unfolded by default
+* Expansion of event module with new fields in the creation form: thematic, internal/external animator, responsable, and budget elements. Filtering options in the event list + adapted exports
 
   **Schema Change**: Add columns or tables
 ### Fixed
-* ([#382](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/382)) adjust display logic for accompanying period dates, include closing date if period is closed.   
-* ([#384](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/384)) add min and step attributes to integer field in DateIntervalType   
+* ([#382](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/382)) adjust display logic for accompanying period dates, include closing date if period is closed.
+* ([#384](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/384)) add min and step attributes to integer field in DateIntervalType
 ### UX
-* Limit display of participations in event list   
+* Limit display of participations in event list
 
 ## v4.0.2 - 2025-07-09
 ### Fixed
-* Fix add missing translation   
-* Fix the transfer of evaluations and documents during of accompanyingperiodwork   
+* Fix add missing translation
+* Fix the transfer of evaluations and documents during of accompanyingperiodwork
 
 ## v4.0.1 - 2025-07-08
 ### Fixed
 * Fix package.json for compilation
-   
+
 
 ## v4.0.0 - 2025-07-08
 ### Feature
@@ -171,30 +171,30 @@ framework:
 
 ## v3.12.1 - 2025-06-30
 ### Fixed
-* Fix loading of the list of documents   
+* Fix loading of the list of documents
 
 ## v3.12.0 - 2025-06-30
 ### Feature
-* ([#377](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/377)) Add the document file name to the document title when a user upload a document, unless there is already a document title.   
-* Add desactivation date for social action and issue csv export   
-* Add Emoji and Fullscreen feature to ckeditor configuration   
-* ([#321](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/321)) Create editor which allow us to toggle between rich and simple text editor   
-* Do not remove workflow which are automatically canceled after staling for more than 30 days   
+* ([#377](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/377)) Add the document file name to the document title when a user upload a document, unless there is already a document title.
+* Add desactivation date for social action and issue csv export
+* Add Emoji and Fullscreen feature to ckeditor configuration
+* ([#321](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/321)) Create editor which allow us to toggle between rich and simple text editor
+* Do not remove workflow which are automatically canceled after staling for more than 30 days
 ### Fixed
-* ([#376](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/376)) trying to prevent bug of typeerror in doc-history + improved display of document history   
-* ([#381](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/381)) Display previous participation in acc course work even if the person has left the acc course   
-* ([#372](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/372)) Fix display of text in calendar events   
-* Add missing translation for user_group.no_user_groups   
-* Fix admin entity edit actions for event admin entities and activity reason (category) entities   
+* ([#376](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/376)) trying to prevent bug of typeerror in doc-history + improved display of document history
+* ([#381](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/381)) Display previous participation in acc course work even if the person has left the acc course
+* ([#372](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/372)) Fix display of text in calendar events
+* Add missing translation for user_group.no_user_groups
+* Fix admin entity edit actions for event admin entities and activity reason (category) entities
 * ([#392](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/392)) Allow null and cast as string to setContent method for NewsItem
-   
-* ([#393](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/393)) Doc Generation: the "dump only" method send the document as an email attachment.   
+
+* ([#393](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/393)) Doc Generation: the "dump only" method send the document as an email attachment.
 ### DX
-* ([#352](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/352)) Remove dead code for wopi-link module   
-* Replace library node-sass by sass, and upgrade bootstrap to version 5.3 (yarn upgrade / install is required)   
+* ([#352](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/352)) Remove dead code for wopi-link module
+* Replace library node-sass by sass, and upgrade bootstrap to version 5.3 (yarn upgrade / install is required)
 ### UX
-* ([#374](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/374)) Remove default filter in_progress for the page 'my tasks'; Allows for new tasks to be displayed upon opening of the page   
-* Improve labeling of fields in person resource creation form   
+* ([#374](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/374)) Remove default filter in_progress for the page 'my tasks'; Allows for new tasks to be displayed upon opening of the page
+* Improve labeling of fields in person resource creation form
 
 ## v3.11.0 - 2025-04-17
 ### Feature
@@ -218,11 +218,11 @@ framework:
 
 ## v3.10.3 - 2025-03-18
 ### DX
-* Eslint fixes   
+* Eslint fixes
 
 ## v3.10.2 - 2025-03-17
 ### Fixed
-* Replace a ts-expect-error with a ts-ignore   
+* Replace a ts-expect-error with a ts-ignore
 
 ## v3.10.1 - 2025-03-17
 ### DX
@@ -230,37 +230,37 @@ framework:
 
 ## v3.10.0 - 2025-03-17
 ### Feature
-* ([#363](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/363)) Display social actions grouped per social issue within activity form   
+* ([#363](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/363)) Display social actions grouped per social issue within activity form
 ### Fixed
-* ([#362](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/362)) Fix Dependency Injection, which prevented to save the CalendarRange   
-* ([#368](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/368)) fix search query for user groups   
+* ([#362](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/362)) Fix Dependency Injection, which prevented to save the CalendarRange
+* ([#368](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/368)) fix search query for user groups
 
 ## v3.9.2 - 2025-02-27
 ### Fixed
-* Use fetchResults method to fetch all social issues instead of only the first page   
+* Use fetchResults method to fetch all social issues instead of only the first page
 
 ## v3.9.1 - 2025-02-27
 ### Fixed
-* Fix post/patch request with missing 'type' property for gender   
+* Fix post/patch request with missing 'type' property for gender
 
 ## v3.9.0 - 2025-02-27
 ### Feature
-* ([#349](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/349)) Suggest all referrers within actions of the accompanying period when creating an activity   
-* ([#343](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/343)) Add possibility to export a csv with all social issues and social actions   
-* ([#360](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/360)) Restore document to previous kept version when a workflow is canceled   
-* ([#341](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/341)) Add a list of third parties from within the admin (csv download)   
+* ([#349](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/349)) Suggest all referrers within actions of the accompanying period when creating an activity
+* ([#343](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/343)) Add possibility to export a csv with all social issues and social actions
+* ([#360](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/360)) Restore document to previous kept version when a workflow is canceled
+* ([#341](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/341)) Add a list of third parties from within the admin (csv download)
 ### Fixed
-* fix generation of document with accompanying period context, and list of activities and works   
+* fix generation of document with accompanying period context, and list of activities and works
 ### DX
-* ([#333](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/333)) Create an unique source of trust for translations   
+* ([#333](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/333)) Create an unique source of trust for translations
 
 ## v3.8.2 - 2025-02-10
 ### Fixed
-* ([#358](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/358)) Remove "filter" button on list of documents in the workflow's "add attachement" modal   
+* ([#358](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/358)) Remove "filter" button on list of documents in the workflow's "add attachement" modal
 
 ## v3.8.1 - 2025-02-05
 ### Fixed
-* Fix household link in the parcours banner   
+* Fix household link in the parcours banner
 
 ## v3.8.0 - 2025-02-03
 ### Feature
@@ -276,7 +276,7 @@ framework:
 
 ## v3.7.1 - 2025-01-21
 ### Fixed
-* Fix legacy configuration processor for notifier component   
+* Fix legacy configuration processor for notifier component
 
 ## v3.7.0 - 2025-01-21
 ### Feature
@@ -343,33 +343,33 @@ chill_main:
 
 ## v3.6.0 - 2025-01-16
 ### Feature
-* Importer for addresses does not fails when the postal code is not found with some addresses, and compute a recap list of all addresses that could not be imported. This recap list can be send by email. 
+* Importer for addresses does not fails when the postal code is not found with some addresses, and compute a recap list of all addresses that could not be imported. This recap list can be send by email.
 * ([#346](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/346)) Create a driver for storing documents on disk (instead of openstack object store)
- 
-* Add address importer from french Base d'Adresse Nationale (BAN) 
-* ([#343](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/343)) Add csv export for social issues and social actions 
+
+* Add address importer from french Base d'Adresse Nationale (BAN)
+* ([#343](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/343)) Add csv export for social issues and social actions
 ### Fixed
-* Export: fix missing alias in activity between certain dates filter. Condition added for alias. 
+* Export: fix missing alias in activity between certain dates filter. Condition added for alias.
 
 ## v3.5.3 - 2025-01-07
 ### Fixed
-* Fix the EntityToJsonTransformer to return an empty array if the value is "" 
+* Fix the EntityToJsonTransformer to return an empty array if the value is ""
 
 ## v3.5.2 - 2024-12-19
 ### Fixed
-* ([#345](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/345)) Export: activity filtering of users that were associated to an activity between certain dates. Results contained activities that were not within the specified date range" 
+* ([#345](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/345)) Export: activity filtering of users that were associated to an activity between certain dates. Results contained activities that were not within the specified date range"
 
 ## v3.5.1 - 2024-12-16
 ### Fixed
-* Filiation: fix the display of the gender label in the graph 
-* Wrap handling of PdfSignedMessage into transactions 
+* Filiation: fix the display of the gender label in the graph
+* Wrap handling of PdfSignedMessage into transactions
 
 ## v3.5.0 - 2024-12-09
 ### Feature
-* ([#318](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/318)) Show all the pages of the documents in the signature app 
+* ([#318](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/318)) Show all the pages of the documents in the signature app
 ### Fixed
-* Wrap the signature's change state into a transaction, to avoid race conditions 
-* Fix display of gender label 
+* Wrap the signature's change state into a transaction, to avoid race conditions
+* Fix display of gender label
 
 ## v3.4.3 - 2024-12-05
 ### Fixed
@@ -378,76 +378,76 @@ chill_main:
 
 ## v3.4.2 - 2024-12-05
 ### Fixed
-* ([#329](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/329)) Fix the serialization of gender for the generation of documents 
-* ([#337](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/337)) Enforce unique contraint on activity storedobject 
+* ([#329](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/329)) Fix the serialization of gender for the generation of documents
+* ([#337](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/337)) Enforce unique contraint on activity storedobject
 ### DX
-* ([#310](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/310)) Clean migrations, to reduce the number of bloated migration when running diff on schema 
+* ([#310](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/310)) Clean migrations, to reduce the number of bloated migration when running diff on schema
 
 ## v3.4.1 - 2024-11-22
 ### Fixed
-* Set the workflow's title to notification content and subject 
+* Set the workflow's title to notification content and subject
 
 ## v3.4.0 - 2024-11-20
 ### Feature
 * ([#314](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/314)) Admin: improve document type admin form with a select field for related class.
-Admin: Allow administrator to assign multiple group centers in one go to a user. 
+Admin: Allow administrator to assign multiple group centers in one go to a user.
 
 ## v3.3.0 - 2024-11-20
 ### Feature
 * Electronic signature
 
-Implementation of the electronic signature for documents within chill. 
-* ([#286](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/286)) The behavoir of the voters for stored objects is adjusted so as to limit edit and delete possibilities to users related to the activity, social action or workflow entity. 
-* ([#288](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/288)) Metadata form added for person signatures 
-* Add a signature step in workflow, which allow to apply an electronic signature on documents 
-* Keep an history of each version of a stored object. 
-* Add a "send external" step in workflow, which allow to send stored objects and other elements to remote people, by sending them a public url 
+Implementation of the electronic signature for documents within chill.
+* ([#286](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/286)) The behavoir of the voters for stored objects is adjusted so as to limit edit and delete possibilities to users related to the activity, social action or workflow entity.
+* ([#288](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/288)) Metadata form added for person signatures
+* Add a signature step in workflow, which allow to apply an electronic signature on documents
+* Keep an history of each version of a stored object.
+* Add a "send external" step in workflow, which allow to send stored objects and other elements to remote people, by sending them a public url
 ### Fixed
-* Adjust household list export to include households even if their address is NULL 
-* Remove validation of date string on deathDate 
+* Adjust household list export to include households even if their address is NULL
+* Remove validation of date string on deathDate
 
 ## v3.2.4 - 2024-11-06
 ### Fixed
-* Fix compilation of chill assets 
+* Fix compilation of chill assets
 
 ## v3.2.3 - 2024-11-05
 ### Fixed
 * ([#315](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/315)) Fix display of accompanying period work referrers. Only current referrers should be displayed.
-Fix color of Chill footer 
+Fix color of Chill footer
 
 ## v3.2.2 - 2024-10-31
 ### Fixed
-* Fix gender translation for unknown 
+* Fix gender translation for unknown
 
 ## v3.2.1 - 2024-10-31
 ### Fixed
-* Add the possibility of unknown to the gender entity 
-* Fix the fusion of person doubles by excluding accompanyingPeriod work entities to be deleted. They are moved instead. 
+* Add the possibility of unknown to the gender entity
+* Fix the fusion of person doubles by excluding accompanyingPeriod work entities to be deleted. They are moved instead.
 
 ## v3.2.0 - 2024-10-30
 ### Feature
-* Introduce a gender entity 
+* Introduce a gender entity
 
 ## v3.1.1 - 2024-10-01
 ### Fixed
-* ([#308](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/308)) Show only the current referrer in the page "show" for an accompanying period workf 
+* ([#308](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/308)) Show only the current referrer in the page "show" for an accompanying period workf
 * ([#309](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/309)) Correctly compute the grouping by referrer aggregator
- 
-* Fixed typing of custom field long choice and custom field group 
+
+* Fixed typing of custom field long choice and custom field group
 
 ## v3.1.0 - 2024-08-30
 ### Feature
-* Add export aggregator to aggregate activities by household + filter persons that are not part of an accompanyingperiod during a certain timeframe. 
+* Add export aggregator to aggregate activities by household + filter persons that are not part of an accompanyingperiod during a certain timeframe.
 
 ## v3.0.0 - 2024-08-26
 ### Fixed
-* Fix delete action for accompanying periods in draft state 
-* Fix connection to azure when making an calendar event in chill 
-* CollectionType js fixes for remove button and adding multiple entries 
+* Fix delete action for accompanying periods in draft state
+* Fix connection to azure when making an calendar event in chill
+* CollectionType js fixes for remove button and adding multiple entries
 
 ## v2.24.0 - 2024-09-11
 ### Feature
-* ([#306](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/306)) When a document is converted or downloaded in the browser, this document is removed from the browser memory after 45s. Future click on the button re-download the document. 
+* ([#306](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/306)) When a document is converted or downloaded in the browser, this document is removed from the browser memory after 45s. Future click on the button re-download the document.
 
 ## v2.23.0 - 2024-07-23 & 2024-07-19
 ### Feature
@@ -482,13 +482,13 @@ Fix color of Chill footer
 
 ## v2.22.2 - 2024-07-03
 ### Fixed
-* Remove scope required for event participation stats 
+* Remove scope required for event participation stats
 
 ## v2.22.1 - 2024-07-01
 ### Fixed
-* Remove debug word 
+* Remove debug word
 ### DX
-* Add a command for reading official address DB from Luxembourg and update chill addresses 
+* Add a command for reading official address DB from Luxembourg and update chill addresses
 
 ## v2.22.0 - 2024-06-25
 ### Feature
@@ -531,7 +531,7 @@ Fix color of Chill footer
 
 ## v2.20.1 - 2024-06-05
 ### Fixed
-* Do not allow StoredObjectCreated for edit and convert buttons 
+* Do not allow StoredObjectCreated for edit and convert buttons
 
 ## v2.20.0 - 2024-06-05
 ### Fixed
@@ -578,96 +578,96 @@ Fix color of Chill footer
 
 ## v2.18.2 - 2024-04-12
 ### Fixed
-* ([#250](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/250)) Postal codes import : fix the source URL and the keys to handle each record 
+* ([#250](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/250)) Postal codes import : fix the source URL and the keys to handle each record
 
 ## v2.18.1 - 2024-03-26
 ### Fixed
-* Fix layout issue in document generation for admin (minor) 
+* Fix layout issue in document generation for admin (minor)
 
 ## v2.18.0 - 2024-03-26
 ### Feature
-* ([#268](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/268)) Improve admin UX to configure document templates for document generation 
+* ([#268](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/268)) Improve admin UX to configure document templates for document generation
 ### Fixed
-* ([#267](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/267)) Fix the join between job and user in the user list (admin): show only the current user job 
+* ([#267](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/267)) Fix the join between job and user in the user list (admin): show only the current user job
 
 ## v2.17.0 - 2024-03-19
 ### Feature
-* ([#237](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/237)) New export filter for social actions with an evaluation created between two dates 
-* ([#258](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/258)) In the list of accompangying period, add the list of person's centers and the duration of the course 
-* ([#238](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/238)) Allow to customize list person with new fields 
+* ([#237](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/237)) New export filter for social actions with an evaluation created between two dates
+* ([#258](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/258)) In the list of accompangying period, add the list of person's centers and the duration of the course
+* ([#238](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/238)) Allow to customize list person with new fields
 * ([#159](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/159)) Admin can publish news on the homepage
 ### Fixed
-* ([#264](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/264)) Fix languages: load the languages in all availables languages configured for Chill 
-* ([#259](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/259)) Keep a consistent behaviour between the filtering of activities within the document generation (model "accompanying period with activities"), and the same filter in the list of activities for an accompanying period 
+* ([#264](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/264)) Fix languages: load the languages in all availables languages configured for Chill
+* ([#259](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/259)) Keep a consistent behaviour between the filtering of activities within the document generation (model "accompanying period with activities"), and the same filter in the list of activities for an accompanying period
 
 ## v2.16.3 - 2024-02-26
 ### Fixed
-* ([#236](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/236)) Fix translation of user job -> 'service' must be 'métier' 
+* ([#236](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/236)) Fix translation of user job -> 'service' must be 'métier'
 ### UX
-* ([#232](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/232)) Order user jobs and services alphabetically in export filters 
+* ([#232](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/232)) Order user jobs and services alphabetically in export filters
 
 ## v2.16.2 - 2024-02-21
 ### Fixed
-* Check for null values in closing motive of parcours d'accompagnement for correct rendering of template 
+* Check for null values in closing motive of parcours d'accompagnement for correct rendering of template
 
 ## v2.16.1 - 2024-02-09
 ### Fixed
-* Force bootstrap version to avoid error in builds with newer version 
+* Force bootstrap version to avoid error in builds with newer version
 
 ## v2.16.0 - 2024-02-08
 ### Feature
-* ([#231](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/231)) Create new filter for persons having a participation in an accompanying period during a certain time span 
-* ([#241](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/241)) [Export][List of accompanyign period] Add two columns: the list of persons participating to the period, and their ids 
-* ([#244](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/244)) Add capability to generate export about change of steps of accompanying period, and generate exports for this 
-* ([#253](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/253)) Export: group accompanying period by person participating 
-* ([#243](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/243)) Export: add filter for courses not linked to a reference address 
-* ([#229](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/229)) Allow to group activities linked with accompanying period by reason 
-* ([#115](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/115)) Prevent social work to be saved when another user edited conccurently the social work 
-* Modernize the event bundle, with some new fields and multiple improvements 
+* ([#231](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/231)) Create new filter for persons having a participation in an accompanying period during a certain time span
+* ([#241](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/241)) [Export][List of accompanyign period] Add two columns: the list of persons participating to the period, and their ids
+* ([#244](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/244)) Add capability to generate export about change of steps of accompanying period, and generate exports for this
+* ([#253](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/253)) Export: group accompanying period by person participating
+* ([#243](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/243)) Export: add filter for courses not linked to a reference address
+* ([#229](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/229)) Allow to group activities linked with accompanying period by reason
+* ([#115](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/115)) Prevent social work to be saved when another user edited conccurently the social work
+* Modernize the event bundle, with some new fields and multiple improvements
 ### Fixed
-* ([#220](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/220)) Fix error in logs about wrong typing of eventArgs in onEditNotificationComment method 
-* ([#256](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/256)) Fix the conditions upon which social actions should be optional or required in relation to social issues within the activity creation form 
+* ([#220](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/220)) Fix error in logs about wrong typing of eventArgs in onEditNotificationComment method
+* ([#256](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/256)) Fix the conditions upon which social actions should be optional or required in relation to social issues within the activity creation form
 ### UX
-* ([#260](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/260)) Order list of centers alphabetically in dropdown 'user' section admin. 
+* ([#260](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/260)) Order list of centers alphabetically in dropdown 'user' section admin.
 
 ## v2.15.2 - 2024-01-11
 ### Fixed
-* Fix the id_seq used when creating a new accompanying period participation during fusion of two person files 
+* Fix the id_seq used when creating a new accompanying period participation during fusion of two person files
 ### DX
-* Set placeholder to False for expanded EntityType form fields where required is set to False. 
+* Set placeholder to False for expanded EntityType form fields where required is set to False.
 
 ## v2.15.1 - 2023-12-20
 ### Fixed
-* Fix the household export query to exclude accompanying periods that are in draft state. 
+* Fix the household export query to exclude accompanying periods that are in draft state.
 ### DX
-* ([#167](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/167)) Fixed readthedocs compilation by updating readthedocs config file and requirements for Sphinx 
+* ([#167](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/167)) Fixed readthedocs compilation by updating readthedocs config file and requirements for Sphinx
 
 ## v2.15.0 - 2023-12-11
 ### Feature
-* ([#191](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/191)) Add export "number of household associate with an exchange" 
-* ([#235](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/235)) Export: add dates on the filter "filter course by activity type" 
+* ([#191](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/191)) Add export "number of household associate with an exchange"
+* ([#235](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/235)) Export: add dates on the filter "filter course by activity type"
 ### Fixed
-* ([#214](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/214)) Fix error when posting an empty comment on an accompanying period. 
-* ([#233](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/233)) Fix "filter evaluation by evaluation type" (and add select2 to the list of evaluation types to pick) 
+* ([#214](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/214)) Fix error when posting an empty comment on an accompanying period.
+* ([#233](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/233)) Fix "filter evaluation by evaluation type" (and add select2 to the list of evaluation types to pick)
 * ([#234](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/234)) Fix "filter aside activity by date"
- 
-* ([#228](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/228)) Fix export of activity for people created before the introduction of the createdAt column on person (during v1) 
-* ([#246](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/246)) Do not show activities, evaluations and social work when associated to a confidential accompanying period, except for the users which are allowed to see them 
+
+* ([#228](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/228)) Fix export of activity for people created before the introduction of the createdAt column on person (during v1)
+* ([#246](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/246)) Do not show activities, evaluations and social work when associated to a confidential accompanying period, except for the users which are allowed to see them
 
 ## v2.14.1 - 2023-11-29
 ### Fixed
-* Export: fix list person with custom fields 
-* ([#100](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/100)) Add a paginator to budget elements (resource and charge types) in the admin 
-* Fix error in ListEvaluation when "handling agents" are alone 
+* Export: fix list person with custom fields
+* ([#100](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/100)) Add a paginator to budget elements (resource and charge types) in the admin
+* Fix error in ListEvaluation when "handling agents" are alone
 
 ## v2.14.0 - 2023-11-24
 ### Feature
-* ([#161](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/161)) Export: in filter "Filter accompanying period work (social action) by type, goal and result", order the items alphabetically or with the defined order 
+* ([#161](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/161)) Export: in filter "Filter accompanying period work (social action) by type, goal and result", order the items alphabetically or with the defined order
 ### Fixed
-* ([#141](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/141)) Export: on filter "action by type goals, and results", restore the fields when editing a saved export 
-* ([#219](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/219)) Export: fix the list of accompanying period work, when the "calc date" is null 
-* ([#222](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/222)) Fix rendering of custom fields 
-* Fix various errors in custom fields administration 
+* ([#141](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/141)) Export: on filter "action by type goals, and results", restore the fields when editing a saved export
+* ([#219](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/219)) Export: fix the list of accompanying period work, when the "calc date" is null
+* ([#222](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/222)) Fix rendering of custom fields
+* Fix various errors in custom fields administration
 
 ## v2.13.0 - 2023-11-21
 ### Feature
@@ -681,7 +681,7 @@ Fix color of Chill footer
 
 ## v2.12.1 - 2023-11-16
 ### Fixed
-* ([#208](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/208)) Export: fix loading of form for "filter action by type, goal and result" 
+* ([#208](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/208)) Export: fix loading of form for "filter action by type, goal and result"
 
 ## v2.12.0 - 2023-11-15
 ### Feature
@@ -712,36 +712,36 @@ Fix color of Chill footer
 
 ## v2.11.0 - 2023-11-07
 ### Feature
-* ([#194](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/194)) Export: add a filter "filter activity by creator job" 
+* ([#194](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/194)) Export: add a filter "filter activity by creator job"
 ### Fixed
-* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix "group accompanying period by geographical unit": take into account the accompanying periods when the period is not located within an unit 
-* Fix "group activity by creator job" aggregator 
+* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix "group accompanying period by geographical unit": take into account the accompanying periods when the period is not located within an unit
+* Fix "group activity by creator job" aggregator
 
 ## v2.10.6 - 2023-11-07
 ### Fixed
-* ([#182](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/182)) Fix merging of double person files. Adjustement relationship sql statement 
-* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix aggregator by geographical unit on person: avoid inconsistencies 
+* ([#182](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/182)) Fix merging of double person files. Adjustement relationship sql statement
+* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix aggregator by geographical unit on person: avoid inconsistencies
 
 ## v2.10.5 - 2023-11-05
 ### Fixed
-* ([#183](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/183)) Fix "problem during download" on some filters, which used a wrong data type 
-* ([#184](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/184)) Fix filter "activity by date" 
+* ([#183](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/183)) Fix "problem during download" on some filters, which used a wrong data type
+* ([#184](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/184)) Fix filter "activity by date"
 
 ## v2.10.4 - 2023-10-26
 ### Fixed
-* Fix null value constraint errors when merging relationships in doubles 
+* Fix null value constraint errors when merging relationships in doubles
 
 ## v2.10.3 - 2023-10-26
 ### Fixed
-* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Replace old method of getting translator with injection of translatorInterface 
+* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Replace old method of getting translator with injection of translatorInterface
 
 ## v2.10.2 - 2023-10-26
 ### Fixed
-* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Use injection of translator instead of ->get(). 
+* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Use injection of translator instead of ->get().
 
 ## v2.10.1 - 2023-10-24
 ### Fixed
-* Fix export controller when generating an export without any data in session 
+* Fix export controller when generating an export without any data in session
 
 ## v2.10.0 - 2023-10-24
 ### Feature
@@ -761,16 +761,16 @@ Fix color of Chill footer
 - ajout d'un filtre et regroupement par usager participant sur les échanges
 - ajout d'un regroupement: par type d'activité associé au parcours;
 - trie les filtre et regroupements par ordre alphabétique dans els exports
-- ajout d'un paramètre qui permet de désactiver le filtre par centre dans les exports
+- ajout d'un paramètre qui permet de désactiver le filtre par territoire dans les exports
 - correction de l'interface de date dans les filtres et regroupements "par statut du parcours à la date"
 
 ## v2.9.2 - 2023-10-17
 ### Fixed
-* Fix possible null values in string's entities 
+* Fix possible null values in string's entities
 
 ## v2.9.1 - 2023-10-17
 ### Fixed
-* Fix the handling of activity form when editing or creating an activity in an accompanying period with multiple centers 
+* Fix the handling of activity form when editing or creating an activity in an accompanying period with multiple centers
 
 ## v2.9.0 - 2023-10-17
 ### Feature
@@ -818,57 +818,57 @@ But if you do not need this any more, you must ensure that the configuration key
 
 ## v2.7.0 - 2023-09-27
 ### Feature
-* ([#155](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/155)) The regulation list load accompanying periods by exact postal code (address associated with postal code), and not by the content of the postal code (postal code with same code's string) 
+* ([#155](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/155)) The regulation list load accompanying periods by exact postal code (address associated with postal code), and not by the content of the postal code (postal code with same code's string)
 ### Fixed
-* ([#142](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/142)) Fix the label of filter ActivityTypeFilter to a more obvious one 
-* ([#140](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/140)) [export] Fix association of filter "filter location by type" which did not appears on "list of activities" 
+* ([#142](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/142)) Fix the label of filter ActivityTypeFilter to a more obvious one
+* ([#140](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/140)) [export] Fix association of filter "filter location by type" which did not appears on "list of activities"
 
 ## v2.6.3 - 2023-09-19
 ### Fixed
-* Remove id property from document 
-mappedsuperclass 
+* Remove id property from document
+mappedsuperclass
 
 ## v2.6.2 - 2023-09-18
 ### Fixed
-* Fix doctrine mapping of AbstractTaskPlaceEvent and SingleTaskPlaceEvent: id property moved. 
+* Fix doctrine mapping of AbstractTaskPlaceEvent and SingleTaskPlaceEvent: id property moved.
 
 ## v2.6.1 - 2023-09-14
 ### Fixed
-* Filter out active centers in exports, which uses a different PickCenterType. 
+* Filter out active centers in exports, which uses a different PickCenterType.
 
 ## v2.6.0 - 2023-09-14
 ### Feature
-* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Add locations in Aside Activity. By default, suggest user location, otherwise a select with all locations. 
-* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Adapt Aside Activity exports: display location, filter by location, group by location 
-* Use the CRUD controller for center entity + add the isActive property to be able to mask instances of Center that are no longer in use. 
+* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Add locations in Aside Activity. By default, suggest user location, otherwise a select with all locations.
+* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Adapt Aside Activity exports: display location, filter by location, group by location
+* Use the CRUD controller for center entity + add the isActive property to be able to mask instances of Center that are no longer in use.
 ### Fixed
-* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) reinstate the fusion of duplicate persons 
-* Missing translation in Work Actions exports 
-* Reimplement the mission type filter on tasks, only for instances that have a config parameter indicating true for this. 
-* ([#135](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/135)) Corrects a typing error in 2 filters, which caused an 
+* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) reinstate the fusion of duplicate persons
+* Missing translation in Work Actions exports
+* Reimplement the mission type filter on tasks, only for instances that have a config parameter indicating true for this.
+* ([#135](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/135)) Corrects a typing error in 2 filters, which caused an
 error when trying to reedit a saved export
 
- 
-* ([#136](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/136)) [household] when moving a person to a sharing position to a not-sharing position on the same household on the same date, remove the previous household membership on the same household. This fix duplicate member. 
+
+* ([#136](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/136)) [household] when moving a person to a sharing position to a not-sharing position on the same household on the same date, remove the previous household membership on the same household. This fix duplicate member.
 * Add missing translation for comment field placeholder in repositionning household editor.
- 
-* Do not send an email to creator twice when adding a comment to a notification 
-* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) Fix gestion doublon functionality to work with chill bundles v2 
+
+* Do not send an email to creator twice when adding a comment to a notification
+* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) Fix gestion doublon functionality to work with chill bundles v2
 ### UX
 * Uniformize badge-person in household banner (background, size)
- 
+
 
 ## v2.5.3 - 2023-07-20
 ### Fixed
-* ([#132](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/132)) Rendez-vous documents created would appear in all documents lists of all persons with an accompanying period. Or statements are now added to the where clause to filter out documents that come from unrelated accompanying period/ or person rendez-vous. 
+* ([#132](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/132)) Rendez-vous documents created would appear in all documents lists of all persons with an accompanying period. Or statements are now added to the where clause to filter out documents that come from unrelated accompanying period/ or person rendez-vous.
 
 ## v2.5.2 - 2023-07-15
 ### Fixed
-* [Collate Address] when updating address point, do not use the point's address reference if the similarity is below the requirement for associating the address reference and the address (it uses the postcode's center instead) 
+* [Collate Address] when updating address point, do not use the point's address reference if the similarity is below the requirement for associating the address reference and the address (it uses the postcode's center instead)
 
 ## 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 
+* [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
@@ -941,7 +941,7 @@ error when trying to reedit a saved export
 - ajout d'un regroupement par métier des intervenants sur un parcours;
 - ajout d'un regroupement par service des intervenants sur un parcours;
 - ajout d'un regroupement par utilisateur intervenant sur un parcours
-- ajout d'un regroupement "par centre de l'usager";
+- ajout d'un regroupement "par territoire de l'usager";
 - ajout d'un filtre "par métier intervenant sur un parcours";
 - ajout d'un filtre "par service intervenant sur un parcours";
 - création d'un rôle spécifique pour voir les parcours confidentiels (et séparer de celui de la liste qui permet de ré-assigner les parcours en lot);

config/routes/chill_assets_dev.yaml

@@ -17,9 +17,3 @@ when@dev:
         defaults:
             template: '@ChillMain/Dev/dev.assets.test2.html.twig'
 
-
-    sass_address_picker:
-        path: /_dev/address-picker
-        controller: Symfony\Bundle\FrameworkBundle\Controller\TemplateController
-        defaults:
-            template: '@ChillMain/Dev/dev.address-picker.html.twig'

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

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

docs/source/development/database-principles.rst

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

docs/source/development/database/table_list.csv

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

package.json

@@ -45,7 +45,6 @@
     "webpack-cli": "^5.0.1"
   },
   "dependencies": {
-    "@fragaria/address-formatter": "^6.6.1",
     "@fullcalendar/core": "^6.1.4",
     "@fullcalendar/daygrid": "^6.1.4",
     "@fullcalendar/interaction": "^6.1.4",
@@ -67,12 +66,10 @@
     "mime": "^4.0.0",
     "pdfjs-dist": "^4.3.136",
     "vis-network": "^9.1.0",
-    "vue": "^3.5.x",
+    "vue": "^3.5.6",
     "vue-i18n": "^9.1.6",
     "vue-multiselect": "3.0.0-alpha.2",
     "vue-toast-notification": "^3.1.2",
-    "vue-tsc": "^3.1.0",
-    "vue-use-leaflet": "^0.1.7",
     "vuex": "^4.0.0"
   },
   "browserslist": [

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

@@ -10,7 +10,7 @@ Attendee: Présence de l'usager
 attendee: présence de l'usager
 list_reasons: liste des sujets
 user_username: nom de l'utilisateur
-circle_name: nom du cercle
+circle_name: nom du service
 Remark: Commentaire
 No comments: Aucun commentaire
 Add a new activity: Ajouter une nouvel échange
@@ -20,7 +20,7 @@ not present: absent
 Delete: Supprimer
 Update: Mettre à jour
 Update activity: Modifier l'échange
-Scope: Cercle
+Scope: Service
 Activity data: Données de l'échange
 Activity location: Localisation de l'échange
 No reason associated: Aucun sujet
@@ -398,7 +398,7 @@ export:
             sent received: Envoyé ou reçu
             emergency: Urgence
             accompanying course id: Identifiant du parcours
-            course circles: Cercles du parcours
+            course circles: Services du parcours
             travelTime: Durée de déplacement
             durationTime: Durée
             id: Identifiant

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

@@ -177,7 +177,7 @@ export:
         agent_id: Utilisateur
         creator_id: Créateur
         main_scope: Service principal de l'utilisateur
-        main_center: Centre principal de l'utilisateur
+        main_center: Territoire principal de l'utilisateur
         aside_activity_type: Catégorie d'activité annexe
         date: Date
         duration: Durée

src/Bundle/ChillDocStoreBundle/Controller/StoredObjectVersionApiController.php

@@ -59,7 +59,7 @@ final readonly class StoredObjectVersionApiController
 
         return new JsonResponse(
             $this->serializer->serialize(
-                new Collection($items, $paginator),
+                new Collection(array_values($items->toArray()), $paginator),
                 'json',
                 [AbstractNormalizer::GROUPS => ['read', StoredObjectVersionNormalizer::WITH_POINT_IN_TIMES_CONTEXT, StoredObjectVersionNormalizer::WITH_RESTORED_CONTEXT]]
             ),

src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonListItem.vue

@@ -3,9 +3,9 @@ import {
     StoredObject,
     StoredObjectPointInTime,
     StoredObjectVersionWithPointInTime,
-} from "./../../../types";
+} from "ChillDocStoreAssets/types";
 import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue";
-import { ISOToDatetime } from "./../../../../../../ChillMainBundle/Resources/public/chill/js/date";
+import { ISOToDatetime } from "ChillMainAssets/chill/js/date";
 import FileIcon from "ChillDocStoreAssets/vuejs/FileIcon.vue";
 import RestoreVersionButton from "ChillDocStoreAssets/vuejs/StoredObjectButton/HistoryButton/RestoreVersionButton.vue";
 import DownloadButton from "ChillDocStoreAssets/vuejs/StoredObjectButton/DownloadButton.vue";

src/Bundle/ChillDocStoreBundle/Tests/Controller/StoredObjectVersionApiControllerTest.php

@@ -40,6 +40,10 @@ class StoredObjectVersionApiControllerTest extends \PHPUnit\Framework\TestCase
             $storedObject->registerVersion();
         }
 
+        // remove one version in the history
+        $v5 = $storedObject->getVersions()->get(5);
+        $storedObject->removeVersion($v5);
+
         $security = $this->prophesize(Security::class);
         $security->isGranted(StoredObjectRoleEnum::SEE->value, $storedObject)
             ->willReturn(true)
@@ -53,6 +57,7 @@ class StoredObjectVersionApiControllerTest extends \PHPUnit\Framework\TestCase
         self::assertEquals($response->getStatusCode(), 200);
         self::assertIsArray($body);
         self::assertArrayHasKey('results', $body);
+        self::assertIsList($body['results']);
         self::assertCount(10, $body['results']);
     }
 

src/Bundle/ChillEventBundle/Controller/EventController.php

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

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

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

src/Bundle/ChillMainBundle/Controller/AddressReferenceAggregatedApiController.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\Controller;
-
-use Chill\MainBundle\Repository\AddressReferenceRepositoryInterface;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
-use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
-use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Security\Core\Security;
-
-final readonly class AddressReferenceAggregatedApiController
-{
-    public function __construct(
-        private Security $security,
-        private AddressReferenceRepositoryInterface $addressReferenceRepository,
-    ) {}
-
-    #[Route(path: '/api/1.0/main/address-reference/aggregated/search')]
-    public function search(Request $request): JsonResponse
-    {
-        if (!$this->security->isGranted('IS_AUTHENTICATED')) {
-            throw new AccessDeniedHttpException();
-        }
-
-        if (!$request->query->has('q')) {
-            throw new BadRequestHttpException('Parameter "q" is required.');
-        }
-
-        $q = trim($request->query->get('q'));
-
-        if ('' === $q) {
-            throw new BadRequestHttpException('Parameter "q" is required and cannot be empty.');
-        }
-
-        $result = $this->addressReferenceRepository->findAggregatedBySearchString($q);
-
-        return new JsonResponse(iterator_to_array($result));
-    }
-}

src/Bundle/ChillMainBundle/Controller/PostalCodeForAddressReferenceApiController.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\MainBundle\Controller;
-
-use Chill\MainBundle\Repository\PostalCodeForAddressReferenceRepositoryInterface;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
-use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
-use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Security\Core\Security;
-
-final readonly class PostalCodeForAddressReferenceApiController
-{
-    public function __construct(
-        private PostalCodeForAddressReferenceRepositoryInterface $postalCodeForAddressReferenceRepository,
-        private Security $security,
-    ) {}
-
-    #[Route('/api/1.0/main/address-reference/postal-code/search')]
-    public function findPostalCodeBySearch(Request $request): JsonResponse
-    {
-
-        if (!$this->security->isGranted('IS_AUTHENTICATED')) {
-            throw new AccessDeniedHttpException();
-        }
-
-        $search = $request->query->get('q');
-
-        if (null === $search || '' === trim($search)) {
-            throw new BadRequestHttpException('No search query provided');
-        }
-
-        $postalCodes = iterator_to_array($this->postalCodeForAddressReferenceRepository->findPostalCode($search));
-
-        return new JsonResponse($postalCodes, json: false);
-    }
-}

src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php

@@ -14,14 +14,13 @@ namespace Chill\MainBundle\Repository;
 use Chill\MainBundle\Entity\AddressReference;
 use Chill\MainBundle\Entity\PostalCode;
 use Chill\MainBundle\Search\SearchApiQuery;
-use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\NativeQuery;
 use Doctrine\ORM\Query\ResultSetMapping;
 use Doctrine\ORM\Query\ResultSetMappingBuilder;
+use Doctrine\Persistence\ObjectRepository;
 
-final readonly class AddressReferenceRepository implements AddressReferenceRepositoryInterface
+final readonly class AddressReferenceRepository implements ObjectRepository
 {
     private EntityManagerInterface $entityManager;
 
@@ -66,121 +65,6 @@ final readonly class AddressReferenceRepository implements AddressReferenceRepos
         return $this->repository->findAll();
     }
 
-    public function findAggregatedBySearchString(string $search, PostalCode|int|null $postalCode = null, int $firstResult = 0, int $maxResults = 50): iterable
-    {
-        $terms = $this->buildTermsFromSearchString($search);
-        if ([] === $terms) {
-            return [];
-        }
-
-        $connection = $this->entityManager->getConnection();
-        $qb = $connection->createQueryBuilder();
-
-        $qb->select('row_number() OVER () AS row_number', 'var.street AS street', 'cmpc.id AS postcode_id', 'cmpc.code AS code', 'cmpc.label AS label', 'jsonb_object_agg(var.address_id, var.streetnumber ORDER BY var.row_number) AS positions')
-            ->from('view_chill_main_address_reference', 'var')
-            ->innerJoin('var', 'chill_main_postal_code', 'cmpc', 'cmpc.id = var.postcode_id')
-            ->groupBy('cmpc.id', 'var.street')
-            ->setFirstResult($firstResult)
-            ->setMaxResults($maxResults);
-
-        $paramId = 0;
-
-        foreach ($terms as $term) {
-            $qb->andWhere('var.address like UNACCENT(LOWER(?))');
-            $qb->setParameter(++$paramId, "%{$term}%");
-        }
-
-        if (null !== $postalCode) {
-            $qb->andWhere('var.postcode_id = ?');
-            $qb->setParameter(++$paramId, $postalCode instanceof PostalCode ? $postalCode->getId() : $postalCode);
-        }
-
-        $result = $qb->executeQuery();
-
-        foreach ($result->iterateAssociative() as $row) {
-            yield [...$row, 'positions' => json_decode($row['positions'], true, 512, JSON_THROW_ON_ERROR)];
-        }
-    }
-
-    /**
-     * @return iterable<AddressReference>
-     */
-    public function findBySearchString(string $search, PostalCode|int|null $postalCode = null, int $firstResult = 0, int $maxResults = 50): iterable
-    {
-        $terms = $this->buildTermsFromSearchString($search);
-        if ([] === $terms) {
-            return [];
-        }
-
-        $rsm = new ResultSetMappingBuilder($this->entityManager);
-        $rsm->addRootEntityFromClassMetadata(AddressReference::class, 'ar');
-        $baseSql = 'SELECT '.$rsm->generateSelectClause(['ar' => 'ar']).' FROM chill_main_address_reference ar JOIN
-            view_chill_main_address_reference var ON var.address_id = ar.id';
-        $nql = $this->buildQueryBySearchString($rsm, $baseSql, $terms, $postalCode);
-
-        $orderBy = [];
-        $pertinence = [];
-        foreach ($terms as $k => $term) {
-            $pertinence[] =
-                "(EXISTS (SELECT 1 FROM unnest(string_to_array(address, ' ')) AS t WHERE starts_with(t, UNACCENT(LOWER(:order{$k})))))::int";
-            $pertinence[] = "(address LIKE UNACCENT(LOWER(:order{$k})))::int";
-            $nql->setParameter('order'.$k, $term);
-        }
-        $orderBy[] = implode(' + ', $pertinence).' ASC';
-        $orderBy[] = implode('row_number ASC', $orderBy);
-
-        $nql->setSQL($nql->getSQL().' ORDER BY '.implode(', ', $orderBy));
-
-        return $nql->toIterable();
-    }
-
-    public function countBySearchString(string $search, PostalCode|int|null $postalCode = null): int
-    {
-        $terms = $this->buildTermsFromSearchString($search);
-        if ([] === $terms) {
-            return 0;
-        }
-
-        $rsm = new ResultSetMappingBuilder($this->entityManager);
-        $rsm->addScalarResult('c', 'c', Types::INTEGER);
-        $nql = $this->buildQueryBySearchString($rsm, 'SELECT COUNT(var.*) AS c FROM view_chill_main_address_reference var', $terms, $postalCode);
-
-        return $nql->getSingleScalarResult();
-    }
-
-    private function buildTermsFromSearchString(string $search): array
-    {
-        return array_filter(
-            array_map(
-                static fn (string $term) => trim($term),
-                explode(' ', $search)
-            ),
-            static fn (string $term) => '' !== $term
-        );
-    }
-
-    private function buildQueryBySearchString(ResultSetMapping $rsm, string $select, array $terms, PostalCode|int|null $postalCode = null): NativeQuery
-    {
-        $nql = $this->entityManager->createNativeQuery('', $rsm);
-
-        $sql = $select.' WHERE ';
-
-        $wheres = [];
-        foreach ($terms as $k => $term) {
-            $wheres[] = "var.address like :w{$k}";
-            $nql->setParameter("w{$k}", '%'.$term.'%', Types::STRING);
-        }
-
-        if (null !== $postalCode) {
-            $wheres[] = 'var.postcode_id = :postalCode';
-            $nql->setParameter('postalCode', $postalCode instanceof PostalCode ? $postalCode->getId() : $postalCode);
-        }
-
-        $nql->setSQL($sql.implode(' AND ', $wheres));
-
-        return $nql;
-    }
-
     /**
      * @param mixed|null $limit
      * @param mixed|null $offset

src/Bundle/ChillMainBundle/Repository/AddressReferenceRepositoryInterface.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\Repository;
-
-use Chill\MainBundle\Entity\PostalCode;
-use Doctrine\Persistence\ObjectRepository;
-
-interface AddressReferenceRepositoryInterface extends ObjectRepository
-{
-    public function findAggregatedBySearchString(string $search, PostalCode|int|null $postalCode = null, int $firstResult = 0, int $maxResults = 50): iterable;
-}

src/Bundle/ChillMainBundle/Repository/PostalCodeForAddressReferenceRepository.php

@@ -1,69 +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\Repository;
-
-use Doctrine\DBAL\Connection;
-
-final readonly class PostalCodeForAddressReferenceRepository implements PostalCodeForAddressReferenceRepositoryInterface
-{
-    public function __construct(private Connection $connection) {}
-
-    public function findPostalCode(string $search, int $firstResult = 0, int $maxResults = 50): iterable
-    {
-        $terms = $this->buildTermsFromSearchString($search);
-        if ([] === $terms) {
-            return [];
-        }
-
-        $qb = $this->connection->createQueryBuilder();
-
-        $qb->from('chill_main_postal_code', 'cmpc')
-            ->join('cmpc', 'view_chill_main_address_reference', 'vcmar', 'vcmar.postcode_id = cmpc.id')
-            ->join('vcmar', 'country', 'country', condition: 'cmpc.country_id = country.id')
-            ->setFirstResult($firstResult)
-            ->setMaxResults($maxResults)
-        ;
-
-        $qb->select(
-            'DISTINCT ON (cmpc.code, cmpc.label) cmpc.id AS postcode_id',
-            'cmpc.code AS code',
-            'cmpc.label AS label',
-            'country.id AS country_id',
-            'country.countrycode AS country_code',
-            'country.name AS country_name'
-        );
-
-        $paramId = 0;
-
-        foreach ($terms as $term) {
-            $qb->andWhere('vcmar.address like ?');
-            $qb->setParameter(++$paramId, "%{$term}%");
-        }
-
-        $result = $qb->executeQuery();
-
-        foreach ($result->iterateAssociative() as $row) {
-            yield [...$row, 'country_name' => json_decode($row['country_name'], true, 512, JSON_THROW_ON_ERROR)];
-        }
-    }
-
-    private function buildTermsFromSearchString(string $search): array
-    {
-        return array_filter(
-            array_map(
-                static fn (string $term) => trim($term),
-                explode(' ', $search)
-            ),
-            static fn (string $term) => '' !== $term
-        );
-    }
-}

src/Bundle/ChillMainBundle/Repository/PostalCodeForAddressReferenceRepositoryInterface.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\Repository;
-
-/**
- * Search for postal code using optimized materialized view.
- */
-interface PostalCodeForAddressReferenceRepositoryInterface
-{
-    public function findPostalCode(string $search, int $firstResult = 0, int $maxResults = 50): iterable;
-}

src/Bundle/ChillMainBundle/Resources/public/types.ts

@@ -75,7 +75,6 @@ export interface Postcode {
     name: string;
     code: string;
     center: Point;
-    country: Country;
 }
 
 export interface Point {
@@ -91,28 +90,6 @@ export interface Country {
 
 export type AddressRefStatus = "match" | "to_review" | "reviewed";
 
-/**
- * An interface to create an address
- */
-export interface AddressCreation {
-    confidential: boolean;
-    isNoAddress: boolean;
-    street: string;
-    streetNumber: string;
-    postcode: Postcode;
-    point: Point; // [number, number]; // [longitude, latitude]
-    addressReference: AddressReference;
-    validFrom: DateTime|null;
-    floor: string;
-    corridor: string;
-    steps: string;
-    flat: string;
-    buildingName: string;
-    distribution: string;
-    extra: string;
-}
-
-
 export interface Address {
     type: "address";
     address_id: number;
@@ -131,7 +108,7 @@ export interface Address {
     confidential: boolean;
     lines: string[];
     addressReference: AddressReference | null;
-    validFrom: DateTime  | null; // TODO there is no null for validFrom
+    validFrom: DateTime;
     validTo: DateTime | null;
     point: Point | null;
     refStatus: AddressRefStatus;

src/Bundle/ChillMainBundle/Resources/public/vuejs/AddressPicker/AddressButton.vue

@@ -1,33 +0,0 @@
-<script setup lang="ts">
-
-import Modal from "ChillMainAssets/vuejs/_components/Modal.vue";
-import AddressPicker from "ChillMainAssets/vuejs/AddressPicker/AddressPicker.vue";
-import {Ref, ref} from "vue";
-
-const showModal: Ref<boolean> = ref(false);
-
-const modalDialogClasses = {"modal-dialog": true, "modal-dialog-scrollable": true, "modal-xl": true};
-
-const clickButton = () => {
-    showModal.value = true;
-}
-
-const closeModal = () => {
-    showModal.value = false;
-}
-
-</script>
-
-<template>
-    <modal v-if="showModal" :hide-footer="false" :modal-dialog-class="modalDialogClasses" @close="closeModal">
-        <template v-slot:header>TODO</template>
-        <template v-slot:body>
-            <AddressPicker></AddressPicker>
-        </template>
-    </modal>
-    <button class="btn btn-submit" type="button" @click="clickButton">SEARCH ADDRESS</button>
-</template>
-
-<style scoped lang="scss">
-
-</style>

src/Bundle/ChillMainBundle/Resources/public/vuejs/AddressPicker/AddressPicker.vue

@@ -1,170 +0,0 @@
-<script setup lang="ts">
-import {Address, AddressReference} from "ChillMainAssets/types";
-import SearchBar from "ChillMainAssets/vuejs/AddressPicker/Component/SearchBar.vue";
-import {
-    AddressAggregated,
-    AssociatedPostalCode, fetchAddressReference,
-    getAddressesAggregated,
-    getPostalCodes,
-} from "ChillMainAssets/vuejs/AddressPicker/driver/local-search";
-import {computed, Ref, ref} from "vue";
-import AddressAggregatedList from "ChillMainAssets/vuejs/AddressPicker/Component/AddressAggregatedList.vue";
-import AddressDetailsForm from "ChillMainAssets/vuejs/AddressPicker/Component/AddressDetailsForm.vue";
-import AddressForm from "ChillMainAssets/vuejs/AddressPicker/Component/AddressForm.vue";
-import {trans, SAVE} from "translator";
-
-interface AddressPickerProps {
-    suggestions?: Address[];
-}
-
-const props = withDefaults(defineProps<AddressPickerProps>(), {
-    suggestions: () => [],
-});
-
-const addresses: Ref<AddressAggregated[]> = ref([]);
-const postalCodes: Ref<AssociatedPostalCode[]> = ref([]);
-const searchTokens: Ref<string[]> = ref([]);
-const addressReference: Ref<AddressReference|null> = ref(null);
-
-let abortControllerSearchAddress: null | AbortController = null;
-let abortControllerSearchPostalCode: null | AbortController = null;
-
-const searchResultsClasses = computed(() => ({
-    "mid-size": addressReference !== null,
-}));
-
-const floor = ref<string>("");
-const corridor = ref<string>("");
-const steps = ref<string>("");
-const flat = ref<string>("");
-const buildingName = ref<string>("");
-const extra = ref<string>("");
-const distribution = ref<string>("");
-
-
-const onSearch = async function (search: string): Promise<void> {
-    performSearchForAddress(search);
-    performSearchForPostalCode(search);
-    searchTokens.value = [search];
-};
-
-const onPickPosition = async (id: string) => {
-    console.log('Pick Position', id);
-    addressReference.value = await fetchAddressReference(id);
-}
-
-const performSearchForAddress = async (search: string): Promise<void> => {
-    if (null !== abortControllerSearchAddress) {
-        abortControllerSearchAddress.abort();
-    }
-
-    if ("" === search) {
-        addresses.value = [];
-        abortControllerSearchAddress = null;
-        return;
-    }
-
-    abortControllerSearchAddress = new AbortController();
-
-    console.log("onSearch", search);
-    try {
-        addresses.value = await getAddressesAggregated(
-            search,
-            abortControllerSearchAddress,
-        );
-        abortControllerSearchAddress = null;
-
-        // check if there is only one result
-        if (addresses.value.length === 1 && Object.keys(addresses.value[0].positions).length === 1) {
-            onPickPosition(Object.keys(addresses.value[0].positions)[0]);
-        }
-    } catch (e: unknown) {
-        if (e instanceof DOMException && e.name === "AbortError") {
-            console.log("search aborted for:", search);
-
-            return;
-        }
-
-        throw e;
-    }
-};
-
-const performSearchForPostalCode = async (search: string): Promise<void> => {
-    if (null !== abortControllerSearchPostalCode) {
-        abortControllerSearchPostalCode.abort();
-    }
-
-    if ("" === search) {
-        addresses.value = [];
-        abortControllerSearchPostalCode = null;
-        return;
-    }
-
-    abortControllerSearchPostalCode = new AbortController();
-
-    console.log("onSearch", search);
-    try {
-        postalCodes.value = await getPostalCodes(
-            search,
-            abortControllerSearchPostalCode,
-        );
-        abortControllerSearchPostalCode = null;
-    } catch (e: unknown) {
-        if (e instanceof DOMException && e.name === "AbortError") {
-            console.log("search postal code aborted for:", search);
-
-            return;
-        }
-
-        throw e;
-    }
-};
-
-const save = async(): Promise<void> => {
-    console.log("save");
-    console.log("content", floor, corridor, steps, flat, buildingName, extra, distribution);
-}
-</script>
-
-<template>
-    <search-bar @search="onSearch"></search-bar>
-    <div class="address-pick-content">
-        <div class="search-results" :class="searchResultsClasses">
-            <address-aggregated-list :addresses="addresses" :search-tokens="searchTokens" @pick-position="(id) => onPickPosition(id)"></address-aggregated-list>
-        </div>
-        <div v-if="addressReference !== null" class="address-details-form">
-            <address-details-form :address="addressReference"
-                                  v-model:floor="floor"
-                                  v-model:corridor="corridor"
-                                  v-model:steps="steps"
-                                  v-model:flat="flat"
-                                  v-model:building-name="buildingName"
-                                  v-model:extra="extra"
-                                  v-model:distribution="distribution"
-            />
-        </div>
-        <div>
-            <ul class="record_actions">
-                <li><button class="btn btn-save">{{ trans(SAVE) }}</button></li>
-            </ul>
-        </div>
-    </div>
-
-</template>
-
-<style scoped lang="scss">
-.address-pick-content {
-    display: flex;
-    flex-direction: row;
-    gap: 1rem;
-
-    .search-results {
-        &.mid-size {
-            width: 50%;
-        }
-    }
-    .address-details-form {
-        width: 50%;
-    }
-}
-</style>

src/Bundle/ChillMainBundle/Resources/public/vuejs/AddressPicker/Component/AddressAggregatedList.vue

@@ -1,25 +0,0 @@
-<script setup lang="ts">
-import {AddressAggregated} from "ChillMainAssets/vuejs/AddressPicker/driver/local-search";
-import AddressAggregatedListItem from "ChillMainAssets/vuejs/AddressPicker/Component/AddressAggregatedListItem.vue";
-
-interface AddressAggregatedListProps {
-    addresses: AddressAggregated[];
-    searchTokens: string[];
-}
-
-const props = defineProps<AddressAggregatedListProps>();
-
-const emit = defineEmits<{
-    pickPosition: [id: string]
-}>();
-</script>
-
-<template>
-    <template v-for="a in props.addresses" :key="a.row_number">
-        <address-aggregated-list-item :address="a" :search-tokens="props.searchTokens" @pick-position="(id) => emit('pickPosition', id)"></address-aggregated-list-item>
-    </template>
-</template>
-
-<style scoped lang="scss">
-
-</style>

src/Bundle/ChillMainBundle/Resources/public/vuejs/AddressPicker/Component/AddressAggregatedListItem.vue

@@ -1,82 +0,0 @@
-<script setup lang="ts">
-import {AddressAggregated} from "ChillMainAssets/vuejs/AddressPicker/driver/local-search";
-import {computed, ref} from "vue";
-
-interface AddressAggregatedListItemProps {
-    address: AddressAggregated;
-    searchTokens: string[];
-}
-
-const props = defineProps<AddressAggregatedListItemProps>();
-
-const emit = defineEmits<{
-    pickPosition: [id: string]
-}>();
-
-const showAllPositions = ref<boolean>(false);
-const positionsToShow = computed((): Record<string, string> => {
-    const obj: Record<string, any> = {};
-    let count = 0;
-    for (const [id, position] of Object.entries(props.address.positions)) {
-       obj[id] = position;
-       count++;
-       if (count >= 10 && !showAllPositions.value) {
-           break;
-       }
-    }
-
-    return obj;
-})
-const needToShowMorePosition = computed(() => {
-    return Object.keys(props.address.positions).length > 10;
-})
-
-const onClickButton = (id: string) => {
-    console.log('onClickButton', id);
-    emit('pickPosition', id);
-}
-const displayAllPositions = () => {
-    showAllPositions.value = true;
-}
-</script>
-
-<template>
-    <div>
-        <div class="street">
-            <span>{{ props.address.street }}</span>
-        </div>
-        <div class="postcode">
-            <span>{{ props.address.code }}</span> <span>{{ address.label }}</span>
-        </div>
-        <div class="positions">
-            <ul>
-                <li v-for="(position, id) in positionsToShow" :key="id"  >
-                    <button type="button" @click="onClickButton(id)"  >
-                        {{ position }}
-                    </button>
-                </li>
-                <li v-if="needToShowMorePosition">
-                    <button @click="displayAllPositions">show all</button>
-                </li>
-            </ul>
-        </div>
-    </div>
-</template>
-
-<style scoped lang="scss">
-.street {
-    font-variant: small-caps;
-    font-weight: bold;
-}
-.postcode {
-    font-variant: small-caps;
-}
-.positions ul {
-    list-style-type: none;
-
-    li {
-        display: inline-block;
-        margin-right: 2px;
-    }
-}
-</style>

src/Bundle/ChillMainBundle/Resources/public/vuejs/AddressPicker/Component/AddressDetailsForm.vue

@@ -1,44 +0,0 @@
-<script setup lang="ts">
-import {AddressReference} from "ChillMainAssets/types";
-import {computed, ref} from "vue";
-import {addressReferenceToAddress} from "ChillMainAssets/vuejs/AddressPicker/helper";
-import AddressDetailsContent from "ChillMainAssets/vuejs/_components/AddressDetails/AddressDetailsContent.vue";
-import AddressForm from "ChillMainAssets/vuejs/AddressPicker/Component/AddressForm.vue";
-
-export interface AddressDetailsFormProps {
-    address: AddressReference;
-}
-
-const props = defineProps<AddressDetailsFormProps>();
-
-const floor = ref<string>("");
-const corridor = ref<string>("");
-const steps = ref<string>("");
-const flat = ref<string>("");
-const buildingName = ref<string>("");
-const extra = ref<string>("");
-const distribution = ref<string>("");
-
-const address = computed(() => addressReferenceToAddress(props.address));
-</script>
-
-<template>
-    <div>
-        <address-form
-            @update:floor="val => (floor = val)"
-            @update:corridor="val => (corridor = val)"
-            @update:steps="val => (steps = val)"
-            @update:flat="val => (flat = val)"
-            @update:building-name="val => (buildingName = val)"
-            @update:extra="val => (extra = val)"
-            @update:distribution="val => (distribution = val)"
-        ></address-form>
-    </div>
-    <div>
-        <address-details-content :address="address"></address-details-content>
-    </div>
-</template>
-
-<style scoped lang="scss">
-
-</style>

src/Bundle/ChillMainBundle/Resources/public/vuejs/AddressPicker/Component/AddressForm.vue

@@ -1,112 +0,0 @@
-<script setup lang="ts">
-import {
-    ADDRESS_STREET,
-    ADDRESS_STREET_NUMBER,
-    ADDRESS_FLOOR,
-    ADDRESS_CORRIDOR,
-    ADDRESS_STEPS,
-    ADDRESS_FLAT,
-    ADDRESS_BUILDING_NAME,
-    ADDRESS_DISTRIBUTION,
-    ADDRESS_EXTRA,
-    ADDRESS_FILL_AN_ADDRESS,
-    trans,
-} from "translator";
-import {ref} from "vue";
-
-const isNoAddress = ref(false);
-
-const floor = defineModel("floor");
-const corridor = defineModel("corridor");
-const steps = defineModel("steps");
-const flat = defineModel("flat");
-const buildingName = defineModel("buildingName");
-const extra = defineModel("extra");
-const distribution = defineModel("distribution");
-</script>
-
-<template>
-    <div class="form-floating my-1">
-        <input
-            class="form-control"
-            type="text"
-            name="floor"
-            :placeholder="trans(ADDRESS_FLOOR)"
-            v-model="floor"
-        />
-        <label for="floor">{{ trans(ADDRESS_FLOOR) }}</label>
-    </div>
-    <div class="form-floating my-1">
-        <input
-            class="form-control"
-            type="text"
-            name="corridor"
-            :placeholder="trans(ADDRESS_CORRIDOR)"
-            v-model="corridor"
-        />
-        <label for="corridor">{{ trans(ADDRESS_CORRIDOR) }}</label>
-    </div>
-    <div class="form-floating my-1">
-        <input
-            class="form-control"
-            type="text"
-            name="steps"
-            :placeholder="trans(ADDRESS_STEPS)"
-            v-model="steps"
-        />
-        <label for="steps">{{ trans(ADDRESS_STEPS) }}</label>
-    </div>
-    <div class="form-floating my-1">
-        <input
-            class="form-control"
-            type="text"
-            name="flat"
-            :placeholder="trans(ADDRESS_FLAT)"
-            v-model="flat"
-        />
-        <label for="flat">{{ trans(ADDRESS_FLAT) }}</label>
-    </div>
-    <div :class="isNoAddress ? 'col-lg-12' : 'col-lg-6'">
-        <div class="form-floating my-1" v-if="!isNoAddress">
-            <input
-                class="form-control"
-                type="text"
-                name="buildingName"
-                maxlength="255"
-                :placeholder="trans(ADDRESS_BUILDING_NAME)"
-                v-model="buildingName"
-            />
-            <label for="buildingName">{{
-                    trans(ADDRESS_BUILDING_NAME)
-                }}</label>
-        </div>
-        <div class="form-floating my-1">
-            <input
-                class="form-control"
-                type="text"
-                name="extra"
-                maxlength="255"
-                :placeholder="trans(ADDRESS_EXTRA)"
-                v-model="extra"
-            />
-            <label for="extra">{{ trans(ADDRESS_EXTRA) }}</label>
-        </div>
-        <div class="form-floating my-1" v-if="!isNoAddress">
-            <input
-                class="form-control"
-                type="text"
-                name="distribution"
-                maxlength="255"
-                :placeholder="trans(ADDRESS_DISTRIBUTION)"
-                v-model="distribution"
-            />
-            <label for="distribution">{{
-                    trans(ADDRESS_DISTRIBUTION)
-                }}</label>
-        </div>
-    </div>
-</template>
-
-<style scoped lang="scss">
-
-</style>

src/Bundle/ChillMainBundle/Resources/public/vuejs/AddressPicker/Component/SearchBar.vue

@@ -1,39 +0,0 @@
-<script setup lang="ts">
-import { ADDRESS_PICKER_SEARCH_FOR_ADDRESSES, trans } from 'translator';
-const emits = defineEmits<{
-    search: [search: string];
-}>();
-
-let searchTimer = 0;
-let searchString: string;
-
-const onInput = function (event: InputEvent) {
-    const target = event.target as HTMLInputElement;
-    const value = target.value;
-    searchString = value;
-
-    if (0 === searchTimer) {
-        window.clearTimeout(searchTimer);
-        searchTimer = 0;
-    }
-
-    searchTimer = window.setTimeout(() => {
-        if (value === searchString) {
-            emits("search", value);
-        }
-    }, 500);
-};
-</script>
-
-<template>
-    <div class="input-group mb-3">
-        <span class="input-group-text">
-            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-search" viewBox="0 0 16 16">
-              <path d="M11.742 10.344a6.5 6.5 0 1 0-1.397 1.398h-.001q.044.06.098.115l3.85 3.85a1 1 0 0 0 1.415-1.414l-3.85-3.85a1 1 0 0 0-.115-.1zM12 6.5a5.5 5.5 0 1 1-11 0 5.5 5.5 0 0 1 11 0"/>
-            </svg>
-        </span>
-        <input type="search" class="form-control" @input="onInput" :placeholder="trans(ADDRESS_PICKER_SEARCH_FOR_ADDRESSES)" />
-    </div>
-</template>
-
-<style scoped lang="scss"></style>

src/Bundle/ChillMainBundle/Resources/public/vuejs/AddressPicker/driver/local-search.ts

@@ -1,69 +0,0 @@
-import {AddressReference, TranslatableString} from "ChillMainAssets/types";
-
-export interface AddressAggregated {
-    row_number: number;
-    street: string;
-    postcode_id: number;
-    code: string;
-    label: string;
-    positions: Record<string, string>;
-}
-
-export interface AssociatedPostalCode {
-    postcode_id: number;
-    code: string;
-    label: string;
-    country_id: number;
-    country_code: string;
-    country_name: TranslatableString;
-}
-
-/**
- * @throws {DOMException} when fetch is aborted, the property name is always equals to 'AbortError'
- */
-export const getAddressesAggregated = async (
-    search: string,
-    abortController: AbortController,
-): Promise<AddressAggregated[]> => {
-    const params = new URLSearchParams({ q: search.trim() });
-    let response = null;
-
-    response = await fetch(
-        `/api/1.0/main/address-reference/aggregated/search?${params}`,
-        { signal: abortController.signal },
-    );
-
-    if (response.ok) {
-        return await response.json();
-    }
-
-    throw new Error(response.statusText);
-};
-
-export const getPostalCodes = async (
-    search: string,
-    abortController: AbortController,
-): Promise<AssociatedPostalCode[]> => {
-    const params = new URLSearchParams({ q: search.trim() });
-    let response = null;
-
-    response = await fetch(
-        `/api/1.0/main/address-reference/postal-code/search?${params}`,
-        { signal: abortController.signal },
-    );
-
-    if (response.ok) {
-        return await response.json();
-    }
-
-    throw new Error(response.statusText);
-};
-
-export const fetchAddressReference = async (id: string): Promise<AddressReference> => {
-    const response = await fetch(`/api/1.0/main/address-reference/${id}.json`);
-    if (response.ok) {
-        return await response.json();
-    }
-
-    throw new Error(response.statusText);
-}

src/Bundle/ChillMainBundle/Resources/public/vuejs/AddressPicker/helper.ts

@@ -1,21 +0,0 @@
-import {Address, AddressCreation, AddressReference} from "ChillMainAssets/types";
-
-export const addressReferenceToAddress = (reference: AddressReference): AddressCreation => {
-    return {
-        street: reference.street,
-        streetNumber: reference.streetNumber,
-        postcode: reference.postcode,
-        floor: "",
-        corridor: "",
-        steps: "",
-        flat: "",
-        buildingName: "",
-        distribution: "",
-        extra: "",
-        confidential: false,
-        addressReference: reference,
-        point: reference.point,
-        isNoAddress: false,
-        validFrom: null,
-    }
-}

src/Bundle/ChillMainBundle/Resources/public/vuejs/AddressPicker/index.ts

@@ -1,12 +0,0 @@
-import { createApp } from "vue";
-import AddressButton from "ChillMainAssets/vuejs/AddressPicker/AddressButton.vue";
-
-document.addEventListener("DOMContentLoaded", async () => {
-    document
-        .querySelectorAll<HTMLDivElement>("div[data-address-picker]")
-        .forEach((elem): void => {
-            const app = createApp(AddressButton);
-
-            app.mount(elem);
-        });
-});

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

@@ -4,27 +4,24 @@
         :show-button-details="false"
     ></address-render-box>
     <address-details-ref-matching
-        v-if="isAddress(props.address)"
         :address="props.address"
         @update-address="onUpdateAddress"
     ></address-details-ref-matching>
     <address-details-map :address="props.address"></address-details-map>
     <address-details-geographical-layers
-        v-if="isAddress(props.address)"
         :address="props.address"
     ></address-details-geographical-layers>
 </template>
 
 <script lang="ts" setup>
-import {Address, AddressCreation} from "../../../types";
+import { Address } from "../../../types";
 import AddressDetailsMap from "./Parts/AddressDetailsMap.vue";
 import AddressRenderBox from "../Entity/AddressRenderBox.vue";
 import AddressDetailsGeographicalLayers from "./Parts/AddressDetailsGeographicalLayers.vue";
 import AddressDetailsRefMatching from "./Parts/AddressDetailsRefMatching.vue";
-import {isAddress} from "ChillMainAssets/vuejs/_components/AddressDetails/helper";
 
 interface AddressModalContentProps {
-    address: Address|AddressCreation;
+    address: Address;
 }
 
 const props = defineProps<AddressModalContentProps>();

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/Parts/AddressDetailsMap.vue

@@ -12,91 +12,90 @@
         Voir sur
         <a :href="makeUrlGoogleMap(props.address)" target="_blank"
             >Google Maps</a
-        > <a
-          :href="makeUrlOsm(props.address)" target="_blank"
-        >OSM</a>
+        >
+        <a :href="makeUrlOsm(props.address)" target="_blank">OSM</a>
     </p>
 </template>
 
 <script lang="ts" setup>
-import {computed, onMounted, ref} from "vue";
+import { onMounted, ref } from "vue";
 import "leaflet/dist/leaflet.css";
 import markerIconPng from "leaflet/dist/images/marker-icon.png";
 import L, { LatLngExpression, LatLngTuple } from "leaflet";
-import {Address, AddressCreation, Point} from "../../../../types";
-import {buildAddressLines, getAddressPoint} from "ChillMainAssets/vuejs/_components/AddressDetails/helper";
-import {useLeafletDisplayLayer, useLeafletMap, useLeafletMarker, useLeafletTileLayer} from "vue-use-leaflet";
+import { Address, Point } from "../../../../types";
 
 const lonLatForLeaflet = (point: Point): LatLngTuple => {
     return [point.coordinates[1], point.coordinates[0]];
 };
 
 export interface MapProps {
-    address: Address|AddressCreation;
+    address: Address;
 }
 
 const props = defineProps<MapProps>();
 
-const markerIcon = L.icon({
-    iconUrl: markerIconPng,
-    iconAnchor: [12, 41],
-});
-const latLngMarker = computed((): LatLngExpression => {
-    if (props.address === null || props.address.point === null) {
-        return [0, 0, 0];
-    }
-
-    return [props.address.point.coordinates[1], props.address.point.coordinates[0], 0]
-});
-
 const map_div = ref<HTMLDivElement | null>(null);
-const map = useLeafletMap(map_div, {zoom: 18, center: latLngMarker});
-const tileLayer = useLeafletTileLayer(
-    "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {
-        attribution:
-            '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+let map: L.Map | null = null;
+let marker: L.Marker | null = null;
+
+onMounted(() => {
+    if (map_div.value === null) {
+        // there is no map div when the address does not have any Point
+        return;
     }
-);
-useLeafletDisplayLayer(map, tileLayer);
 
+    if (props.address.point !== null) {
+        map = L.map(map_div.value);
+        map.setView(lonLatForLeaflet(props.address.point), 18);
 
-const marker = useLeafletMarker(latLngMarker, {icon: markerIcon});
-useLeafletDisplayLayer(map, marker);
+        L.tileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {
+            attribution:
+                '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+        }).addTo(map);
 
+        const markerIcon = L.icon({
+            iconUrl: markerIconPng,
+            iconAnchor: [12, 41],
+        });
 
-const makeUrlGoogleMap = (address: Address|AddressCreation): string => {
+        marker = L.marker(lonLatForLeaflet(props.address.point), {
+            icon: markerIcon,
+        });
+        marker.addTo(map);
+    }
+});
+
+const makeUrlGoogleMap = (address: Address): string => {
     const params = new URLSearchParams();
     params.append("api", "1");
-    const point = getAddressPoint(address);
-    if (point !== null && address.addressReference !== null) {
+    if (address.point !== null && address.addressReference !== null) {
         params.append(
             "query",
-            `${point.coordinates[1]} ${point.coordinates[0]}`,
+            `${address.point.coordinates[1]} ${address.point.coordinates[0]}`,
         );
     } else {
-        params.append("query", buildAddressLines(address).join(", "));
+        params.append("query", address.lines.join(", "));
     }
 
     return `https://www.google.com/maps/search/?${params.toString()}`;
 };
 
-const makeUrlOsm = (address: Address|AddressCreation): string => {
-    const point = getAddressPoint(address);
-    if (point !== null && address.addressReference !== null) {
+const makeUrlOsm = (address: Address): string => {
+    if (address.point !== null && address.addressReference !== null) {
         const params = new URLSearchParams();
-        params.append("mlat", `${point.coordinates[1]}`);
-        params.append("mlon", `${point.coordinates[0]}`);
+        params.append("mlat", `${address.point.coordinates[1]}`);
+        params.append("mlon", `${address.point.coordinates[0]}`);
         const hashParams = new URLSearchParams();
         hashParams.append(
             "map",
-            `18/${point.coordinates[1]}/${point.coordinates[0]}`,
+            `18/${address.point.coordinates[1]}/${address.point.coordinates[0]}`,
         );
 
         return `https://www.openstreetmap.org/?${params.toString()}#${hashParams.toString()}`;
     }
 
     const params = new URLSearchParams();
-    params.append("query", buildAddressLines(address).join(", "));
+    params.append("query", address.lines.join(", "));
 
     return `https://www.openstreetmap.org/search?${params.toString()}`;
 };

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/helper.ts

@@ -1,46 +0,0 @@
-import {Address, AddressCreation, Point} from "ChillMainAssets/types";
-import addressFormatter, {Input} from "@fragaria/address-formatter";
-
-/**
- * Checks if the given object is of type Address by verifying the existence
- * of the `lines` property and confirming that it is an array of strings.
- *
- * @param {AddressCreation | Address} obj - The object to check.
- * @return {boolean} Returns true if the object is of type Address, otherwise false.
- */
-export function isAddress(obj: AddressCreation | Address): obj is Address {
-    return (obj as any).lines !== undefined && Array.isArray((obj as any).lines);
-}
-
-function buildAddressFormatterObject(address: AddressCreation): Input {
-    return {
-        city: address.postcode.name,
-        postcode: address.postcode.code,
-        countryCode: address.postcode.country.code,
-        street: address.street,
-        houseNumber: address.streetNumber,
-    };
-}
-
-
-export const buildAddressLines = (address: AddressCreation|Address): string[] => {
-    if (isAddress(address)) {
-        return address.lines;
-    }
-
-    const lines = addressFormatter.format(buildAddressFormatterObject(address), {output: 'array', countryCode: address.addressReference.postcode.country.code });
-    console.log('lines:', lines);
-    return lines;
-}
-
-export const buildAddressText = (address: AddressCreation|Address): string => {
-    return buildAddressLines(address).join(' - ');
-}
-
-export const getAddressPoint = (address: AddressCreation|Address): Point|null => {
-    if (isAddress(address)) {
-        return address.point;
-    }
-
-    return address.addressReference?.point;
-}

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

@@ -4,14 +4,14 @@
             <div v-if="isConfidential">
                 <confidential :position-btn-far="true">
                     <template #confidential-content>
-                        <div v-if="isMultiline">
+                        <div v-if="isMultiline === true">
                             <p
-                                v-for="(l, i) in buildAddressLines(address)"
+                                v-for="(l, i) in address.lines"
                                 :key="`line-${i}`"
                             >
                                 {{ l }}
                             </p>
-                            <p v-if="showButtonDetails && isAddress(address) ">
+                            <p v-if="showButtonDetails">
                                 <address-details-button
                                     :address_id="address.address_id"
                                     :address_ref_status="address.refStatus"
@@ -19,8 +19,8 @@
                             </p>
                         </div>
                         <div v-else>
-                            <p v-if="'' !== buildAddressText(address)" class="street">
-                                {{ buildAddressText(address) }}
+                            <p v-if="'' !== address.text" class="street">
+                                {{ address.text }}
                             </p>
                             <p
                                 v-if="null !== address.postcode"
@@ -29,8 +29,8 @@
                                 {{ address.postcode.code }}
                                 {{ address.postcode.name }}
                             </p>
-                            <p v-if="null !== address.postcode" class="country">
-                                {{ localizeString(address.postcode.country.name) }}
+                            <p v-if="null !== address.country" class="country">
+                                {{ localizeString(address.country.name) }}
                             </p>
                         </div>
                     </template>
@@ -38,11 +38,11 @@
             </div>
 
             <div v-if="!isConfidential">
-                <div v-if="isMultiline">
-                    <p v-for="(l, i) in buildAddressLines(address)" :key="`line-${i}`">
+                <div v-if="isMultiline === true">
+                    <p v-for="(l, i) in address.lines" :key="`line-${i}`">
                         {{ l }}
                     </p>
-                    <p v-if="showButtonDetails && isAddress(address) ">
+                    <p v-if="showButtonDetails">
                         <address-details-button
                             :address_id="address.address_id"
                             :address_ref_status="address.refStatus"
@@ -50,9 +50,9 @@
                     </p>
                 </div>
                 <div v-else>
-                    <p v-if="'' !== buildAddressText(address)" class="street">
-                        {{ buildAddressText(address)}}
-                        <template v-if="showButtonDetails && isAddress(address) ">
+                    <p v-if="address.text" class="street">
+                        {{ address.text }}
+                        <template v-if="showButtonDetails">
                             <address-details-button
                                 :address_id="address.address_id"
                                 :address_ref_status="address.refStatus"
@@ -63,49 +63,68 @@
             </div>
         </component>
 
-        <div v-if="useDatePane" class="address-more">
+        <div v-if="useDatePane === true" class="address-more">
             <div v-if="address.validFrom">
                 <span class="validFrom">
                     <b>{{ trans(ADDRESS_VALID_FROM) }}</b
-                    >: {{ address.validFrom?.datetime8601 }}
+                    >: {{ $d(address.validFrom.date) }}
                 </span>
             </div>
-            <div v-if="isAddress(address) && address.validTo !== null">
+            <div v-if="address.validTo">
                 <span class="validTo">
                     <b>{{ trans(ADDRESS_VALID_TO) }}</b
-                    >: {{ address.validTo?.datetime8601 }}
+                    >: {{ $d(address.validTo.date) }}
                 </span>
             </div>
         </div>
     </component>
 </template>
 
-<script setup lang="ts">
-import { computed } from "vue";
+<script>
 import Confidential from "ChillMainAssets/vuejs/_components/Confidential.vue";
 import AddressDetailsButton from "ChillMainAssets/vuejs/_components/AddressDetails/AddressDetailsButton.vue";
 import { trans, ADDRESS_VALID_FROM, ADDRESS_VALID_TO } from "translator";
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
-import {Address, AddressCreation} from "ChillMainAssets/types";
-import {isAddress, buildAddressLines, buildAddressText} from "ChillMainAssets/vuejs/_components/AddressDetails/helper";
 
-const props = withDefaults(
-    defineProps<{
-        address: Address|AddressCreation;
-        isMultiline?: boolean;
-        useDatePane?: boolean;
-        showButtonDetails?: boolean;
-    }>(),
-    {
-        isMultiline: true,
-        useDatePane: false,
-        showButtonDetails: true,
-    }
-);
-
-const component = computed(() => (props.isMultiline ? "div" : "span"));
-const multiline = computed(() => (props.isMultiline ? "multiline" : ""));
-const isConfidential = computed(() => Boolean(props.address?.confidential));
+export default {
+    name: "AddressRenderBox",
+    methods: { localizeString },
+    components: {
+        Confidential,
+        AddressDetailsButton,
+    },
+    props: {
+        address: {
+            type: Object,
+        },
+        isMultiline: {
+            default: true,
+            type: Boolean,
+        },
+        useDatePane: {
+            default: false,
+            type: Boolean,
+        },
+        showButtonDetails: {
+            default: true,
+            type: Boolean,
+        },
+    },
+    setup() {
+        return { trans, ADDRESS_VALID_FROM, ADDRESS_VALID_TO };
+    },
+    computed: {
+        component() {
+            return this.isMultiline === true ? "div" : "span";
+        },
+        multiline() {
+            return this.isMultiline === true ? "multiline" : "";
+        },
+        isConfidential() {
+            return this.address.confidential;
+        },
+    },
+};
 </script>
 
 <style lang="scss" scoped>

src/Bundle/ChillMainBundle/Resources/views/Dev/dev.address-picker.html.twig

@@ -1,15 +0,0 @@
-{% extends '@ChillMain/layout.html.twig' %}
-
-{% block css %}
-    {{ encore_entry_link_tags('address_picker') }}
-{% endblock %}
-
-{% block js %}
-    {{ encore_entry_script_tags('address_picker') }}
-{% endblock %}
-
-{% block content %}
-
-    <div data-address-picker="data-address-picker"></div>
-
-{% endblock %}

src/Bundle/ChillMainBundle/Resources/views/Notification/edit.html.twig

@@ -21,8 +21,6 @@
     {{ form_row(form.title, { 'label': 'notification.subject'|trans }) }}
     {{ form_row(form.addressees, { 'label': 'notification.sent_to'|trans }) }}
 
-    {{ form_row(form.addressesEmails) }}
-
     {% include handler.template(notification) with handler.templateData(notification) %}
 
     <div class="mb-3 row">

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

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

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

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

src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php

@@ -66,7 +66,6 @@ class AddressNormalizer implements ContextAwareNormalizerInterface, NormalizerAw
                     'name' => $address->getPostCode()->getName(),
                     'code' => $address->getPostCode()->getCode(),
                     'center' => $address->getPostcode()->getCenter(),
-                    'country' => $this->normalizer->normalize($address->getPostCode()->getCountry(), $format, [AbstractNormalizer::GROUPS => ['read']]),
                 ],
                 'country' => [
                     'id' => $address->getPostCode()->getCountry()->getId(),

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

@@ -1,118 +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\Tests\Controller;
-
-use Chill\MainBundle\Controller\AddressReferenceAggregatedApiController;
-use Chill\MainBundle\Repository\AddressReferenceRepositoryInterface;
-use PHPUnit\Framework\TestCase;
-use Prophecy\PhpUnit\ProphecyTrait;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
-use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
-use Symfony\Component\Security\Core\Security;
-
-/**
- * @internal
- *
- * @covers \Chill\MainBundle\Controller\AddressReferenceAggregatedApiController
- */
-final class AddressReferenceAggregatedApiControllerTest extends TestCase
-{
-    use ProphecyTrait;
-
-    public function testAccessDeniedWhenNotAuthenticated(): void
-    {
-        $security = $this->prophesize(Security::class);
-        $security->isGranted('IS_AUTHENTICATED')->willReturn(false);
-
-        $repo = $this->prophesize(AddressReferenceRepositoryInterface::class);
-
-        $controller = new AddressReferenceAggregatedApiController($security->reveal(), $repo->reveal());
-
-        $request = new Request(query: ['q' => 'anything']);
-
-        $this->expectException(AccessDeniedHttpException::class);
-
-        $controller->search($request);
-    }
-
-    public function testBadRequestWhenQueryIsMissing(): void
-    {
-        $security = $this->prophesize(Security::class);
-        $security->isGranted('IS_AUTHENTICATED')->willReturn(true);
-
-        $repo = $this->prophesize(AddressReferenceRepositoryInterface::class);
-
-        $controller = new AddressReferenceAggregatedApiController($security->reveal(), $repo->reveal());
-
-        $request = new Request();
-
-        $this->expectException(BadRequestHttpException::class);
-        $this->expectExceptionMessage('Parameter "q" is required.');
-
-        $controller->search($request);
-    }
-
-    public function testBadRequestWhenQueryIsEmpty(): void
-    {
-        $security = $this->prophesize(Security::class);
-        $security->isGranted('IS_AUTHENTICATED')->willReturn(true);
-
-        $repo = $this->prophesize(AddressReferenceRepositoryInterface::class);
-
-        $controller = new AddressReferenceAggregatedApiController($security->reveal(), $repo->reveal());
-
-        $request = new Request(query: ['q' => '   ']);
-
-        $this->expectException(BadRequestHttpException::class);
-        $this->expectExceptionMessage('Parameter "q" is required and cannot be empty.');
-
-        $controller->search($request);
-    }
-
-    public function testSuccessfulSearchReturnsJsonAndCallsRepositoryWithTrimmedQuery(): void
-    {
-        $security = $this->prophesize(Security::class);
-        $security->isGranted('IS_AUTHENTICATED')->willReturn(true);
-
-        $expectedQuery = 'foo';
-        $iterableResult = new \ArrayIterator([
-            [
-                'street' => 'Main Street',
-                'postcode_id' => 123,
-                'code' => '1000',
-                'label' => 'Brussels',
-                'positions' => ['1' => '12', '2' => '14'],
-                'row_number' => 1,
-            ],
-        ]);
-
-        $repo = $this->prophesize(AddressReferenceRepositoryInterface::class);
-        $repo->findAggregatedBySearchString($expectedQuery)->willReturn($iterableResult)->shouldBeCalledOnce();
-
-        $controller = new AddressReferenceAggregatedApiController($security->reveal(), $repo->reveal());
-
-        // Provide spaces around to ensure trimming is applied
-        $request = new Request(query: ['q' => "  {$expectedQuery}  "]);
-
-        $response = $controller->search($request);
-
-        self::assertSame(200, $response->getStatusCode());
-        $data = json_decode($response->getContent(), true, 512, JSON_THROW_ON_ERROR);
-        self::assertIsArray($data);
-        self::assertCount(1, $data);
-        self::assertSame('Main Street', $data[0]['street']);
-        self::assertSame(123, $data[0]['postcode_id']);
-        self::assertSame('1000', $data[0]['code']);
-        self::assertSame('Brussels', $data[0]['label']);
-    }
-}

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

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

src/Bundle/ChillMainBundle/Tests/Repository/AddressReferenceRepositoryTest.php

@@ -1,88 +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\Tests\Repository;
-
-use Chill\MainBundle\Entity\AddressReference;
-use Chill\MainBundle\Entity\PostalCode;
-use Chill\MainBundle\Repository\AddressReferenceRepository;
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-class AddressReferenceRepositoryTest extends KernelTestCase
-{
-    private static AddressReferenceRepository $repository;
-
-    public static function setUpBeforeClass(): void
-    {
-        static::bootKernel();
-        static::$repository = static::getContainer()->get(AddressReferenceRepository::class);
-    }
-
-    /**
-     * @dataProvider generateSearchString
-     */
-    public function testFindBySearchString(string $search, int|PostalCode|null $postalCode, string $text, ?array $expected = null): void
-    {
-        $actual = static::$repository->findBySearchString($search, $postalCode);
-
-        self::assertIsIterable($actual, $text);
-
-        if (null !== $expected) {
-            self::assertEquals($expected, iterator_to_array($actual));
-        }
-    }
-
-    /**
-     * @dataProvider generateSearchString
-     */
-    public function testCountBySearchString(string $search, int|PostalCode|null $postalCode, string $text, ?array $expected = null): void
-    {
-        $actual = static::$repository->countBySearchString($search, $postalCode);
-
-        self::assertIsInt($actual, $text);
-    }
-
-    /**
-     * @dataProvider generateSearchString
-     */
-    public function testFindAggreggateBySearchString(string $search, int|PostalCode|null $postalCode, string $text, ?array $expected = null): void
-    {
-        $actual = static::$repository->findAggregatedBySearchString($search, $postalCode);
-
-        self::assertIsIterable($actual, $text);
-
-        if (null !== $expected) {
-            self::assertEquals($expected, iterator_to_array($actual));
-        }
-    }
-
-    public static function generateSearchString(): iterable
-    {
-        self::bootKernel();
-        $em = static::getContainer()->get(EntityManagerInterface::class);
-        /** @var AddressReference $ar */
-        $ar = $em->createQuery('SELECT ar FROM '.AddressReference::class.' ar')
-            ->setMaxResults(1)
-            ->getSingleResult();
-
-        yield ['', null, 'search with empty string', []];
-        yield ['   ', null, 'search with spaces only', []];
-        yield ['rue des    moulins', null, 'search contains an empty string'];
-        yield ['rue des moulins', $ar->getPostcode()->getId(), 'search with postal code as an id'];
-        yield ['rue des moulins', $ar->getPostcode(), 'search with postal code instance'];
-    }
-}

src/Bundle/ChillMainBundle/Tests/Repository/PostalCodeForAddressReferenceRepositoryTest.php

@@ -1,61 +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\Tests\Repository;
-
-use Chill\MainBundle\Repository\PostalCodeForAddressReferenceRepository;
-use Doctrine\DBAL\Connection;
-use PHPUnit\Framework\Attributes\DataProvider;
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-final class PostalCodeForAddressReferenceRepositoryTest extends KernelTestCase
-{
-    private Connection $connection;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-        $this->connection = self::getContainer()->get(Connection::class);
-    }
-
-    /**
-     * @return iterable<string[]>
-     */
-    public static function provideSearches(): iterable
-    {
-        yield [''];
-        yield ['   '];
-        yield ['hugo'];
-        yield ['   hugo'];
-        yield ['hugo   '];
-        yield ['rue victor hugo'];
-        yield ['rue   victor hugo'];
-    }
-
-    #[DataProvider('provideSearches')]
-    public function testFindPostalCodeDoesNotErrorAndIsIterable(string $search): void
-    {
-        $repository = new PostalCodeForAddressReferenceRepository($this->connection);
-
-        $result = $repository->findPostalCode($search);
-
-        self::assertIsIterable($result);
-
-        // Ensure it can be converted to an array (and iterate without error)
-        $rows = \is_array($result) ? $result : iterator_to_array($result, false);
-        self::assertIsArray($rows);
-    }
-}

src/Bundle/ChillMainBundle/chill.api.specs.yaml

@@ -595,44 +595,6 @@ paths:
                 401:
                     description: "Unauthorized"
 
-    /1.0/main/address-reference/aggregated/search:
-        get:
-            tags:
-                - address
-            summary: Search for address reference aggregated
-            parameters:
-                - name: q
-                  in: query
-                  required: true
-                  description: The search pattern
-                  schema:
-                      type: string
-            responses:
-                200:
-                    description: "ok"
-                401:
-                    description: "Unauthorized"
-                400:
-                    description: "Bad Request"
-    /1.0/main/address-reference/postal-code/search:
-        get:
-            tags:
-                - address
-            summary: Search for postal code that can contains the search query
-            parameters:
-                - name: q
-                  in: query
-                  required: true
-                  description: The search pattern
-                  schema:
-                      type: string
-            responses:
-                200:
-                    description: "ok"
-                401:
-                    description: "Unauthorized"
-                400:
-                    description: "Bad Request"
     /1.0/main/postal-code/search.json:
         get:
             tags:

src/Bundle/ChillMainBundle/chill.webpack.config.js

@@ -120,11 +120,6 @@ module.exports = function (encore, entries) {
     "vue_onthefly",
     __dirname + "/Resources/public/vuejs/OnTheFly/index.js",
   );
-  encore.addEntry(
-    'address_picker',
-    __dirname + "/Resources/public/vuejs/AddressPicker/index.ts",
-  )
-
   encore.addEntry(
     "page_workflow_waiting_post_process",
     __dirname + "/Resources/public/vuejs/WaitPostProcessWorkflow/index.ts"

src/Bundle/ChillMainBundle/migrations/Version20250214154310.php

@@ -1,52 +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 Version20250214154310 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Create view for searching address reference';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql(<<<'SQL'
-            create materialized view public.view_chill_main_address_reference as
-            SELECT row_number() OVER ()       AS row_number,
-                   cmar.street                AS street,
-                   cmar.streetnumber          AS streetnumber,
-                   cmar.id                    AS address_id,
-                   lower(unaccent(
-                           (((((cmar.street || ' '::text) || cmar.streetnumber) || ' '::text) || cmpc.code::text) || ' '::text) ||
-                           cmpc.label::text)) AS address,
-                   cmpc.id                    AS postcode_id
-            FROM chill_main_address_reference cmar
-                     JOIN chill_main_postal_code cmpc ON cmar.postcode_id = cmpc.id
-            WHERE cmar.deletedat IS NULL
-            ORDER BY ((cmpc.code::text || ' '::text) || cmpc.label::text), cmar.street, (lpad(cmar.streetnumber, 10, '0'::text));
-            SQL);
-
-        $this->addSql(<<<'SQL'
-            create index if not exists view_chill_internal_address_reference_trgm
-                on view_chill_main_address_reference using gist (postcode_id, address public.gist_trgm_ops);
-        SQL);
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('DROP MATERIALIZED VIEW view_chill_main_address_reference');
-    }
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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