From 2628e58ea0476e90e3850143398fe413c15bd6a6 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 10 Mar 2022 12:28:17 +0100
Subject: [PATCH 01/21] document title added + concerned users

---
 .../Workflow/_evaluation_document.html.twig   | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
index 488f31661..addc619f7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
@@ -1,5 +1,10 @@
 <div class="flex-table accompanying_course_work-list">
     <div class="item-bloc evaluation-item bg-chill-llight-gray">
+        <div class="item-row mb-2">
+            {% for d in evaluation.documents %}
+                <h1>{{ d.title }}</h1>
+            {% endfor %}
+        </div>
         <div class="item-row mb-2">
             <h2 class="badge-title">
                 <span class="title_label"></span>
@@ -20,6 +25,24 @@
                 </span>
             </h2>
         </div>
+        <div class="item-row mb-2">
+            <div class="item-col" style="width: 17%;">
+                <h4 class="title_label">
+                    {{ 'Participants'|trans }}
+                </h4>
+            </div>
+            <div class="item-col list">
+                {% for p in evaluation.accompanyingPeriodWork.persons %}
+                    {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                        targetEntity: { name: 'person', id: p.id },
+                        action: 'show',
+                        displayBadge: true,
+                        buttonText: p|chill_entity_render_string,
+                        isDead: p.deathdate is not null
+                    } %}
+                {% endfor %}
+            </div>
+        </div>
         <div class="item-row column">
             <table class="obj-res-eval my-3" style="font-size: 110% !important;">
                 <thead>

From bf2d9acc5a67991c9a0df240de68f32b900c470b Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 10 Mar 2022 14:03:37 +0100
Subject: [PATCH 02/21] correction of template, display title linked to
 workflow doc

---
 .../Resources/views/Workflow/_evaluation_document.html.twig   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
index addc619f7..bd37226cc 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
@@ -1,9 +1,7 @@
 <div class="flex-table accompanying_course_work-list">
     <div class="item-bloc evaluation-item bg-chill-llight-gray">
         <div class="item-row mb-2">
-            {% for d in evaluation.documents %}
-                <h1>{{ d.title }}</h1>
-            {% endfor %}
+                <h1>{{ doc.title }}</h1>
         </div>
         <div class="item-row mb-2">
             <h2 class="badge-title">

From 9284a4bc29e22a8a81c340026e364e910f37b1e5 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 10 Mar 2022 14:30:19 +0100
Subject: [PATCH 03/21] ACL added and buttons to download and edit document

---
 .../views/Workflow/_evaluation_document.html.twig   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
index bd37226cc..398b5221e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
@@ -1,7 +1,9 @@
+{%- import "@ChillDocStore/Macro/macro.html.twig" as m -%}
+
 <div class="flex-table accompanying_course_work-list">
     <div class="item-bloc evaluation-item bg-chill-llight-gray">
         <div class="item-row mb-2">
-                <h1>{{ doc.title }}</h1>
+            <h1>{{ doc.title }}</h1>git st
         </div>
         <div class="item-row mb-2">
             <h2 class="badge-title">
@@ -113,12 +115,19 @@
 </div>
 
 {% if display_action is defined and display_action == true %}
-    {# TODO add acl #}
+    {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', evaluation.accompanyingPeriodWork) %}
     <ul class="record_actions">
+        <li>{{ m.download_button(doc.storedObject, doc.title) }}</li>
+        {# {% if chill_document_is_editable(doc.storedObject) %} #}
+            <li>
+                {{ doc.storedObject|chill_document_edit_button }}
+            </li>
+        {# {% endif %} #}
         <li>
             <a class="btn btn-show" href="{{ path('chill_person_accompanying_period_work_edit', {'id': evaluation.accompanyingPeriodWork.id}) }}">
                 {{ 'Show'|trans }}
             </a>
         </li>
     </ul>
+    {% endif %}
 {% endif %}

From 0a2730540e7e01179bcaeb0f16dac2394c370581 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 10 Mar 2022 14:45:43 +0100
Subject: [PATCH 04/21] lost text removed plus condition to editing file
 uncommented

---
 .../Resources/views/Workflow/_evaluation_document.html.twig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
index 398b5221e..2e05a6648 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
@@ -3,7 +3,7 @@
 <div class="flex-table accompanying_course_work-list">
     <div class="item-bloc evaluation-item bg-chill-llight-gray">
         <div class="item-row mb-2">
-            <h1>{{ doc.title }}</h1>git st
+            <h1>{{ doc.title }}</h1>
         </div>
         <div class="item-row mb-2">
             <h2 class="badge-title">
@@ -118,11 +118,11 @@
     {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', evaluation.accompanyingPeriodWork) %}
     <ul class="record_actions">
         <li>{{ m.download_button(doc.storedObject, doc.title) }}</li>
-        {# {% if chill_document_is_editable(doc.storedObject) %} #}
+        {% if chill_document_is_editable(doc.storedObject) %}
             <li>
                 {{ doc.storedObject|chill_document_edit_button }}
             </li>
-        {# {% endif %} #}
+        {% endif %}
         <li>
             <a class="btn btn-show" href="{{ path('chill_person_accompanying_period_work_edit', {'id': evaluation.accompanyingPeriodWork.id}) }}">
                 {{ 'Show'|trans }}

From 99f8aeb6cd011c3c0a115e7a999ab39e93a4c249 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 11 Mar 2022 10:01:20 +0100
Subject: [PATCH 05/21] AccompanyingPeriodWorkEvaluation: fix circular
 reference when serialising

---
 .../AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
index 07c9f526c..de8b2a234 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
@@ -39,7 +39,6 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
      *     targetEntity=AccompanyingPeriodWork::class,
      *     inversedBy="accompanyingPeriodWorkEvaluations"
      * )
-     * @Serializer\Groups({"read:evaluation:include-work"})
      * @Serializer\Context(normalizationContext={"groups": {"read:accompanyingPeriodWork:light"}}, groups={"read:evaluation:include-work"})
      */
     private ?AccompanyingPeriodWork $accompanyingPeriodWork = null;

From ee8f331de497665f250ee6ac1cff3b2e86449038 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 11 Mar 2022 10:18:14 +0100
Subject: [PATCH 06/21] Revert "AccompanyingPeriodWorkEvaluation: fix circular
 reference when serialising"

This reverts commit 99f8aeb6cd011c3c0a115e7a999ab39e93a4c249.
---
 .../AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
index de8b2a234..07c9f526c 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
@@ -39,6 +39,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
      *     targetEntity=AccompanyingPeriodWork::class,
      *     inversedBy="accompanyingPeriodWorkEvaluations"
      * )
+     * @Serializer\Groups({"read:evaluation:include-work"})
      * @Serializer\Context(normalizationContext={"groups": {"read:accompanyingPeriodWork:light"}}, groups={"read:evaluation:include-work"})
      */
     private ?AccompanyingPeriodWork $accompanyingPeriodWork = null;

From 44e93dd5f8bb9c01cde749294285a81949f268a0 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 11 Mar 2022 10:20:42 +0100
Subject: [PATCH 07/21] AccompanyingPeriodWorkEvaluation: fix circular
 reference when serialising

---
 .../AccompanyingPeriodWorkEvaluationNormalizer.php          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php
index fc9b6003a..e8febcf5d 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php
@@ -14,6 +14,7 @@ namespace Chill\PersonBundle\Serializer\Normalizer;
 use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
 use Chill\MainBundle\Workflow\Helper\MetadataExtractor;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
@@ -46,7 +47,10 @@ class AccompanyingPeriodWorkEvaluationNormalizer implements ContextAwareNormaliz
     {
         $initial = $this->normalizer->normalize($object, $format, array_merge(
             $context,
-            [self::IGNORE_EVALUATION => spl_object_hash($object)]
+            [self::IGNORE_EVALUATION => spl_object_hash($object)],
+            [AbstractNormalizer::CIRCULAR_REFERENCE_HANDLER => static function ($object, $format, $context) {
+                return $object->getId();
+            }]
         ));
 
         // due to bug: https://api-platform.com/docs/core/serialization/#collection-relation

From f9e8bf4f2d9ff5a5a738a3941a6a0da462f85432 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 11 Mar 2022 10:22:09 +0100
Subject: [PATCH 08/21] upd CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 885068bc0..38f300662 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [person] AccompanyingPeriodWorkEvaluation: fix circular reference when serialising (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/495)
+
 * [main] filter user job in undispatch acc period to assign (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/472)
 * [person] Add url in accompanying period work evaluations entity and form (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/476)
 * [person] Add document generation in admin and in person/{id}/document (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/464)

From 90bebbad7de90779ae13e629dd6ba3e6c8339159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 14 Mar 2022 21:27:21 +0100
Subject: [PATCH 09/21] fix normalization for docgen

---
 src/Bundle/ChillMainBundle/Entity/UserJob.php |  1 +
 .../Normalizer/PhonenumberNormalizer.php      | 21 ++++++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Entity/UserJob.php b/src/Bundle/ChillMainBundle/Entity/UserJob.php
index 5f0bea45d..99db5d4f1 100644
--- a/src/Bundle/ChillMainBundle/Entity/UserJob.php
+++ b/src/Bundle/ChillMainBundle/Entity/UserJob.php
@@ -40,6 +40,7 @@ class UserJob
      * @var array|string[]A
      * @ORM\Column(name="label", type="json")
      * @Serializer\Groups({"read", "docgen:read"})
+     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     protected array $label = [];
 
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
index 3562c1361..677199ad4 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
@@ -16,10 +16,11 @@ use libphonenumber\PhoneNumber;
 use libphonenumber\PhoneNumberUtil;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
-class PhonenumberNormalizer implements NormalizerInterface, DenormalizerInterface
+class PhonenumberNormalizer implements ContextAwareNormalizerInterface, DenormalizerInterface
 {
     private string $defaultCarrierCode;
 
@@ -53,6 +54,10 @@ class PhonenumberNormalizer implements NormalizerInterface, DenormalizerInterfac
 
     public function normalize($object, ?string $format = null, array $context = []): string
     {
+        if ($format === 'docgen' && null === $object) {
+            return '';
+        }
+
         return $this->phoneNumberUtil->formatOutOfCountryCallingNumber($object, $this->defaultCarrierCode);
     }
 
@@ -61,8 +66,18 @@ class PhonenumberNormalizer implements NormalizerInterface, DenormalizerInterfac
         return 'libphonenumber\PhoneNumber' === $type;
     }
 
-    public function supportsNormalization($data, ?string $format = null)
+    public function supportsNormalization($data, ?string $format = null, array $context = []): bool
     {
-        return $data instanceof PhoneNumber;
+        if ($data instanceof PhoneNumber && $format === 'json') {
+            return true;
+        }
+
+        if ($format === 'docgen' && (
+            $data instanceof PhoneNumber || PhoneNumber::class === ($context['docgen:expects'] ?? null)
+            )) {
+            return true;
+        }
+
+        return false;
     }
 }

From f51279e83e1486bcbb0ba167063d59075428d63f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 14 Mar 2022 21:46:01 +0100
Subject: [PATCH 10/21] fix saving maxDate when denormalizing object

---
 .../AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
index 07c9f526c..ed3200370 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
@@ -124,6 +124,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
      * @Serializer\Groups({"read", "docgen:read"})
+     * @Serializer\Groups({"write"})
      * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      */
     private ?DateTimeImmutable $maxDate = null;

From d04f5a527bc56ddeeedebddec2e95eb8f6b12b1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 14 Mar 2022 21:46:21 +0100
Subject: [PATCH 11/21] remove link to action on homepage, in evaluation list

---
 .../Resources/public/vuejs/HomepageWidget/MyEvaluations.vue  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue
index 7cd40f45a..a872a2f43 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue
@@ -42,9 +42,6 @@
                   <a class="btn btn-sm btn-show" :href="getUrl(e)">
                      {{ $t('show_entity', { entity: $t('the_evaluation') }) }}
                   </a>
-                  <a class="btn btn-sm btn-update" :href="getUrl(e.accompanyingPeriodWork)">
-                     {{ $t('show_entity', { entity: $t('the_action') }) }}
-                  </a>
                   <a class="btn btn-sm btn-show" :href="getUrl(e.accompanyingPeriodWork.accompanyingPeriod)">
                      {{ $t('show_entity', { entity: $t('the_course') }) }}
                   </a>
@@ -102,4 +99,4 @@ export default {
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>

From 1e63d0076742fed283dc9475ad4bddf7b8588370 Mon Sep 17 00:00:00 2001
From: Marc Ducobu <marc.ducobu@champs-libres.coop>
Date: Wed, 16 Mar 2022 16:26:18 +0100
Subject: [PATCH 12/21] Fix pbm importing CP from France on 4 digits

---
 .../ChillMainBundle/Command/LoadPostalCodesCommand.php     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
index a3b1c1a26..5d577a0b4 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
@@ -118,6 +118,13 @@ class LoadPostalCodesCommand extends Command
 
     private function addPostalCode($row, OutputInterface $output)
     {
+        if($row[2] == 'FR' && strlen($row[0]) == 4) {
+            // CP in FRANCE are on 5 digit
+            // For CP starting with a zero, the starting zero can be remove if stored as number in a csv
+            // add a zero if CP from FR and on 4 digit
+            $row[0] = '0'.$row[0];
+        }
+
         if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
             $output->writeln('handling row: ' . $row[0] . ' | ' . $row[1] . ' | ' . $row[2]);
         }

From 2c02150b1a7e0d7f4c74e264bd0d445cad48f779 Mon Sep 17 00:00:00 2001
From: Marc Ducobu <marc.ducobu@champs-libres.coop>
Date: Thu, 17 Mar 2022 18:29:16 +0100
Subject: [PATCH 13/21] Use CS Fixer

---
 src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
index 5d577a0b4..b02d9c44a 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
@@ -118,7 +118,7 @@ class LoadPostalCodesCommand extends Command
 
     private function addPostalCode($row, OutputInterface $output)
     {
-        if($row[2] == 'FR' && strlen($row[0]) == 4) {
+        if ($row[2] == 'FR' && strlen($row[0]) == 4) {
             // CP in FRANCE are on 5 digit
             // For CP starting with a zero, the starting zero can be remove if stored as number in a csv
             // add a zero if CP from FR and on 4 digit

From 288f0dbf691e644e84e592dba8baecd08429428e Mon Sep 17 00:00:00 2001
From: Marc Ducobu <marc.ducobu@champs-libres.coop>
Date: Wed, 16 Mar 2022 16:26:18 +0100
Subject: [PATCH 14/21] Fix pbm importing CP from France on 4 digits

---
 .../ChillMainBundle/Command/LoadPostalCodesCommand.php     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
index a3b1c1a26..5d577a0b4 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
@@ -118,6 +118,13 @@ class LoadPostalCodesCommand extends Command
 
     private function addPostalCode($row, OutputInterface $output)
     {
+        if($row[2] == 'FR' && strlen($row[0]) == 4) {
+            // CP in FRANCE are on 5 digit
+            // For CP starting with a zero, the starting zero can be remove if stored as number in a csv
+            // add a zero if CP from FR and on 4 digit
+            $row[0] = '0'.$row[0];
+        }
+
         if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
             $output->writeln('handling row: ' . $row[0] . ' | ' . $row[1] . ' | ' . $row[2]);
         }

From b84e161399425b803861c72c0672a9faaec2d2a9 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 18 Mar 2022 12:35:14 +0100
Subject: [PATCH 15/21] quick fix css class in acc period evaluation form,
 issue client 557

---
 .../AccompanyingCourseWorkEdit/components/FormEvaluation.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
index 24e1c202f..8e47560bb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -70,7 +70,7 @@
                <div class="input-group input-group-lg mb-3">
                   <div>
                      <input
-                         class="form-control form-control-lg"
+                         class="form-control"
                          style="font-weight: bold;"
                          type="text"
                          :value="d.title"

From bfd51c6615d0782d268d1d63757821735831d1fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 18 Mar 2022 13:55:23 +0100
Subject: [PATCH 16/21] allow downloads in LO editor

---
 .../ChillWopiBundle/src/Resources/public/page/editor/index.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillWopiBundle/src/Resources/public/page/editor/index.js b/src/Bundle/ChillWopiBundle/src/Resources/public/page/editor/index.js
index 613a51d63..99b4ae707 100644
--- a/src/Bundle/ChillWopiBundle/src/Resources/public/page/editor/index.js
+++ b/src/Bundle/ChillWopiBundle/src/Resources/public/page/editor/index.js
@@ -14,7 +14,7 @@ window.addEventListener('DOMContentLoaded', function(e) {
     office_frame.setAttribute('allowfullscreen', 'true');
 
     // The sandbox attribute is needed to allow automatic redirection to the O365 sign-in page in the business user flow
-    office_frame.setAttribute('sandbox', 'allow-scripts allow-same-origin allow-forms allow-popups allow-top-navigation allow-popups-to-escape-sandbox');
+    office_frame.setAttribute('sandbox', 'allow-downloads allow-scripts allow-same-origin allow-forms allow-popups allow-top-navigation allow-popups-to-escape-sandbox');
     frameholder.appendChild(office_frame);
 
     document.getElementById('office_form').submit();

From fdb36ab047f9ef009072baaa584df15537361793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 18 Mar 2022 14:18:47 +0100
Subject: [PATCH 17/21] add document title to workflow EvaluationDocument
 handler

---
 ...ccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
index 1e02d0465..d7a196a6c 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
@@ -61,8 +61,8 @@ class AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler implements EntityW
         return $this->translator->trans(
             'workflow.Doc for evaluation (n°%eval%)',
             ['%eval%' => $entityWorkflow->getRelatedEntityId()]
-        ) . ' - ' . $this->translatableStringHelper->localize($doc->getAccompanyingPeriodWorkEvaluation()
-            ->getEvaluation()->getTitle());
+        ) . ' (' . $this->translatableStringHelper->localize($doc->getAccompanyingPeriodWorkEvaluation()
+            ->getEvaluation()->getTitle()).') '.$doc->getTitle();
     }
 
     public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingPeriodWorkEvaluationDocument

From da67fa4c4fa25d4848b1c316ceb7a5060eea157a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 18 Mar 2022 14:33:05 +0100
Subject: [PATCH 18/21] fix role for creating activity in person

---
 .../Resources/views/Activity/listPerson.html.twig               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
index ac4266f8c..8b30bc6c7 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
@@ -46,7 +46,7 @@
 
     {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'person'} %}
 
-    {% if is_granted('CHILL_ACTIVITY_CREATE', person) %}
+    {% if is_granted('CHILL_ACTIVITY_CREATE_PERSON', person) %}
     <ul class="record_actions sticky-form-buttons">
         <li>
             <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}"

From 8d92cc0ba7a2367b47d209798720822281a85ebe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 18 Mar 2022 15:40:01 +0100
Subject: [PATCH 19/21] remove history from menus, temporarily

---
 .../Menu/AccompanyingCourseMenuBuilder.php         | 14 ++++++++------
 src/Bundle/ChillPersonBundle/config/routes.yaml    |  5 -----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
index 827dfb0a6..8f1ecb0d1 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
@@ -68,12 +68,14 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
         }
 
         if ($this->security->isGranted(AccompanyingPeriodVoter::SEE_DETAILS, $period)) {
-            $menu->addChild($this->translator->trans('Accompanying Course History'), [
-                'route' => 'chill_person_accompanying_course_history',
-                'routeParameters' => [
-                    'accompanying_period_id' => $period->getId(),
-                ], ])
-                ->setExtras(['order' => 30]);
+            /*
+                $menu->addChild($this->translator->trans('Accompanying Course History'), [
+                    'route' => 'chill_person_accompanying_course_history',
+                    'routeParameters' => [
+                        'accompanying_period_id' => $period->getId(),
+                    ], ])
+                    ->setExtras(['order' => 30]);
+            */
 
             $menu->addChild($this->translator->trans('Accompanying Course Comment'), [
                 'route' => 'chill_person_accompanying_period_comment_list',
diff --git a/src/Bundle/ChillPersonBundle/config/routes.yaml b/src/Bundle/ChillPersonBundle/config/routes.yaml
index 1836826c5..bec2af134 100644
--- a/src/Bundle/ChillPersonBundle/config/routes.yaml
+++ b/src/Bundle/ChillPersonBundle/config/routes.yaml
@@ -95,11 +95,6 @@ chill_person_address_update:
 chill_person_timeline:
     path: /{_locale}/person/{person_id}/timeline
     controller: Chill\PersonBundle\Controller\TimelinePersonController::personAction
-    options:
-        menus:
-            person:
-                order: 60
-                label: Timeline
 
 chill_person_admin:
     path: "/{_locale}/admin/person"

From 184a664bf9effe7fcee57264dc18c6f78e33ab66 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Sat, 19 Mar 2022 11:25:56 +0100
Subject: [PATCH 20/21] english text translated in thirdparty view page

---
 CHANGELOG.md                                                  | 1 +
 .../Resources/views/ThirdParty/view.html.twig                 | 4 ++--
 src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff62b029c..f25611dc5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@ and this project adheres to
 * [contact] add contact button color changed plus the pipe at the side removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/506)
 * [household] create-edit household composition placed in separate page to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/505)
 * [blur] Improved positioning of toggle icon (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/486)
+* [thirdparty] Thirdparty view page, english text translated (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/534)
 
 ## Test releases
 
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
index c4f2bcfbd..759ba5918 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
@@ -60,7 +60,7 @@
                         {% if types|length > 0 %}
                             {{ types|join(', ') }}
                         {% else %}
-                            <p class="chill-no-data-statement">{{ 'thirdParty.Any categories' }}</p>
+                            <p class="chill-no-data-statement">{{ 'thirdparty.no_categories' }}</p>
                         {% endif %}
                     </dd>
 
@@ -110,7 +110,7 @@
                         <dt>{{ 'Contacts'|trans }}</dt>
                         <dd>
                             {% if thirdParty.activeChildren|length == 0 %}
-                            <p class="chill-no-data-statement">{{ 'Any contacts associated'|trans }}</p>
+                            <p class="chill-no-data-statement">{{ 'No contacts associated'|trans }}</p>
                             {% else %}
                                 <div class="flex-table">
                                     {% for tp in thirdParty.activeChildren %}
diff --git a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
index 20b45a398..9c8091307 100644
--- a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
@@ -63,13 +63,13 @@ Show thirdparty: Voir le tiers
 Add a contact: Ajouter un contact
 Remove a contact: Supprimer
 Contacts: Contacts
-Any contact: Aucun contact
+No contacts associated: Aucun contact
 
 No nameCompany given: Aucune raison sociale renseignée
 No acronym given: Aucun sigle renseigné
 No phone given: Aucun téléphone renseigné
 No email given:  Aucune adresse courriel renseignée
-thirdparty.Any categories: Aucune catégorie
+thirdparty.no_categories: Aucune catégorie
 
 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

From ff5aeaae17243319ebf51b48696cd09ef4bf1270 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Sat, 19 Mar 2022 11:32:16 +0100
Subject: [PATCH 21/21] translation changed in action evaluation section

---
 CHANGELOG.md                                                    | 1 +
 .../Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f25611dc5..e74bd2abe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,7 @@ and this project adheres to
 * [household] create-edit household composition placed in separate page to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/505)
 * [blur] Improved positioning of toggle icon (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/486)
 * [thirdparty] Thirdparty view page, english text translated (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/534)
+* [social_action] Translation changed in evaluation section (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/512)
 
 ## Test releases
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index a0d88d1bf..3920182c8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -319,7 +319,7 @@ const i18n = {
          add_thirdparties: "Ajouter des tiers",
          choose_thirdparties: "Choisir des tiers",
          fix_these_errors: "Veuillez corriger les erreurs suivantes :",
-         available_evaluations_text: "Évaluations disponibles pour ajout :",
+         available_evaluations_text: "Documents disponibles pour ajout :",
          no_evaluations_available: "Aucune évaluation disponible",
          no_goals_available: "Aucun objectif disponible",
       }