Merge branch chill-bundles:master into ticket-app-master

.changes/unreleased/Fixed-20240416-161817.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix broken link in homepage when a evaluation from a closed acc period was present
+  in the homepage widget
+time: 2024-04-16T16:18:17.888645172+02:00
+custom:
+  Issue: "270"

.changes/v2.18.2.md

@@ -0,0 +1,3 @@
+## 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 

CHANGELOG.md

@@ -6,6 +6,10 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## 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 
+
 ## v2.18.1 - 2024-03-26
 ### Fixed
 * Fix layout issue in document generation for admin (minor) 

docs/source/installation/load-addresses.rst

@@ -8,6 +8,16 @@ Chill can store a list of geolocated address references, which are used to sugge
 
 Those addresses may be load from a dedicated source.
 
+Countries
+=========
+
+In order to load addresses into the chill application we first have to make sure that a list of countries is present.
+To import the countries run the following command.
+
+.. code-block:: bash
+
+    bin/console chill:main:countries:populate
+
 In France
 =========
 

src/Bundle/ChillMainBundle/Service/Import/PostalCodeFRFromOpenData.php

@@ -23,7 +23,7 @@ use Symfony\Contracts\HttpClient\HttpClientInterface;
  */
 class PostalCodeFRFromOpenData
 {
-    private const CSV = 'https://datanova.laposte.fr/data-fair/api/v1/datasets/laposte-hexasmal/data-files/019HexaSmal.csv';
+    private const CSV = 'https://datanova.laposte.fr/data-fair/api/v1/datasets/laposte-hexasmal/metadata-attachments/base-officielle-codes-postaux.csv';
 
     public function __construct(private readonly PostalCodeBaseImporter $baseImporter, private readonly HttpClientInterface $client, private readonly LoggerInterface $logger) {}
 
@@ -48,7 +48,7 @@ class PostalCodeFRFromOpenData
         fseek($tmpfile, 0);
 
         $csv = Reader::createFromStream($tmpfile);
-        $csv->setDelimiter(';');
+        $csv->setDelimiter(',');
         $csv->setHeaderOffset(0);
 
         foreach ($csv as $offset => $record) {
@@ -63,23 +63,23 @@ class PostalCodeFRFromOpenData
 
     private function handleRecord(array $record): void
     {
-        if ('' !== trim($record['coordonnees_geographiques'] ?? $record['coordonnees_gps'])) {
+        if ('' !== trim((string) $record['_geopoint'])) {
-            [$lat, $lon] = array_map(static fn ($el) => (float) trim($el), explode(',', $record['coordonnees_geographiques'] ?? $record['coordonnees_gps']));
+            [$lat, $lon] = array_map(static fn ($el) => (float) trim($el), explode(',', (string) $record['_geopoint']));
         } else {
             $lat = $lon = 0.0;
         }
 
-        $ref = trim((string) $record['Code_commune_INSEE']);
+        $ref = trim((string) $record['code_commune_insee']);
 
         if (str_starts_with($ref, '987')) {
             // some differences in French Polynesia
-            $ref .= '.'.trim((string) $record['Libellé_d_acheminement']);
+            $ref .= '.'.trim((string) $record['libelle_d_acheminement']);
         }
 
         $this->baseImporter->importCode(
             'FR',
-            trim((string) $record['Libellé_d_acheminement']),
+            trim((string) $record['libelle_d_acheminement']),
-            trim((string) $record['Code_postal']),
+            trim((string) $record['code_postal']),
             $ref,
             'INSEE',
             $lat,

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

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Repository\AccompanyingPeriod;
 
 use Chill\MainBundle\Entity\User;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
 use Doctrine\ORM\EntityManagerInterface;
@@ -88,6 +89,7 @@ class AccompanyingPeriodWorkEvaluationRepository implements ObjectRepository
             ->where(
                 $qb->expr()->andX(
                     $qb->expr()->isNull('e.endDate'),
+                    $qb->expr()->neq('period.step', ':closed'),
                     $qb->expr()->gte(':now', $qb->expr()->diff('e.maxDate', 'e.warningInterval')),
                     $qb->expr()->orX(
                         $qb->expr()->eq('period.user', ':user'),
@@ -100,6 +102,7 @@ class AccompanyingPeriodWorkEvaluationRepository implements ObjectRepository
             ->setParameters([
                 'user' => $user,
                 'now' => new \DateTimeImmutable('now'),
+                'closed' => AccompanyingPeriod::STEP_CLOSED,
             ]);
 
         return $qb;