From b36fd57e4fd32c19a256f733f0c1fcf489db0aab Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 25 Apr 2022 15:46:55 +0200
Subject: [PATCH 01/47] Add private comment options to activity type
 (visibility + label)

---
 .../Controller/ActivityController.php         |  2 --
 .../Entity/ActivityType.php                   | 34 +++++++++++++++++++
 .../ChillActivityBundle/Form/ActivityType.php | 10 +++---
 .../Form/ActivityTypeType.php                 |  2 +-
 .../Resources/views/Activity/show.html.twig   |  8 +++--
 .../migrations/Version20220425133027.php      | 33 ++++++++++++++++++
 .../translations/messages.fr.yml              |  2 ++
 7 files changed, 82 insertions(+), 9 deletions(-)
 create mode 100644 src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php

diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index 4702e18e7..2840e3f27 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -431,8 +431,6 @@ final class ActivityController extends AbstractController
             'accompanyingPeriod' => $accompanyingPeriod,
         ]);
 
-        dump($form);
-
         if ($form->has('documents')) {
             $form->add('gendocTemplateId', HiddenType::class, [
                 'mapped' => false,
diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
index bdf75ed05..deb28184c 100644
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
@@ -76,6 +76,16 @@ class ActivityType
      */
     private int $commentVisible = self::FIELD_OPTIONAL;
 
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default": ""})
+     */
+    private string $privateCommentLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     */
+    private int $privateCommentVisible = self::FIELD_OPTIONAL;
+
     /**
      * @ORM\Column(type="string", nullable=false, options={"default": ""})
      */
@@ -314,6 +324,16 @@ class ActivityType
         return $this->commentVisible;
     }
 
+    public function getPrivateCommentLabel(): string
+    {
+        return $this->privateCommentLabel;
+    }
+
+    public function getPrivateCommentVisible(): int
+    {
+        return $this->privateCommentVisible;
+    }
+
     public function getDateLabel(): string
     {
         return $this->dateLabel;
@@ -573,6 +593,20 @@ class ActivityType
         return $this;
     }
 
+    public function setPrivateCommentLabel(string $privateCommentLabel): self
+    {
+        $this->privateCommentLabel = $privateCommentLabel;
+
+        return $this;
+    }
+
+    public function setPrivateCommentVisible(int $privateCommentVisible): self
+    {
+        $this->privateCommentVisible = $privateCommentVisible;
+
+        return $this;
+    }
+
     public function setDateLabel(string $dateLabel): self
     {
         $this->dateLabel = $dateLabel;
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityType.php b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
index 7ff07ba3f..0fa2fdf76 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -252,10 +252,12 @@ class ActivityType extends AbstractType
             ]);
         }
 
-        $builder->add('privateComment', PrivateCommentType::class, [
-            'label' => 'activity.private comment',
-            'required' => false
-        ]);
+        if($activityType->isVisible('privateComment')) {
+            $builder->add('privateComment', PrivateCommentType::class, [
+                'label' => empty($activityType->getLabel('privateComment')) ? 'activity.private comment' : $activityType->getPrivateCommentLabel(),
+                'required' => false
+            ]);
+        }
 
         if ($activityType->isVisible('persons')) {
             $builder->add('persons', HiddenType::class);
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php b/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
index 28947d72b..75e79fd5b 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
@@ -57,7 +57,7 @@ class ActivityTypeType extends AbstractType
         $fields = [
             'persons', 'user', 'date', 'location', 'persons',
             'thirdParties', 'durationTime', 'travelTime', 'attendee',
-            'reasons', 'comment', 'sentReceived', 'documents',
+            'reasons', 'comment', 'privateComment', 'sentReceived', 'documents',
             'emergency', 'socialIssues', 'socialActions', 'users',
         ];
 
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index 53817c1c4..512557491 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -146,8 +146,12 @@
                 </dd>
             {% endif %}
 
-            {% if is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) and entity.privateComment.userId is same as(app.user.id) %}
-                <dt class="inline">{{ 'activity.private comment'|trans }}</dt>
+            {% if t.privateCommentVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) and entity.privateComment.userId is same as(app.user.id) %}
+                {% if t.privateCommentLabel is not empty %}
+                    <dt class="inline">{{ t.privateCommentLabel }}</dt>
+                {% else %}
+                    <dt class="inline">{{ 'activity.private comment'|trans }}</dt>
+                {% endif %}
                 <dd>
                     {%- if entity.privateComment.empty -%}
                         <span class="chill-no-data-statement">{{ 'No comment associated'|trans }}</span>
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php b/src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php
new file mode 100644
index 000000000..c29f2d66e
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Activity;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20220425133027 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'add private comment option to activity types';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE activitytype ADD privateCommentLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD privateCommentVisible SMALLINT DEFAULT 1 NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE activitytype DROP privateCommentLabel');
+        $this->addSql('ALTER TABLE activitytype DROP privateCommentVisible');
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
index 912f3368f..00639f46b 100644
--- a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
@@ -169,6 +169,8 @@ Reasons visible: Visibilité du champ Sujet
 Reasons label: Libellé du champ Sujet
 Comment visible: Visibilité du champ Commentaire
 Comment label: Libellé du champ Commentaire
+Private comment visible: Visibilité du champ Commentaire Privé
+Private comment label: Libellé du champ Commentaire Privé
 Emergency visible: Visibilité du champ Urgent
 Emergency label: Libellé du champ Urgent
 Accompanying period visible: Visibilité du champ Période d'accompagnement

From 79fa03032345aecfef21a307f4257d48191864ed Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 25 Apr 2022 15:47:13 +0200
Subject: [PATCH 02/47] add private comment input field to edit form

---
 .../Resources/views/Activity/edit.html.twig                   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
index 218dc37b0..8d9ee878c 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
@@ -83,6 +83,10 @@
     {{ form_row(edit_form.comment) }}
 {% endif %}
 
+{%- if edit_form.privateComment is defined -%}
+    {{ form_row(edit_form.privateComment) }}
+{% endif %}
+
 {%- if edit_form.attendee is defined -%}
     {{ form_row(edit_form.attendee) }}
 {% endif %}

From 171cc79a4a95f9a2af927e4c72a7c5dfd081fa76 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 25 Apr 2022 15:47:51 +0200
Subject: [PATCH 03/47] Add private comment to rendez-vous

---
 .../ChillCalendarBundle/Entity/Calendar.php   | 19 +++++++++++
 .../ChillCalendarBundle/Form/CalendarType.php |  5 +++
 .../Resources/views/Calendar/edit.html.twig   |  4 +++
 .../Resources/views/Calendar/new.html.twig    |  4 +++
 .../migrations/Version20220425131140.php      | 34 +++++++++++++++++++
 .../translations/messages.fr.yml              |  3 +-
 6 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 src/Bundle/ChillCalendarBundle/migrations/Version20220425131140.php

diff --git a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
index 11104cc6a..bf425bd2d 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
@@ -70,6 +70,12 @@ class Calendar
      */
     private CommentEmbeddable $comment;
 
+    /**
+     * @ORM\Embedded(class=CommentEmbeddable::class, columnPrefix="prcomment_")
+     * @Serializer\Groups({"calendar:read"})
+     */
+    private CommentEmbeddable $privateComment;
+
     /**
      * @ORM\Column(type="datetimetz_immutable")
      * @Serializer\Groups({"calendar:read"})
@@ -151,6 +157,7 @@ class Calendar
     public function __construct()
     {
         $this->comment = new CommentEmbeddable();
+        $this->privateComment = new CommentEmbeddable();
         $this->persons = new ArrayCollection();
         $this->professionals = new ArrayCollection();
         $this->invites = new ArrayCollection();
@@ -208,6 +215,11 @@ class Calendar
         return $this->comment;
     }
 
+    public function getPrivateComment(): CommentEmbeddable
+    {
+        return $this->privateComment;
+    }
+
     public function getEndDate(): ?DateTimeImmutable
     {
         return $this->endDate;
@@ -386,6 +398,13 @@ class Calendar
         return $this;
     }
 
+    public function setPrivateComment(CommentEmbeddable $privateComment): self
+    {
+        $this->privateComment = $privateComment;
+
+        return $this;
+    }
+
     public function setEndDate(DateTimeImmutable $endDate): self
     {
         $this->endDate = $endDate;
diff --git a/src/Bundle/ChillCalendarBundle/Form/CalendarType.php b/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
index 05dc362b4..7269b2a66 100644
--- a/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
+++ b/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
@@ -18,6 +18,7 @@ use Chill\CalendarBundle\Entity\Invite;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\Type\CommentType;
+use Chill\MainBundle\Form\Type\PrivateCommentType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\Person;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
@@ -51,6 +52,10 @@ class CalendarType extends AbstractType
             ->add('comment', CommentType::class, [
                 'required' => false,
             ])
+            ->add('privateComment', PrivateCommentType::class, [
+                'required' => false,
+                'label' => 'private comment'
+            ])
             // ->add('cancelReason', EntityType::class, [
             //     'required' => false,
             //     'class' => CancelReason::class,
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig
index d67202920..b96d12c06 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig
@@ -47,6 +47,10 @@
     {{ form_row(form.comment) }}
 {% endif %}
 
+{%- if form.privateComment is defined -%}
+    {{ form_row(form.privateComment) }}
+{% endif %}
+
 {%- if form.sendSMS is defined -%}
     {{ form_row(form.sendSMS) }}
 {% endif %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig
index 255c2641b..7841f5b46 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig
@@ -43,6 +43,10 @@
     {{ form_row(form.comment) }}
 {% endif %}
 
+{%- if form.privateComment is defined -%}
+    {{ form_row(form.privateComment) }}
+{% endif %}
+
 {%- if form.sendSMS is defined -%}
     {{ form_row(form.sendSMS) }}
 {% endif %}
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20220425131140.php b/src/Bundle/ChillCalendarBundle/migrations/Version20220425131140.php
new file mode 100644
index 000000000..5910ca236
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/migrations/Version20220425131140.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Calendar;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20220425131140 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add private comment to calendar';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_calendar.calendar ADD prcomment_comment TEXT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_calendar.calendar ADD prcomment_date TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_calendar.calendar ADD prcomment_userId INT DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE chill_calendar.calendar DROP prcomment_comment');
+        $this->addSql('ALTER TABLE chill_calendar.calendar DROP prcomment_date');
+        $this->addSql('ALTER TABLE chill_calendar.calendar DROP prcomment_userId');
+    }
+}
diff --git a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
index 56ac8543c..1dbb00bb8 100644
--- a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
@@ -25,4 +25,5 @@ Add a new calendar: Ajouter un nouveau rendez-vous
 The calendar item has been successfully removed.: Le rendez-vous a été supprimé
 From the day: Du
 to the day: au
-Transform to activity: Transformer en échange
\ No newline at end of file
+Transform to activity: Transformer en échange
+private comment: Commentaire privé
\ No newline at end of file

From 064286aa2fb5bd3509ac9d524806c34788c14c05 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 26 Apr 2022 09:52:00 +0200
Subject: [PATCH 04/47] private comment for action. still needs
 (de)normalization

---
 .../AccompanyingPeriodWork.php                | 20 +++++++++++
 .../vuejs/AccompanyingCourseWorkEdit/App.vue  |  9 +++++
 .../migrations/Version20220425135900.php      | 35 +++++++++++++++++++
 3 files changed, 64 insertions(+)
 create mode 100644 src/Bundle/ChillPersonBundle/migrations/Version20220425135900.php

diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
index 055507162..91d85883a 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
@@ -13,6 +13,7 @@ namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
+use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodLinkedWithSocialIssuesEntityInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
@@ -134,6 +135,12 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
      */
     private string $note = '';
 
+    /**
+     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="prcomment_")
+     * @Serializer\Groups({"read", "accompanying_period_work:edit", "docgen:read"})
+     */
+    private CommentEmbeddable $privateComment;
+
     /**
      * @ORM\ManyToMany(targetEntity=Person::class)
      * @ORM\JoinTable(name="chill_person_accompanying_period_work_person")
@@ -202,6 +209,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
     public function __construct()
     {
         $this->goals = new ArrayCollection();
+        $this->privateComment = new CommentEmbeddable();
         $this->results = new ArrayCollection();
         $this->thirdParties = new ArrayCollection();
         $this->persons = new ArrayCollection();
@@ -323,6 +331,11 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this->note;
     }
 
+    public function getPrivateComment(): CommentEmbeddable
+    {
+        return $this->privateComment;
+    }
+
     public function getPersons(): Collection
     {
         return $this->persons;
@@ -505,6 +518,13 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this;
     }
 
+    public function setPrivateComment(CommentEmbeddable $privateComment): self
+    {
+        $this->privateComment = $privateComment;
+
+        return $this;
+    }
+
     public function setSocialAction(?SocialAction $socialAction): self
     {
         $this->socialAction = $socialAction;
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index bcfa53e45..19d253f41 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -33,6 +33,15 @@
          ></ckeditor>
       </div>
 
+      <div id="private_comment" class="action-row">
+         <label class="col-form-label">{{ $t('private comment') }}</label>
+         <ckeditor
+            v-model="privateComment"
+            :editor="editor"
+            tag-name="textarea"
+         ></ckeditor>
+      </div>
+
       <div id="objectives" class="action-row">
          <div aria="hidden" class="title">
             <div><h3>{{ $t('goals_title') }}</h3></div>
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220425135900.php b/src/Bundle/ChillPersonBundle/migrations/Version20220425135900.php
new file mode 100644
index 000000000..8598ee432
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220425135900.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20220425135900 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add private comment to action';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD prcomment_comment TEXT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD prcomment_date TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD prcomment_userId INT DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP prcomment_comment');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP prcomment_date');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP prcomment_userId');
+    }
+}

From 64b5de2c03b983ac0220c18abea2026794b22fae Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 26 Apr 2022 20:19:40 +0200
Subject: [PATCH 05/47] migrations deleted

---
 .../migrations/Version20220425100208.php      | 301 ------------------
 .../migrations/Version20220425131140.php      |  34 --
 .../migrations/Version20220425135900.php      |  35 --
 3 files changed, 370 deletions(-)
 delete mode 100644 src/Bundle/ChillActivityBundle/migrations/Version20220425100208.php
 delete mode 100644 src/Bundle/ChillCalendarBundle/migrations/Version20220425131140.php
 delete mode 100644 src/Bundle/ChillPersonBundle/migrations/Version20220425135900.php

diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20220425100208.php b/src/Bundle/ChillActivityBundle/migrations/Version20220425100208.php
deleted file mode 100644
index 3b8826ffb..000000000
--- a/src/Bundle/ChillActivityBundle/migrations/Version20220425100208.php
+++ /dev/null
@@ -1,301 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\Migrations\Activity;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20220425100208 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Add private comment to activity';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        // $this->addSql('DROP SEQUENCE chill_person_accompanying_period_work_eval_doc_id_seq CASCADE');
-        // $this->addSql('DROP TABLE chill_main_address_legacy');
-        $this->addSql('ALTER TABLE activity ADD prcomment_comment TEXT DEFAULT NULL');
-        $this->addSql('ALTER TABLE activity ADD prcomment_date TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
-        $this->addSql('ALTER TABLE activity ADD prcomment_userId INT DEFAULT NULL');
-        // $this->addSql('ALTER INDEX idx_ac74095a550b0c53 RENAME TO IDX_AC74095AD7FA8EF0');
-        // $this->addSql('ALTER INDEX idx_55026b0cc54c8c93 RENAME TO IDX_AC74095AC54C8C93');
-        // $this->addSql('ALTER INDEX idx_55026b0c217bbb47 RENAME TO IDX_AC74095A217BBB47');
-        // $this->addSql('ALTER INDEX idx_55026b0c682b5931 RENAME TO IDX_AC74095A682B5931');
-        // $this->addSql('ALTER INDEX idx_55026b0ca76ed395 RENAME TO IDX_AC74095AA76ED395');
-        // $this->addSql('ALTER TABLE activityreason ALTER name SET NOT NULL');
-        // $this->addSql('ALTER INDEX idx_654a2fcd12469de2 RENAME TO IDX_AF82522312469DE2');
-        // $this->addSql('ALTER TABLE activityreasoncategory ALTER name SET NOT NULL');
-        // $this->addSql('DROP INDEX internal_center_geom_idx');
-        // $this->addSql('DROP INDEX chill_custom_main_address_filtering_idx');
-        // $this->addSql('ALTER TABLE chill_main_address DROP customs');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER isnoaddress DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER floor TYPE VARCHAR(255)');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER floor DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER corridor TYPE VARCHAR(255)');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER corridor DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER steps TYPE VARCHAR(255)');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER steps DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER flat TYPE VARCHAR(255)');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER flat DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER point TYPE geometry(POINT,4326)');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER point DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER confidential DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER confidential SET NOT NULL');
-        // $this->addSql('DROP INDEX chill_internal_address_reference_canonicalized');
-        // $this->addSql('DROP INDEX address_refid');
-        // $this->addSql('ALTER TABLE chill_main_address_reference ALTER point TYPE geometry(POINT,4326)');
-        // $this->addSql('ALTER TABLE chill_main_address_reference ALTER point DROP DEFAULT');
-        // $this->addSql('CREATE INDEX address_refid ON chill_main_address_reference (refId) WHERE refid != \'\'');
-        // $this->addSql('ALTER TABLE chill_main_location ALTER active DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_main_location_type ALTER active DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_main_location_type ALTER editablebyusers DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_main_location_type ALTER editablebyusers SET NOT NULL');
-        // $this->addSql('ALTER TABLE chill_main_notification ALTER addressesemails DROP DEFAULT');
-        // $this->addSql('ALTER INDEX idx_154a075fef1a9d84 RENAME TO IDX_589D51B4EF1A9D84');
-        // $this->addSql('ALTER INDEX idx_154a075fa76ed395 RENAME TO IDX_589D51B4A76ED395');
-        // $this->addSql('DROP INDEX chill_internal_postal_code_canonicalized');
-        // $this->addSql('ALTER TABLE chill_main_postal_code ALTER center TYPE geometry(POINT,4326)');
-        // $this->addSql('ALTER TABLE chill_main_postal_code ALTER center DROP DEFAULT');
-        // $this->addSql('CREATE INDEX search_name_code ON chill_main_postal_code (code, label)');
-        // $this->addSql('ALTER INDEX idx_a9f001fa7e6af9d4 RENAME TO IDX_D63001607E6AF9D4');
-        // $this->addSql('ALTER INDEX idx_a9f001faa76ed395 RENAME TO IDX_D6300160A76ED395');
-        // $this->addSql('ALTER INDEX idx_64a4a621504cb38d RENAME TO IDX_E260A868504CB38D');
-        // $this->addSql('ALTER TABLE chill_person_accompanying_period_closingmotive ALTER ordering DROP DEFAULT');
-        // $this->addSql('ALTER INDEX idx_92351ece727aca70 RENAME TO IDX_72D110E8727ACA70');
-        // $this->addSql('DROP INDEX participations_no_overlap');
-        // $this->addSql('ALTER TABLE chill_person_accompanying_period_participation ALTER startdate DROP DEFAULT');
-        // $this->addSql('DROP INDEX thirdparty_unique');
-        // $this->addSql('DROP INDEX person_unique');
-        // $this->addSql('CREATE UNIQUE INDEX thirdparty_unique ON chill_person_accompanying_period_resource (thirdparty_id, accompanyingperiod_id)');
-        // $this->addSql('CREATE UNIQUE INDEX person_unique ON chill_person_accompanying_period_resource (person_id, accompanyingperiod_id)');
-        // $this->addSql('ALTER TABLE chill_person_household DROP CONSTRAINT fk_household_comment_embeddable_user');
-        // $this->addSql('DROP INDEX IDX_BE50A270116F5FA9');
-        // $this->addSql('ALTER TABLE chill_person_household_composition ALTER createdat TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
-        // $this->addSql('ALTER TABLE chill_person_household_composition ALTER createdat DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_person_household_composition ALTER updatedat TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
-        // $this->addSql('ALTER TABLE chill_person_household_composition ALTER updatedat DROP DEFAULT');
-        // $this->addSql('COMMENT ON COLUMN chill_person_household_composition.createdAt IS \'(DC2Type:datetime_immutable)\'');
-        // $this->addSql('COMMENT ON COLUMN chill_person_household_composition.updatedAt IS \'(DC2Type:datetime_immutable)\'');
-        // $this->addSql('DROP INDEX household_members_not_overlaps');
-        // $this->addSql('DROP INDEX chill_custom_person_household_members_sharing_idx');
-        // $this->addSql('ALTER TABLE chill_person_household_members ALTER startdate TYPE DATE');
-        // $this->addSql('ALTER TABLE chill_person_household_members ALTER startdate DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_person_household_members ALTER enddate TYPE DATE');
-        // $this->addSql('ALTER TABLE chill_person_household_members ALTER enddate DROP DEFAULT');
-        // $this->addSql('COMMENT ON COLUMN chill_person_household_members.startDate IS \'(DC2Type:date_immutable)\'');
-        // $this->addSql('COMMENT ON COLUMN chill_person_household_members.endDate IS \'(DC2Type:date_immutable)\'');
-        // $this->addSql('ALTER TABLE chill_person_marital_status ALTER id TYPE VARCHAR(7)');
-        // $this->addSql('DROP INDEX phonenumber_trgm_idx');
-        // $this->addSql('DROP INDEX mobilenumber_trgm_idx');
-        // $this->addSql('DROP INDEX chill_custom_fullnamecanonical_only_trgm_idx_gin');
-        // $this->addSql('DROP INDEX fullnamecanonical_trgm_idx');
-        // $this->addSql('ALTER TABLE chill_person_person DROP cfdata_old');
-        // $this->addSql('ALTER TABLE chill_person_person ALTER maritalstatus_id TYPE VARCHAR(7)');
-        // $this->addSql('ALTER TABLE chill_person_person ALTER phonenumber TYPE VARCHAR(35)');
-        // $this->addSql('ALTER TABLE chill_person_person ALTER phonenumber DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_person_person ALTER cfdata SET NOT NULL');
-        // $this->addSql('ALTER TABLE chill_person_person ALTER mobilenumber TYPE VARCHAR(35)');
-        // $this->addSql('ALTER TABLE chill_person_person ALTER mobilenumber DROP DEFAULT');
-        // $this->addSql('COMMENT ON COLUMN chill_person_person.phonenumber IS \'(DC2Type:phone_number)\'');
-        // $this->addSql('COMMENT ON COLUMN chill_person_person.mobilenumber IS \'(DC2Type:phone_number)\'');
-        // $this->addSql('ALTER INDEX idx_person_center RENAME TO IDX_BF210A145932F377');
-        // $this->addSql('ALTER INDEX idx_3370d4403818da5 RENAME TO IDX_BF210A143818DA5');
-        // $this->addSql('ALTER INDEX idx_bf210a145521be40 RENAME TO IDX_BF210A14D7D03CE3');
-        // $this->addSql('ALTER INDEX idx_3370d4401c9da55 RENAME TO IDX_BF210A141C9DA55');
-        // $this->addSql('ALTER TABLE persons_spoken_languages DROP CONSTRAINT FK_7201106F217BBB47');
-        // $this->addSql('ALTER TABLE persons_spoken_languages DROP CONSTRAINT FK_7201106F82F1BAF4');
-        // $this->addSql('ALTER TABLE persons_spoken_languages ADD CONSTRAINT FK_7201106F217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        // $this->addSql('ALTER TABLE persons_spoken_languages ADD CONSTRAINT FK_7201106F82F1BAF4 FOREIGN KEY (language_id) REFERENCES language (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        // $this->addSql('ALTER TABLE chill_person_phone ALTER phonenumber TYPE VARCHAR(35)');
-        // $this->addSql('ALTER TABLE chill_person_phone ALTER phonenumber DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_person_phone ALTER phonenumber SET NOT NULL');
-        // $this->addSql('COMMENT ON COLUMN chill_person_phone.phonenumber IS \'(DC2Type:phone_number)\'');
-        // $this->addSql('ALTER TABLE chill_person_relations ALTER isactive DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_person_relations ALTER isactive DROP NOT NULL');
-        // $this->addSql('ALTER INDEX idx_9bc1fd50f5b7af75 RENAME TO IDX_B9CEBEACF5B7AF75');
-        // $this->addSql('ALTER INDEX idx_9bc1fd50dca38092 RENAME TO IDX_B9CEBEACDCA38092');
-        // $this->addSql('ALTER INDEX idx_9bc1fd508dfc48dc RENAME TO IDX_B9CEBEAC8DFC48DC');
-        // $this->addSql('ALTER INDEX idx_9bc1fd50217bbb47 RENAME TO IDX_B9CEBEAC217BBB47');
-        // $this->addSql('ALTER TABLE chill_person_resource ALTER createdby_id DROP NOT NULL');
-        // $this->addSql('ALTER TABLE chill_person_resource ALTER createdat TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
-        // $this->addSql('ALTER TABLE chill_person_resource ALTER createdat DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_person_resource ALTER createdat DROP NOT NULL');
-        // $this->addSql('ALTER TABLE chill_person_resource ALTER updatedat TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
-        // $this->addSql('ALTER TABLE chill_person_resource ALTER updatedat DROP DEFAULT');
-        // $this->addSql('COMMENT ON COLUMN chill_person_resource.createdAt IS \'(DC2Type:datetime_immutable)\'');
-        // $this->addSql('COMMENT ON COLUMN chill_person_resource.updatedAt IS \'(DC2Type:datetime_immutable)\'');
-        // $this->addSql('ALTER TABLE custom_field_long_choice_options ALTER internal_key DROP DEFAULT');
-        // $this->addSql('ALTER TABLE customfield ALTER required DROP DEFAULT');
-        // $this->addSql('ALTER TABLE customfield ALTER required SET NOT NULL');
-        // $this->addSql('ALTER INDEX idx_40fb5d6dfec418b RENAME TO IDX_7A6FDBEFEC418B');
-        // $this->addSql('ALTER INDEX idx_286dc95df53b66 RENAME TO IDX_7A48DF7F5DF53B66');
-        // $this->addSql('ALTER TABLE customfieldsgroup ALTER options DROP DEFAULT');
-        // $this->addSql('ALTER TABLE customfieldsgroup ALTER options SET NOT NULL');
-        // $this->addSql('ALTER TABLE chill_vendee.geographical_unit_association ADD CONSTRAINT FK_981D5C95D58FA2A4 FOREIGN KEY (geographicalUnit_id) REFERENCES chill_vendee.geographical_unit (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        // $this->addSql('ALTER TABLE chill_vendee.geographical_unit_association ADD CONSTRAINT FK_981D5C95A76ED395 FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        // $this->addSql('ALTER INDEX idx_a14d8f3d447bbb3b RENAME TO IDX_A14D8F3D96DF1F10');
-        // $this->addSql('ALTER TABLE permission_groups ALTER flags DROP DEFAULT');
-        // $this->addSql('DROP INDEX "primary"');
-        // $this->addSql('ALTER TABLE chill_vendee.security_profile_jobs ADD PRIMARY KEY (profile_id, job_id)');
-        // $this->addSql('ALTER TABLE chill_vendee.security_profile_action ALTER profile_id DROP NOT NULL');
-        // $this->addSql('ALTER TABLE chill_vendee.security_profile_action ALTER action SET NOT NULL');
-        // $this->addSql('DROP INDEX chill_custom_canonicalized_trgm_idx_gist');
-        // $this->addSql('ALTER TABLE chill_3party.third_party ALTER firstname SET NOT NULL');
-        // $this->addSql('DROP INDEX uniq_93f763ae217bbb47');
-        // $this->addSql('ALTER TABLE chill_vendee.vendee_person ALTER situationprofessionellestartdate TYPE DATE');
-        // $this->addSql('ALTER TABLE chill_vendee.vendee_person ALTER situationprofessionellestartdate DROP DEFAULT');
-        // $this->addSql('COMMENT ON COLUMN chill_vendee.vendee_person.situationProfessionelleStartDate IS \'(DC2Type:date_immutable)\'');
-        // $this->addSql('ALTER TABLE chill_vendee.vendeeperson_entourage ADD CONSTRAINT FK_4D319FFEF57537C3 FOREIGN KEY (vendeeperson_id) REFERENCES chill_vendee.vendee_person (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        // $this->addSql('ALTER INDEX chill_vendee.idx_1a4b602deef79338 RENAME TO IDX_DD0A4C00EEF79338');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        // $this->addSql('CREATE SCHEMA public');
-        // $this->addSql('CREATE SEQUENCE chill_person_accompanying_period_work_eval_doc_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
-        // $this->addSql('CREATE TABLE chill_main_address_legacy (id INT DEFAULT NULL, postcode_id INT DEFAULT NULL, street VARCHAR(255) DEFAULT NULL, streetnumber VARCHAR(255) DEFAULT NULL, validfrom DATE DEFAULT NULL, isnoaddress BOOLEAN DEFAULT NULL, customs JSONB DEFAULT NULL, floor VARCHAR(16) DEFAULT NULL, corridor VARCHAR(16) DEFAULT NULL, steps VARCHAR(16) DEFAULT NULL, buildingname VARCHAR(255) DEFAULT NULL, flat VARCHAR(16) DEFAULT NULL, distribution VARCHAR(255) DEFAULT NULL, extra VARCHAR(255) DEFAULT NULL, validto DATE DEFAULT NULL, point VARCHAR(255) DEFAULT NULL, linkedtothirdparty_id INT DEFAULT NULL)');
-        // $this->addSql('ALTER INDEX idx_7a48df7f5df53b66 RENAME TO idx_286dc95df53b66');
-        // $this->addSql('ALTER TABLE persons_spoken_languages DROP CONSTRAINT fk_7201106f217bbb47');
-        // $this->addSql('ALTER TABLE persons_spoken_languages DROP CONSTRAINT fk_7201106f82f1baf4');
-        // $this->addSql('ALTER TABLE persons_spoken_languages ADD CONSTRAINT fk_7201106f217bbb47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        // $this->addSql('ALTER TABLE persons_spoken_languages ADD CONSTRAINT fk_7201106f82f1baf4 FOREIGN KEY (language_id) REFERENCES language (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        // $this->addSql('ALTER TABLE customfieldsgroup ALTER options SET DEFAULT \'{}\'');
-        // $this->addSql('ALTER TABLE customfieldsgroup ALTER options DROP NOT NULL');
-        // $this->addSql('ALTER TABLE activityreasoncategory ALTER name DROP NOT NULL');
-        // $this->addSql('ALTER TABLE activityreason ALTER name DROP NOT NULL');
-        // $this->addSql('ALTER INDEX idx_af82522312469de2 RENAME TO idx_654a2fcd12469de2');
-        // $this->addSql('ALTER INDEX idx_a14d8f3d96df1f10 RENAME TO idx_a14d8f3d447bbb3b');
-        // $this->addSql('ALTER TABLE customfield ALTER required SET DEFAULT \'false\'');
-        // $this->addSql('ALTER TABLE customfield ALTER required DROP NOT NULL');
-        // $this->addSql('ALTER INDEX idx_7a6fdbefec418b RENAME TO idx_40fb5d6dfec418b');
-        // $this->addSql('ALTER TABLE custom_field_long_choice_options ALTER internal_key SET DEFAULT \'\'');
-        // $this->addSql('ALTER TABLE chill_person_marital_status ALTER id TYPE VARCHAR(10)');
-        // $this->addSql('ALTER TABLE permission_groups ALTER flags SET DEFAULT \'[]\'');
-        // $this->addSql('ALTER TABLE chill_person_phone ALTER phonenumber TYPE TEXT');
-        // $this->addSql('ALTER TABLE chill_person_phone ALTER phonenumber DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_person_phone ALTER phonenumber DROP NOT NULL');
-        // $this->addSql('COMMENT ON COLUMN chill_person_phone.phonenumber IS NULL');
-        // $this->addSql('ALTER TABLE chill_person_accompanying_period_closingmotive ALTER ordering SET DEFAULT \'0\'');
-        // $this->addSql('ALTER INDEX idx_72d110e8727aca70 RENAME TO idx_92351ece727aca70');
-        // $this->addSql('ALTER TABLE chill_person_accompanying_period_participation ALTER startDate SET DEFAULT \'1970-01-01\'');
-        // $this->addSql('CREATE INDEX participations_no_overlap ON chill_person_accompanying_period_participation (person_id, accompanyingperiod_id)');
-        // $this->addSql('ALTER TABLE chill_person_household ADD CONSTRAINT fk_household_comment_embeddable_user FOREIGN KEY (comment_members_userid) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        // $this->addSql('CREATE INDEX IDX_BE50A270116F5FA9 ON chill_person_household (comment_members_userid)');
-        // $this->addSql('ALTER TABLE chill_vendee.vendeeperson_entourage DROP CONSTRAINT FK_4D319FFEF57537C3');
-        // $this->addSql('ALTER TABLE chill_vendee.security_profile_action ALTER profile_id SET NOT NULL');
-        // $this->addSql('ALTER TABLE chill_vendee.security_profile_action ALTER action DROP NOT NULL');
-        // $this->addSql('DROP INDEX security_profile_jobs_pkey');
-        // $this->addSql('ALTER TABLE chill_vendee.security_profile_jobs ADD PRIMARY KEY (job_id, profile_id)');
-        $this->addSql('ALTER TABLE activity DROP prcomment_comment');
-        $this->addSql('ALTER TABLE activity DROP prcomment_date');
-        $this->addSql('ALTER TABLE activity DROP prcomment_userId');
-        // $this->addSql('ALTER INDEX idx_ac74095ac54c8c93 RENAME TO idx_55026b0cc54c8c93');
-        // $this->addSql('ALTER INDEX idx_ac74095a217bbb47 RENAME TO idx_55026b0c217bbb47');
-        // $this->addSql('ALTER INDEX idx_ac74095a682b5931 RENAME TO idx_55026b0c682b5931');
-        // $this->addSql('ALTER INDEX idx_ac74095aa76ed395 RENAME TO idx_55026b0ca76ed395');
-        // $this->addSql('ALTER INDEX idx_ac74095ad7fa8ef0 RENAME TO IDX_AC74095A550B0C53');
-        // $this->addSql('ALTER TABLE chill_vendee.geographical_unit_association DROP CONSTRAINT FK_981D5C95D58FA2A4');
-        // $this->addSql('ALTER TABLE chill_vendee.geographical_unit_association DROP CONSTRAINT FK_981D5C95A76ED395');
-        // $this->addSql('ALTER TABLE chill_person_relations ALTER isActive SET DEFAULT \'true\'');
-        // $this->addSql('ALTER TABLE chill_person_relations ALTER isActive SET NOT NULL');
-        // $this->addSql('ALTER TABLE chill_person_person ADD cfdata_old TEXT DEFAULT NULL');
-        // $this->addSql('ALTER TABLE chill_person_person ALTER cFData DROP NOT NULL');
-        // $this->addSql('ALTER TABLE chill_person_person ALTER mobilenumber TYPE TEXT');
-        // $this->addSql('ALTER TABLE chill_person_person ALTER mobilenumber DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_person_person ALTER phonenumber TYPE TEXT');
-        // $this->addSql('ALTER TABLE chill_person_person ALTER phonenumber DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_person_person ALTER maritalStatus_id TYPE VARCHAR(10)');
-        // $this->addSql('COMMENT ON COLUMN chill_person_person.cfdata_old IS \'(DC2Type:array)\'');
-        // $this->addSql('COMMENT ON COLUMN chill_person_person.mobilenumber IS NULL');
-        // $this->addSql('COMMENT ON COLUMN chill_person_person.phonenumber IS NULL');
-        // $this->addSql('CREATE INDEX phonenumber_trgm_idx ON chill_person_person (phonenumber)');
-        // $this->addSql('CREATE INDEX mobilenumber_trgm_idx ON chill_person_person (mobilenumber)');
-        // $this->addSql('CREATE INDEX chill_custom_fullnamecanonical_only_trgm_idx_gin ON chill_person_person (fullnamecanonical)');
-        // $this->addSql('CREATE INDEX fullnamecanonical_trgm_idx ON chill_person_person (center_id, fullnamecanonical)');
-        // $this->addSql('ALTER INDEX idx_bf210a141c9da55 RENAME TO idx_3370d4401c9da55');
-        // $this->addSql('ALTER INDEX idx_bf210a145932f377 RENAME TO idx_person_center');
-        // $this->addSql('ALTER INDEX idx_bf210a143818da5 RENAME TO idx_3370d4403818da5');
-        // $this->addSql('ALTER INDEX idx_bf210a14d7d03ce3 RENAME TO IDX_BF210A145521BE40');
-        // $this->addSql('DROP INDEX address_refid');
-        // $this->addSql('ALTER TABLE chill_main_address_reference ALTER point TYPE VARCHAR(255)');
-        // $this->addSql('ALTER TABLE chill_main_address_reference ALTER point DROP DEFAULT');
-        // $this->addSql('CREATE INDEX chill_internal_address_reference_canonicalized ON chill_main_address_reference (postcode_id, addresscanonical)');
-        // $this->addSql('CREATE INDEX address_refid ON chill_main_address_reference (refid) WHERE ((refid)::text <> \'\'::text)');
-        // $this->addSql('DROP INDEX search_name_code');
-        // $this->addSql('ALTER TABLE chill_main_postal_code ALTER center TYPE VARCHAR(255)');
-        // $this->addSql('ALTER TABLE chill_main_postal_code ALTER center DROP DEFAULT');
-        // $this->addSql('CREATE INDEX chill_internal_postal_code_canonicalized ON chill_main_postal_code (canonical) WHERE (origin = 0)');
-        // $this->addSql('ALTER TABLE chill_person_household_members ALTER endDate TYPE DATE');
-        // $this->addSql('ALTER TABLE chill_person_household_members ALTER endDate DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_person_household_members ALTER startDate TYPE DATE');
-        // $this->addSql('ALTER TABLE chill_person_household_members ALTER startDate DROP DEFAULT');
-        // $this->addSql('COMMENT ON COLUMN chill_person_household_members.enddate IS NULL');
-        // $this->addSql('COMMENT ON COLUMN chill_person_household_members.startdate IS NULL');
-        // $this->addSql('CREATE INDEX household_members_not_overlaps ON chill_person_household_members (person_id) WHERE (sharedhousehold IS TRUE)');
-        // $this->addSql('CREATE INDEX chill_custom_person_household_members_sharing_idx ON chill_person_household_members (person_id, startdate, enddate, household_id) WHERE (sharedhousehold IS TRUE)');
-        // $this->addSql('ALTER INDEX idx_589d51b4a76ed395 RENAME TO idx_154a075fa76ed395');
-        // $this->addSql('ALTER INDEX idx_589d51b4ef1a9d84 RENAME TO idx_154a075fef1a9d84');
-        // $this->addSql('DROP INDEX person_unique');
-        // $this->addSql('DROP INDEX thirdparty_unique');
-        // $this->addSql('CREATE UNIQUE INDEX person_unique ON chill_person_accompanying_period_resource (person_id, accompanyingperiod_id) WHERE (person_id IS NOT NULL)');
-        // $this->addSql('CREATE UNIQUE INDEX thirdparty_unique ON chill_person_accompanying_period_resource (thirdparty_id, accompanyingperiod_id) WHERE (thirdparty_id IS NOT NULL)');
-        // $this->addSql('ALTER TABLE chill_main_location_type ALTER active SET DEFAULT \'true\'');
-        // $this->addSql('ALTER TABLE chill_main_location_type ALTER editableByUsers SET DEFAULT \'true\'');
-        // $this->addSql('ALTER TABLE chill_main_location_type ALTER editableByUsers DROP NOT NULL');
-        // $this->addSql('ALTER INDEX idx_d6300160a76ed395 RENAME TO idx_a9f001faa76ed395');
-        // $this->addSql('ALTER INDEX idx_d63001607e6af9d4 RENAME TO idx_a9f001fa7e6af9d4');
-        // $this->addSql('ALTER INDEX idx_e260a868504cb38d RENAME TO idx_64a4a621504cb38d');
-        // $this->addSql('ALTER TABLE chill_person_resource ALTER createdAt TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
-        // $this->addSql('ALTER TABLE chill_person_resource ALTER createdAt DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_person_resource ALTER createdAt SET NOT NULL');
-        // $this->addSql('ALTER TABLE chill_person_resource ALTER updatedAt TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
-        // $this->addSql('ALTER TABLE chill_person_resource ALTER updatedAt DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_person_resource ALTER createdBy_id SET NOT NULL');
-        // $this->addSql('COMMENT ON COLUMN chill_person_resource.createdat IS NULL');
-        // $this->addSql('COMMENT ON COLUMN chill_person_resource.updatedat IS NULL');
-        // $this->addSql('ALTER TABLE chill_person_household_composition ALTER createdAt TYPE DATE');
-        // $this->addSql('ALTER TABLE chill_person_household_composition ALTER createdAt DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_person_household_composition ALTER updatedAt TYPE DATE');
-        // $this->addSql('ALTER TABLE chill_person_household_composition ALTER updatedAt DROP DEFAULT');
-        // $this->addSql('COMMENT ON COLUMN chill_person_household_composition.createdat IS \'(DC2Type:date_immutable)\'');
-        // $this->addSql('COMMENT ON COLUMN chill_person_household_composition.updatedat IS \'(DC2Type:date_immutable)\'');
-        // $this->addSql('ALTER INDEX chill_vendee.idx_dd0a4c00eef79338 RENAME TO idx_1a4b602deef79338');
-        // $this->addSql('CREATE INDEX internal_center_geom_idx ON chill_vendee.center_polygon (geom)');
-        // $this->addSql('ALTER TABLE chill_vendee.vendee_person ALTER situationProfessionelleStartDate TYPE DATE');
-        // $this->addSql('ALTER TABLE chill_vendee.vendee_person ALTER situationProfessionelleStartDate DROP DEFAULT');
-        // $this->addSql('COMMENT ON COLUMN chill_vendee.vendee_person.situationprofessionellestartdate IS NULL');
-        // $this->addSql('CREATE UNIQUE INDEX uniq_93f763ae217bbb47 ON chill_vendee.vendee_person (person_id)');
-        // $this->addSql('ALTER INDEX idx_b9cebeac217bbb47 RENAME TO idx_9bc1fd50217bbb47');
-        // $this->addSql('ALTER INDEX idx_b9cebeacf5b7af75 RENAME TO idx_9bc1fd50f5b7af75');
-        // $this->addSql('ALTER INDEX idx_b9cebeacdca38092 RENAME TO idx_9bc1fd50dca38092');
-        // $this->addSql('ALTER INDEX idx_b9cebeac8dfc48dc RENAME TO idx_9bc1fd508dfc48dc');
-        // $this->addSql('ALTER TABLE chill_main_location ALTER active SET DEFAULT \'true\'');
-        // $this->addSql('ALTER TABLE chill_3party.third_party ALTER firstname DROP NOT NULL');
-        // $this->addSql('CREATE INDEX chill_custom_canonicalized_trgm_idx_gist ON chill_3party.third_party (canonicalized) WHERE (active IS TRUE)');
-        // $this->addSql('ALTER TABLE chill_main_notification ALTER addressesEmails SET DEFAULT \'[]\'');
-        // $this->addSql('ALTER TABLE chill_main_address ADD customs JSONB DEFAULT \'[]\'');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER confidential SET DEFAULT \'false\'');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER confidential DROP NOT NULL');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER corridor TYPE TEXT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER corridor DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER flat TYPE TEXT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER flat DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER floor TYPE TEXT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER floor DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER isNoAddress SET DEFAULT \'false\'');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER point TYPE VARCHAR(255)');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER point DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER steps TYPE TEXT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER steps DROP DEFAULT');
-        // $this->addSql('CREATE INDEX chill_custom_main_address_filtering_idx ON chill_main_address (id, validfrom, validto)');
-    }
-}
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20220425131140.php b/src/Bundle/ChillCalendarBundle/migrations/Version20220425131140.php
deleted file mode 100644
index 5910ca236..000000000
--- a/src/Bundle/ChillCalendarBundle/migrations/Version20220425131140.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\Migrations\Calendar;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20220425131140 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Add private comment to calendar';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_calendar.calendar ADD prcomment_comment TEXT DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_calendar.calendar ADD prcomment_date TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_calendar.calendar ADD prcomment_userId INT DEFAULT NULL');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE chill_calendar.calendar DROP prcomment_comment');
-        $this->addSql('ALTER TABLE chill_calendar.calendar DROP prcomment_date');
-        $this->addSql('ALTER TABLE chill_calendar.calendar DROP prcomment_userId');
-    }
-}
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220425135900.php b/src/Bundle/ChillPersonBundle/migrations/Version20220425135900.php
deleted file mode 100644
index 8598ee432..000000000
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220425135900.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\Migrations\Person;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20220425135900 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Add private comment to action';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD prcomment_comment TEXT DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD prcomment_date TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD prcomment_userId INT DEFAULT NULL');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP prcomment_comment');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP prcomment_date');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP prcomment_userId');
-    }
-}

From 37a198b8605ec73b7f66d44016cabc9589304447 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 26 Apr 2022 20:21:33 +0200
Subject: [PATCH 06/47] PrivateCommentEmbeddable created and added to entities
 + datamapper

---
 .../ChillActivityBundle/Entity/Activity.php   | 11 ++--
 .../ChillCalendarBundle/Entity/Calendar.php   | 11 ++--
 .../Embeddable/PrivateCommentEmbeddable.php   | 44 +++++++++++++++
 .../DataMapper/PrivateCommentDataMapper.php   | 54 +++++++++++++++++++
 .../Form/Type/PrivateCommentType.php          | 29 +++++-----
 .../ChillMainBundle/config/services/form.yaml |  4 ++
 .../migrations/Version20220426133048.php      | 35 ++++++++++++
 .../AccompanyingPeriodWork.php                | 11 ++--
 8 files changed, 167 insertions(+), 32 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
 create mode 100644 src/Bundle/ChillMainBundle/Form/DataMapper/PrivateCommentDataMapper.php
 create mode 100644 src/Bundle/ChillMainBundle/migrations/Version20220426133048.php

diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php
index f7e429476..b5a58c900 100644
--- a/src/Bundle/ChillActivityBundle/Entity/Activity.php
+++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php
@@ -15,6 +15,7 @@ use Chill\ActivityBundle\Validator\Constraints as ActivityValidator;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
+use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use Chill\MainBundle\Entity\HasScopeInterface;
 use Chill\MainBundle\Entity\Location;
@@ -86,10 +87,10 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     private CommentEmbeddable $comment;
 
     /**
-     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="prcomment_")
+     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable", columnPrefix="privateComment_")
      * @Groups({"docgen:read"})
      */
-    private CommentEmbeddable $privateComment;
+    private PrivateCommentEmbeddable $privateComment;
 
     /**
      * @ORM\Column(type="datetime")
@@ -197,7 +198,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     {
         $this->reasons = new ArrayCollection();
         $this->comment = new CommentEmbeddable();
-        $this->privateComment = new CommentEmbeddable();
+        $this->privateComment = new PrivateCommentEmbeddable();
         $this->persons = new ArrayCollection();
         $this->thirdParties = new ArrayCollection();
         $this->documents = new ArrayCollection();
@@ -307,7 +308,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this->comment;
     }
 
-    public function getPrivateComment(): CommentEmbeddable
+    public function getPrivateComment(): PrivateCommentEmbeddable
     {
         return $this->privateComment;
     }
@@ -536,7 +537,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this;
     }
 
-    public function setPrivateComment(CommentEmbeddable $privateComment): self
+    public function setPrivateComment(PrivateCommentEmbeddable $privateComment): self
     {
         $this->privateComment = $privateComment;
 
diff --git a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
index bf425bd2d..4783e70b6 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
@@ -14,6 +14,7 @@ namespace Chill\CalendarBundle\Entity;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\CalendarBundle\Repository\CalendarRepository;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
+use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
@@ -71,10 +72,10 @@ class Calendar
     private CommentEmbeddable $comment;
 
     /**
-     * @ORM\Embedded(class=CommentEmbeddable::class, columnPrefix="prcomment_")
+     * @ORM\Embedded(class=PrivateCommentEmbeddable::class, columnPrefix="privateComment_")
      * @Serializer\Groups({"calendar:read"})
      */
-    private CommentEmbeddable $privateComment;
+    private PrivateCommentEmbeddable $privateComment;
 
     /**
      * @ORM\Column(type="datetimetz_immutable")
@@ -157,7 +158,7 @@ class Calendar
     public function __construct()
     {
         $this->comment = new CommentEmbeddable();
-        $this->privateComment = new CommentEmbeddable();
+        $this->privateComment = new PrivateCommentEmbeddable();
         $this->persons = new ArrayCollection();
         $this->professionals = new ArrayCollection();
         $this->invites = new ArrayCollection();
@@ -215,7 +216,7 @@ class Calendar
         return $this->comment;
     }
 
-    public function getPrivateComment(): CommentEmbeddable
+    public function getPrivateComment(): PrivateCommentEmbeddable
     {
         return $this->privateComment;
     }
@@ -398,7 +399,7 @@ class Calendar
         return $this;
     }
 
-    public function setPrivateComment(CommentEmbeddable $privateComment): self
+    public function setPrivateComment(PrivateCommentEmbeddable $privateComment): self
     {
         $this->privateComment = $privateComment;
 
diff --git a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
new file mode 100644
index 000000000..70374749c
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Entity\Embeddable;
+
+use Chill\MainBundle\Entity\User;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Embeddable
+ */
+class PrivateCommentEmbeddable
+{
+    /**
+     * @ORM\Column(type="json", nullable=true)
+     */
+    private ?array $comments = [];
+
+    public function getComments(): ?array
+    {
+        return $this->comments;
+    }
+
+
+    public function getCommentForUser(User $user): string
+    {
+        return $this->comments[$user->getId()] ?? '';
+    }
+
+    public function setCommentForUser(User $user, string $content): self
+    {
+        $this->comments[$user->getId()] = $content;
+
+        return $this;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Form/DataMapper/PrivateCommentDataMapper.php b/src/Bundle/ChillMainBundle/Form/DataMapper/PrivateCommentDataMapper.php
new file mode 100644
index 000000000..5d4cd08cd
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Form/DataMapper/PrivateCommentDataMapper.php
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Form\DataMapper;
+
+use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\DataMapperInterface;
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
+use Symfony\Component\Security\Core\Security;
+
+final class PrivateCommentDataMapper extends AbstractType implements DataMapperInterface
+{
+
+    private Security $security;
+
+    public function __construct(Security $security)
+    {
+        $this->security = $security;
+    }
+
+    public function mapDataToForms($viewData, $forms)
+    {
+        if (null === $viewData) {
+            return null;
+        }
+
+        if (!$viewData instanceof PrivateCommentEmbeddable) {
+            throw new UnexpectedTypeException($viewData, PrivateCommentEmbeddable::class);
+        }
+
+        $forms = iterator_to_array($forms);
+
+        $forms['comments']->setData($viewData->getCommentForUser($this->security->getUser()));
+
+
+    }
+
+    public function mapFormsToData($forms, &$viewData)
+    {
+        $forms = iterator_to_array($forms);
+
+        $viewData->setCommentForUser($this->security->getUser(), $forms['comments']->getData());
+    }
+
+}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php b/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
index 77e1a1902..174326d86 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
@@ -12,8 +12,13 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Form\Type;
 
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
+use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
+use Chill\MainBundle\Form\DataMapper\PrivateCommentDataMapper;
 use DateTime;
+
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CollectionType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
@@ -27,29 +32,19 @@ class PrivateCommentType extends AbstractType
 {
     protected UserInterface $user;
 
-    public function __construct(TokenStorageInterface $tokenStorage)
+    protected PrivateCommentDataMapper $dataMapper;
+
+    public function __construct(TokenStorageInterface $tokenStorage, PrivateCommentDataMapper $dataMapper)
     {
         $this->user = $tokenStorage->getToken()->getUser();
+        $this->dataMapper = $dataMapper;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('comment', ChillTextareaType::class, [
-                'disable_editor' => $options['disable_editor'],
-                'label' => $options['label'],
-            ]);
-
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
-            $data = $event->getForm()->getData();
-            $privateComment = $event->getData() ?? ['privateComment' => ''];
-
-            if (null !== $data && $data->getComment() !== $privateComment['comment']) {
-                $data->setDate(new DateTime());
-                $data->setUserId($this->user->getId());
-                $event->getForm()->setData($data);
-            }
-        });
+            ->add('comments', ChillTextareaType::class)
+            ->setDataMapper($this->dataMapper);
     }
 
     public function buildView(FormView $view, FormInterface $form, array $options)
@@ -68,7 +63,7 @@ class PrivateCommentType extends AbstractType
             ->setDefined('disable_editor')
             ->setAllowedTypes('disable_editor', 'bool')
             ->setDefaults([
-                'data_class' => CommentEmbeddable::class,
+                'data_class' => PrivateCommentEmbeddable::class,
                 'disable_editor' => false,
             ]);
     }
diff --git a/src/Bundle/ChillMainBundle/config/services/form.yaml b/src/Bundle/ChillMainBundle/config/services/form.yaml
index f2dc7803a..407a1b6af 100644
--- a/src/Bundle/ChillMainBundle/config/services/form.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/form.yaml
@@ -143,3 +143,7 @@ services:
     Chill\MainBundle\Form\Type\LocationFormType: ~
 
     Chill\MainBundle\Form\WorkflowStepType: ~
+
+    Chill\MainBundle\Form\DataMapper\PrivateCommentDataMapper:
+        autowire: true
+        autoconfigure: true
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220426133048.php b/src/Bundle/ChillMainBundle/migrations/Version20220426133048.php
new file mode 100644
index 000000000..2f1fbab1a
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220426133048.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20220426133048 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'add private embeddable comment to activity, calendar and accompanyingperiod work';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE activity ADD privateComment_comments JSON DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_calendar.calendar ADD privateComment_comments JSON DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD privateComment_comments JSON DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP privateComment_comments');
+        $this->addSql('ALTER TABLE activity DROP privateComment_comments');
+        $this->addSql('ALTER TABLE chill_calendar.calendar DROP privateComment_comments');
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
index 91d85883a..fd1156e01 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
@@ -14,6 +14,7 @@ namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
+use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodLinkedWithSocialIssuesEntityInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
@@ -136,10 +137,10 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
     private string $note = '';
 
     /**
-     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="prcomment_")
+     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable", columnPrefix="privateComment_")
      * @Serializer\Groups({"read", "accompanying_period_work:edit", "docgen:read"})
      */
-    private CommentEmbeddable $privateComment;
+    private PrivateCommentEmbeddable $privateComment;
 
     /**
      * @ORM\ManyToMany(targetEntity=Person::class)
@@ -209,7 +210,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
     public function __construct()
     {
         $this->goals = new ArrayCollection();
-        $this->privateComment = new CommentEmbeddable();
+        $this->privateComment = new PrivateCommentEmbeddable();
         $this->results = new ArrayCollection();
         $this->thirdParties = new ArrayCollection();
         $this->persons = new ArrayCollection();
@@ -331,7 +332,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this->note;
     }
 
-    public function getPrivateComment(): CommentEmbeddable
+    public function getPrivateComment(): PrivateCommentEmbeddable
     {
         return $this->privateComment;
     }
@@ -518,7 +519,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this;
     }
 
-    public function setPrivateComment(CommentEmbeddable $privateComment): self
+    public function setPrivateComment(PrivateCommentEmbeddable $privateComment): self
     {
         $this->privateComment = $privateComment;
 

From e8dcb45abbb4796ac3e8b2c7e6a0002d5e1f7cc2 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 27 Apr 2022 11:49:31 +0200
Subject: [PATCH 07/47] remove dump

---
 src/Bundle/ChillActivityBundle/Controller/ActivityController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index 2840e3f27..481997355 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -366,7 +366,6 @@ final class ActivityController extends AbstractController
         if ($request->query->has('activityData')) {
             $activityData = $request->query->get('activityData');
 
-            dump($activityData);
             if (array_key_exists('durationTime', $activityData)) {
                 $durationTimeInMinutes = $activityData['durationTime'];
                 $hours = floor($durationTimeInMinutes / 60);

From 3ed2b36057c5c413bee7b3b90124a5a21431a465 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 27 Apr 2022 11:50:14 +0200
Subject: [PATCH 08/47] privateCommentType adjusted

---
 src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php b/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
index 174326d86..6ab166fe9 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
@@ -43,7 +43,9 @@ class PrivateCommentType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('comments', ChillTextareaType::class)
+            ->add('comments', ChillTextareaType::class, [
+                'label' => 'private comment'
+            ])
             ->setDataMapper($this->dataMapper);
     }
 

From 27ce146aa0bd695d8141bec390da0bea99b0251d Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 27 Apr 2022 11:50:32 +0200
Subject: [PATCH 09/47] Serializer made for privateComment

---
 .../PrivateCommentEmbeddableNormalizer.php    | 56 +++++++++++++++++++
 .../config/services/serializer.yaml           |  3 +
 2 files changed, 59 insertions(+)
 create mode 100644 src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php

diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
new file mode 100644
index 000000000..27e5b21f7
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Serializer\Normalizer;
+
+use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
+use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+class PrivateCommentEmbeddableNormalizer implements NormalizerInterface, DenormalizerInterface
+{
+
+    private Security $security;
+
+    public function __construct(Security $security)
+    {
+        $this->security = $security;
+    }
+
+    public function denormalize($data, string $type, ?string $format = null, array $context = [])
+    {
+        if (null === $data) {
+            return null;
+        }
+
+        $comment = new PrivateCommentEmbeddable();
+
+        $comment->setCommentForUser($this->security->getUser(), $data['privateComment']);
+    }
+
+    public function supportsDenormalization($data, string $type, ?string $format = null)
+    {
+        return $type === CommentEmbeddable::class;
+    }
+
+    public function normalize($comment, $format = null, array $contect = [])
+    {
+        return $comment->getComment();
+    }
+
+    public function supportsNormalization($data, ?string $format = null)
+    {
+        return $data instanceof CommentEmbeddable;
+    }
+
+}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/config/services/serializer.yaml b/src/Bundle/ChillMainBundle/config/services/serializer.yaml
index 4d8aa9954..1084dab71 100644
--- a/src/Bundle/ChillMainBundle/config/services/serializer.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/serializer.yaml
@@ -10,4 +10,7 @@ services:
     Chill\MainBundle\Serializer\Normalizer\DoctrineExistingEntityNormalizer:
         tags:
             - { name: 'serializer.normalizer', priority: 8 }
+    Chill\MainBundle\Serializer\Normalizer\PrivateCommentEmbeddableNormalizer:
+        autowire: true
+        autoconfigure: true
 

From b2003c74a6488ea636dbc63623735940e7623223 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 27 Apr 2022 11:50:53 +0200
Subject: [PATCH 10/47] renderbox for private comments (not working yet)

---
 .../Entity/PrivateCommentRender.php           | 72 +++++++++++++++++++
 .../config/services/templating.yaml           |  4 ++
 2 files changed, 76 insertions(+)
 create mode 100644 src/Bundle/ChillMainBundle/Templating/Entity/PrivateCommentRender.php

diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/PrivateCommentRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/PrivateCommentRender.php
new file mode 100644
index 000000000..d47cb2296
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/PrivateCommentRender.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Templating\Entity;
+
+use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Templating\EngineInterface;
+
+use function array_merge;
+
+class PrivateCommentRender extends AbstractChillEntityRender
+{
+    private EngineInterface $engine;
+
+    private Security $security;
+
+    public function __construct(
+        EngineInterface $engine,
+        Security $security
+    ) {
+        $this->engine = $engine;
+        $this->sercurity = $security;
+    }
+
+    /**
+     * @param PrivateCommentEmbeddable $entity
+     */
+    public function renderBox($entity, array $options): string
+    {
+        // default options
+        $options = array_merge([
+            'user' => [],
+            'disable_markdown' => false,
+            'limit_lines' => null,
+            'metadata' => true,
+        ], $options);
+
+        return $this->engine
+            ->render(
+                '@ChillMain/Entity/CommentEmbeddable.html.twig',
+                [
+                    'opening_box' => $this->getDefaultOpeningBox('comment-embeddable'),
+                    'closing_box' => $this->getDefaultClosingBox(),
+                    'user' => $this->security->getUser() ?? null,
+                    'comment' => $entity->getCommentForUser($this->security->getUser()),
+                    'options' => $options,
+                ]
+            );
+    }
+
+    /**
+     * @param PrivateCommentEmbeddable $entity
+     */
+    public function renderString($entity, array $options): string
+    {
+        return $entity->getCommentForUser($this->security->getUser());
+    }
+
+    public function supports($entity, array $options): bool
+    {
+        return $entity instanceof PrivateCommentEmbeddable;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/config/services/templating.yaml b/src/Bundle/ChillMainBundle/config/services/templating.yaml
index e69700732..bd8d99786 100644
--- a/src/Bundle/ChillMainBundle/config/services/templating.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/templating.yaml
@@ -41,6 +41,10 @@ services:
         tags:
             - { name: 'chill.render_entity' }
 
+    Chill\MainBundle\Templating\Entity\PrivateCommentRender:
+        tags:
+            - { name: 'chill.render_entity' }
+
     Chill\MainBundle\Templating\ChillMarkdownRenderExtension:
         tags:
             - { name: twig.extension }

From e878960da95720671bba6fc253d8e7cc07a5e56b Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 27 Apr 2022 11:51:18 +0200
Subject: [PATCH 11/47] Private comment adjusted for rendez-vous

---
 .../Resources/views/Calendar/new.html.twig    | 34 +++++++++----------
 .../translations/messages.fr.yml              |  4 +--
 .../translations/messages.fr.yml              |  1 +
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig
index 7841f5b46..41adb52cc 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig
@@ -54,22 +54,22 @@
 <div id="fullCalendar"></div>
 
 <ul class="record_actions sticky-form-buttons">
-  <li class="cancel">
-    <a
-      class="btn btn-cancel"
-      {%- if context == 'person' -%}
-      href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'person_id': person.id } )}}"
-      {%- else -%}
-      href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'accompanying_period_id': accompanyingCourse.id } )}}"
-      {%- endif -%}
-      >
-      {{ 'Cancel'|trans|chill_return_path_label }}
-    </a>
-  </li>
-  <li>
-    <button class="btn btn-create" type="submit">
-      {{ 'Create'|trans }}
-    </button>
-  </li>
+    <li class="cancel">
+        <a
+        class="btn btn-cancel"
+        {%- if context == 'person' -%}
+        href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'person_id': person.id } )}}"
+        {%- else -%}
+        href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'accompanying_period_id': accompanyingCourse.id } )}}"
+        {%- endif -%}
+        >
+        {{ 'Cancel'|trans|chill_return_path_label }}
+        </a>
+    </li>
+    <li>
+        <button class="btn btn-create" type="submit">
+        {{ 'Create'|trans }}
+        </button>
+    </li>
 </ul>
 {{ form_end(form) }}
diff --git a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
index 1dbb00bb8..eeb12298f 100644
--- a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
@@ -17,7 +17,7 @@ status: Statut du rendez-vous
 calendar location: Localistion du rendez-vous
 calendar comment: Remarque sur le rendez-vous
 sendSMS: Envoi d'un SMS
-Send s m s: Envoi d'un SMS ? 
+Send s m s: Envoi d'un SMS ?
 Cancel reason: Motif d'annulation
 Add a new calendar: Ajouter un nouveau rendez-vous
 "Success : calendar item updated!": "Rendez-vous mis à jour"
@@ -26,4 +26,4 @@ The calendar item has been successfully removed.: Le rendez-vous a été supprim
 From the day: Du
 to the day: au
 Transform to activity: Transformer en échange
-private comment: Commentaire privé
\ No newline at end of file
+private comment: Notes privé
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 452ad306c..e9a5fce4d 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -65,6 +65,7 @@ Read more: Lire la suite
 
 # comment embeddable
 No comment associated: Aucun commentaire
+private comment: Notes privé
 
 #pagination
 Previous: Précédent

From 4dc56db018a1b7173fd567c3bc71f20d772b1f5a Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 27 Apr 2022 11:51:32 +0200
Subject: [PATCH 12/47] show of activity adjusted for private comment

---
 .../Resources/views/Activity/show.html.twig   | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index 512557491..b6d375933 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -146,19 +146,18 @@
                 </dd>
             {% endif %}
 
-            {% if t.privateCommentVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) and entity.privateComment.userId is same as(app.user.id) %}
-                {% if t.privateCommentLabel is not empty %}
-                    <dt class="inline">{{ t.privateCommentLabel }}</dt>
-                {% else %}
-                    <dt class="inline">{{ 'activity.private comment'|trans }}</dt>
-                {% endif %}
-                <dd>
-                    {%- if entity.privateComment.empty -%}
-                        <span class="chill-no-data-statement">{{ 'No comment associated'|trans }}</span>
-                    {%- else -%}
-                        {{ entity.privateComment|chill_entity_render_box }}
-                    {%- endif -%}
-                </dd>
+            {% if t.privateCommentVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) %}
+                {% set userID = app.user.id %}
+                    {% if userID in entity.privateComment.comments|keys %}
+                        {% if t.privateCommentLabel is not empty %}
+                            <dt class="inline">{{ t.privateCommentLabel }}</dt>
+                        {% else %}
+                            <dt class="inline">{{ 'activity.private comment'|trans }}</dt>
+                        {% endif %}
+                        <dd>
+                            {{ entity.privateComment.comments[userID]|chill_entity_render_box }}
+                        </dd>
+                    {% endif %}
             {% endif %}
 
             {% if t.documentsVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) %}

From c56a125a787aad92bd4b9107d65ed3bd041bac17 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 27 Apr 2022 11:52:01 +0200
Subject: [PATCH 13/47] privateComment for action (not working yet)

---
 .../vuejs/AccompanyingCourseWorkEdit/App.vue  | 58 +++++++++++--------
 .../vuejs/AccompanyingCourseWorkEdit/store.js |  7 +++
 .../ChillPersonBundle/chill.api.specs.yaml    |  2 +
 3 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index 19d253f41..6d0123dc6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -150,12 +150,12 @@
 
          <ul class="list-unstyled">
             <li v-for="p in personsReachables" :key="p.id">
-              <div class="form-check">
-                <input v-model="personsPicked" :value="p.id" type="checkbox" class="me-2 form-check-input" :id="'person_check'+p.id">
-                <label :for="'person_check'+p.id" class="form-check-label">
-                  <person-text :person="p"></person-text>
-               </label>
-              </div>
+               <div class="form-check">
+                  <input v-model="personsPicked" :value="p.id" type="checkbox" class="me-2 form-check-input" :id="'person_check'+p.id">
+                  <label :for="'person_check'+p.id" class="form-check-label">
+                     <person-text :person="p"></person-text>
+                  </label>
+               </div>
             </li>
          </ul>
       </div>
@@ -283,18 +283,18 @@
       </div>
 
    </div>
-  <ul class="record_actions sticky-form-buttons">
-    <li>
-       <list-workflow-modal
-          :workflows="this.work.workflows"
-          :allowCreate="true"
-          relatedEntityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork"
-          :relatedEntityId="this.work.id"
-          :workflowsAvailables="this.work.workflows_availables"
-          :preventDefaultMoveToGenerate="true"
-          @go-to-generate-workflow="goToGenerateWorkflow"
-       ></list-workflow-modal>
-    </li>
+   <ul class="record_actions sticky-form-buttons">
+      <li>
+         <list-workflow-modal
+            :workflows="this.work.workflows"
+            :allowCreate="true"
+            relatedEntityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork"
+            :relatedEntityId="this.work.id"
+            :workflowsAvailables="this.work.workflows_availables"
+            :preventDefaultMoveToGenerate="true"
+            @go-to-generate-workflow="goToGenerateWorkflow"
+         ></list-workflow-modal>
+      </li>
 
       <li v-if="!isPosting">
          <button class="btn btn-save" @click="submit">
@@ -426,8 +426,8 @@ export default {
          },
       };
    },
-  computed: {
-    ...mapState([
+   computed: {
+      ...mapState([
          'work',
          'resultsForAction',
          'evaluationsForAction',
@@ -470,6 +470,14 @@ export default {
             this.$store.commit('setNote', v);
          }
       },
+      privateComment: {
+         get() {
+            return this.$store.state.privateComment;
+         },
+         set(v) {
+            this.$store.commit('setPrivateComment', v);
+         }
+      },
       availableForCheckGoal() {
          let pickedIds = this.$store.state.goalsPicked.map(g => g.goal.id);
 
@@ -530,12 +538,12 @@ export default {
          this.$store.commit('removeReferrer', u);
       },
       goToGenerateWorkflow({link}) {
-        console.log('save before leave to generate workflow')
-        const callback = (data) => {
-          window.location.assign(link);
-        };
+         console.log('save before leave to generate workflow')
+         const callback = (data) => {
+            window.location.assign(link);
+         };
 
-        return this.$store.dispatch('submit', callback)
+         return this.$store.dispatch('submit', callback)
             .catch(e => { console.log(e); throw e; });
       },
       submit() {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
index 4ce0b8ebe..3b059fdcc 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
@@ -17,6 +17,7 @@ const store = createStore({
     endDate: window.accompanyingCourseWork.endDate !== null ?
         ISOToDatetime(window.accompanyingCourseWork.endDate.datetime) : null,
     note: window.accompanyingCourseWork.note,
+    privateComment: window.accompanyingCourseWork.privateComment,
     goalsPicked: window.accompanyingCourseWork.goals,
     goalsForAction: [],
     resultsPicked: window.accompanyingCourseWork.results,
@@ -79,6 +80,7 @@ const store = createStore({
           datetime: datetimeToISO(state.endDate)
         },
         note: state.note,
+        privateComment: state.privateComment,
         persons: state.personsPicked.map(p => ({id: p.id, type: p.type})),
         handlingThierParty: state.handlingThirdParty === null ? null : {
           id: state.handlingThirdParty.id,
@@ -296,6 +298,9 @@ const store = createStore({
     setNote(state, note) {
       state.note = note;
     },
+    setPrivateComment(state, privateComment) {
+      state.privateComment = privateComment;
+    },
     setHandlingThirdParty(state, thirdParty) {
       state.handlingThirdParty = thirdParty;
     },
@@ -453,6 +458,8 @@ const store = createStore({
       ;
       commit('setIsPosting', true);
 
+      console.log('payload', payload);
+
       return makeFetch('PUT', url, payload)
         .then(data => {
           if (typeof(callback) !== 'undefined') {
diff --git a/src/Bundle/ChillPersonBundle/chill.api.specs.yaml b/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
index e6fefa5df..b192fb2cb 100644
--- a/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
@@ -223,6 +223,8 @@ components:
             - "accompanying_period_work"
         note:
           type: string
+        privateComment:
+          type: string
         startDate:
           $ref: "#/components/schemas/Date"
         endDate:

From c629dd79cb5ec6cfabc5b2e49177b275fbaf247f Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 2 May 2022 14:01:07 +0200
Subject: [PATCH 14/47] fix serialization - deserialization

---
 .../PrivateCommentEmbeddableNormalizer.php     | 18 ++++++++++--------
 .../config/services/serializer.yaml            |  2 ++
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
index 27e5b21f7..447b8ddf8 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
@@ -27,7 +27,7 @@ class PrivateCommentEmbeddableNormalizer implements NormalizerInterface, Denorma
         $this->security = $security;
     }
 
-    public function denormalize($data, string $type, ?string $format = null, array $context = [])
+    public function denormalize($data, string $type, ?string $format = null, array $context = []): PrivateCommentEmbeddable
     {
         if (null === $data) {
             return null;
@@ -35,22 +35,24 @@ class PrivateCommentEmbeddableNormalizer implements NormalizerInterface, Denorma
 
         $comment = new PrivateCommentEmbeddable();
 
-        $comment->setCommentForUser($this->security->getUser(), $data['privateComment']);
+        $comment->setCommentForUser($this->security->getUser(), $data);
+
+        return $comment;
     }
 
-    public function supportsDenormalization($data, string $type, ?string $format = null)
+    public function supportsDenormalization($data, string $type, ?string $format = null): bool
     {
-        return $type === CommentEmbeddable::class;
+        return $type === PrivateCommentEmbeddable::class;
     }
 
-    public function normalize($comment, $format = null, array $contect = [])
+    public function normalize($comment, $format = null, array $contect = []): string
     {
-        return $comment->getComment();
+        return $comment->getCommentForUser($this->security->getUser());
     }
 
-    public function supportsNormalization($data, ?string $format = null)
+    public function supportsNormalization($data, ?string $format = null): bool
     {
-        return $data instanceof CommentEmbeddable;
+        return $data instanceof PrivateCommentEmbeddable;
     }
 
 }
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/config/services/serializer.yaml b/src/Bundle/ChillMainBundle/config/services/serializer.yaml
index 1084dab71..5ec936b6c 100644
--- a/src/Bundle/ChillMainBundle/config/services/serializer.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/serializer.yaml
@@ -13,4 +13,6 @@ services:
     Chill\MainBundle\Serializer\Normalizer\PrivateCommentEmbeddableNormalizer:
         autowire: true
         autoconfigure: true
+        tags:
+            - { name: 'serializer.normalizer', priority: 64 }
 

From acee0ade24dec7de24ee6e2c1c9e8d80bbeb7c93 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 2 May 2022 14:01:41 +0200
Subject: [PATCH 15/47] add merge method

---
 .../Embeddable/PrivateCommentEmbeddable.php      | 16 ++++++++++++++++
 .../AccompanyingPeriodWork.php                   |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
index 70374749c..f3e35bb1f 100644
--- a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
+++ b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
@@ -41,4 +41,20 @@ class PrivateCommentEmbeddable
 
         return $this;
     }
+
+    public function setComments($comments)
+    {
+        $this->comments = $comments;
+
+        return $this;
+    }
+
+    public function merge(PrivateCommentEmbeddable $newComment): self
+    {
+        $mergedComments = $newComment->getComments() + $this->getComments();
+
+        $this->setComments($mergedComments);
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
index fd1156e01..8ea1028f8 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
@@ -138,7 +138,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
 
     /**
      * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable", columnPrefix="privateComment_")
-     * @Serializer\Groups({"read", "accompanying_period_work:edit", "docgen:read"})
+     * @Serializer\Groups({"read", "accompanying_period_work:edit"})
      */
     private PrivateCommentEmbeddable $privateComment;
 
@@ -521,7 +521,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
 
     public function setPrivateComment(PrivateCommentEmbeddable $privateComment): self
     {
-        $this->privateComment = $privateComment;
+        $this->privateComment->merge($privateComment);
 
         return $this;
     }

From 1b6e84262ba04675984d0639ad01e0645dc988f3 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 2 May 2022 15:27:44 +0200
Subject: [PATCH 16/47] add translation

---
 .../vuejs/AccompanyingCourseWorkEdit/App.vue  | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index 6d0123dc6..ff6c46748 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -24,6 +24,15 @@
          <input v-model="endDate" type="date" class="form-control" />
       </div>
 
+      <div id="private_comment" class="action-row">
+         <label class="col-form-label">{{ $t('private_comment') }}</label>
+         <ckeditor
+            v-model="privateComment"
+            :editor="editor"
+            tag-name="textarea"
+         ></ckeditor>
+      </div>
+
       <div id="comment" class="action-row">
          <label class="col-form-label">{{ $t('comments') }}</label>
          <ckeditor
@@ -33,14 +42,6 @@
          ></ckeditor>
       </div>
 
-      <div id="private_comment" class="action-row">
-         <label class="col-form-label">{{ $t('private comment') }}</label>
-         <ckeditor
-            v-model="privateComment"
-            :editor="editor"
-            tag-name="textarea"
-         ></ckeditor>
-      </div>
 
       <div id="objectives" class="action-row">
          <div aria="hidden" class="title">
@@ -364,7 +365,8 @@ const i18n = {
          referrers: "Agents traitants",
          no_referrers: "Aucun agent traitant",
          choose_referrers: "Choisir des agents traitants",
-         remove_referrer: "Enlever l'agent"
+         remove_referrer: "Enlever l'agent",
+         private_comment: "Commentaire privé"
       }
    }
 };

From 3122098447e9c64ab7e4e6f350620d31e370931e Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 2 May 2022 16:29:47 +0200
Subject: [PATCH 17/47] remove privateCommentRender

---
 .../Entity/PrivateCommentRender.php           | 72 -------------------
 .../config/services/templating.yaml           |  4 --
 2 files changed, 76 deletions(-)
 delete mode 100644 src/Bundle/ChillMainBundle/Templating/Entity/PrivateCommentRender.php

diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/PrivateCommentRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/PrivateCommentRender.php
deleted file mode 100644
index d47cb2296..000000000
--- a/src/Bundle/ChillMainBundle/Templating/Entity/PrivateCommentRender.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/**
- * 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.
- */
-
-declare(strict_types=1);
-
-namespace Chill\MainBundle\Templating\Entity;
-
-use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
-use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Templating\EngineInterface;
-
-use function array_merge;
-
-class PrivateCommentRender extends AbstractChillEntityRender
-{
-    private EngineInterface $engine;
-
-    private Security $security;
-
-    public function __construct(
-        EngineInterface $engine,
-        Security $security
-    ) {
-        $this->engine = $engine;
-        $this->sercurity = $security;
-    }
-
-    /**
-     * @param PrivateCommentEmbeddable $entity
-     */
-    public function renderBox($entity, array $options): string
-    {
-        // default options
-        $options = array_merge([
-            'user' => [],
-            'disable_markdown' => false,
-            'limit_lines' => null,
-            'metadata' => true,
-        ], $options);
-
-        return $this->engine
-            ->render(
-                '@ChillMain/Entity/CommentEmbeddable.html.twig',
-                [
-                    'opening_box' => $this->getDefaultOpeningBox('comment-embeddable'),
-                    'closing_box' => $this->getDefaultClosingBox(),
-                    'user' => $this->security->getUser() ?? null,
-                    'comment' => $entity->getCommentForUser($this->security->getUser()),
-                    'options' => $options,
-                ]
-            );
-    }
-
-    /**
-     * @param PrivateCommentEmbeddable $entity
-     */
-    public function renderString($entity, array $options): string
-    {
-        return $entity->getCommentForUser($this->security->getUser());
-    }
-
-    public function supports($entity, array $options): bool
-    {
-        return $entity instanceof PrivateCommentEmbeddable;
-    }
-}
diff --git a/src/Bundle/ChillMainBundle/config/services/templating.yaml b/src/Bundle/ChillMainBundle/config/services/templating.yaml
index bd8d99786..e69700732 100644
--- a/src/Bundle/ChillMainBundle/config/services/templating.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/templating.yaml
@@ -41,10 +41,6 @@ services:
         tags:
             - { name: 'chill.render_entity' }
 
-    Chill\MainBundle\Templating\Entity\PrivateCommentRender:
-        tags:
-            - { name: 'chill.render_entity' }
-
     Chill\MainBundle\Templating\ChillMarkdownRenderExtension:
         tags:
             - { name: twig.extension }

From ae624d25fce2954153c5b037b08af67b277b8d26 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 2 May 2022 16:49:32 +0200
Subject: [PATCH 18/47] fix display of privateComment for action

---
 .../public/vuejs/AccompanyingCourseWorkEdit/App.vue          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index ff6c46748..fe5700f4d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -24,7 +24,7 @@
          <input v-model="endDate" type="date" class="form-control" />
       </div>
 
-      <div id="private_comment" class="action-row">
+      <div id="privateComment" class="action-row">
          <label class="col-form-label">{{ $t('private_comment') }}</label>
          <ckeditor
             v-model="privateComment"
@@ -592,6 +592,7 @@ div#workEditor {
       "title title"
       "startDate endDate"
       "comment comment"
+      "privateComment privateComment"
       "objectives objectives"
       "evaluations evaluations"
       "persons persons"
@@ -608,6 +609,8 @@ div#workEditor {
       grid-area: endDate; }
    #comment {
       grid-area: comment; }
+   #privateComment {
+      grid-area: privateComment; }
    #objectives {
       grid-area: objectives; }
    #evaluations {

From 02a8f5a863a0802668041d1dd6c43e68d651fc62 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 2 May 2022 16:50:24 +0200
Subject: [PATCH 19/47] Fix display privateComment in activity

---
 .../Resources/views/Activity/show.html.twig   | 34 +++++++++++--------
 .../Resources/public/chill/chillmain.scss     |  4 +++
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index b6d375933..1cb501817 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -1,4 +1,5 @@
 {%- set t = entity.type -%}
+{% set userId = app.user.id %}
 {%- import "@ChillDocStore/Macro/macro.html.twig" as m -%}
 
 <h1>{{ "Activity"|trans }}</h1>
@@ -146,20 +147,6 @@
                 </dd>
             {% endif %}
 
-            {% if t.privateCommentVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) %}
-                {% set userID = app.user.id %}
-                    {% if userID in entity.privateComment.comments|keys %}
-                        {% if t.privateCommentLabel is not empty %}
-                            <dt class="inline">{{ t.privateCommentLabel }}</dt>
-                        {% else %}
-                            <dt class="inline">{{ 'activity.private comment'|trans }}</dt>
-                        {% endif %}
-                        <dd>
-                            {{ entity.privateComment.comments[userID]|chill_entity_render_box }}
-                        </dd>
-                    {% endif %}
-            {% endif %}
-
             {% if t.documentsVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) %}
                 <dt class="inline">{{ 'Documents'|trans }}</dt>
                 <dd>
@@ -191,6 +178,25 @@
     </div>
 </div>
 
+{% if t.privateCommentVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) and userId in entity.privateComment.comments|keys %}
+<div class="flex-table">
+    <div class="item-bloc">
+        {% if t.privateCommentLabel is not empty %}
+            <dt class="inline">{{ t.privateCommentLabel }}</dt>
+        {% else %}
+            <dt class="inline">{{ 'activity.private comment'|trans }}</dt>
+        {% endif %}
+        <dd>
+            <section class="chill-entity entity-comment-embeddable">
+                <blockquote class="chill-user-quote private-quote">
+                    {{ entity.privateComment.comments[userId] }}
+                </blockquote>
+            </section>
+        </dd>
+    </div>
+</div>
+{% endif %}
+
 <div class="notification notification-list">
     {% set notifications =  chill_list_notifications('Chill\\ActivityBundle\\Entity\\Activity', entity.id) %}
     {% if notifications is not empty %}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
index 1750533f8..13a82a786 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
@@ -277,6 +277,10 @@ table.table-bordered {
    }
 }
 
+.private-quote {
+   border-left: 10px solid $pink;
+}
+
 /// meta-data
 div.createdBy,
 div.updatedBy,

From 0e0e0799d1d2a8950e713c678211d3b840d4376f Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 2 May 2022 16:51:14 +0200
Subject: [PATCH 20/47] translation added

---
 src/Bundle/ChillPersonBundle/translations/messages.fr.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 2a4077e1c..35c0e8b02 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -527,6 +527,8 @@ accompanying_course_work:
     Any work: Aucune action d'accompagnement
     remove: Supprimer une action d'accompagnement
     social_evaluation: Évaluation
+    private_comment: Commentaire privé
+
 
 #
 Person addresses: Adresses de résidence

From 784a725ce39e3772cb0c67700d0adbb5ce6aad03 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 4 May 2022 09:34:16 +0200
Subject: [PATCH 21/47] fix translation

---
 .../ChillActivityBundle/Resources/views/Activity/show.html.twig | 2 +-
 src/Bundle/ChillActivityBundle/translations/messages.fr.yml     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index 1cb501817..65134a754 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -184,7 +184,7 @@
         {% if t.privateCommentLabel is not empty %}
             <dt class="inline">{{ t.privateCommentLabel }}</dt>
         {% else %}
-            <dt class="inline">{{ 'activity.private comment'|trans }}</dt>
+            <dt class="inline">{{ 'Private comment'|trans }}</dt>
         {% endif %}
         <dd>
             <section class="chill-entity entity-comment-embeddable">
diff --git a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
index 80de45c2d..55c062a4a 100644
--- a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
@@ -44,6 +44,7 @@ Received: Recevoir
 by: 'Par '
 location: Lieu
 Reasons: Sujets
+Private comment: Commentaire privé
 
 
 #forms

From 416a88b93d0d921dc53c27f49a89a85d1f87ac4a Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 4 May 2022 12:30:44 +0200
Subject: [PATCH 22/47] fix form and take null cases into account

---
 src/Bundle/ChillActivityBundle/Form/ActivityType.php         | 1 +
 .../Resources/views/Activity/new.html.twig                   | 5 ++++-
 .../Entity/Embeddable/PrivateCommentEmbeddable.php           | 5 ++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityType.php b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
index 7b9f24705..0fa2fdf76 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -20,6 +20,7 @@ use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\Type\ChillCollectionType;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\CommentType;
+use Chill\MainBundle\Form\Type\PrivateCommentType;
 use Chill\MainBundle\Form\Type\ScopePickerType;
 use Chill\MainBundle\Form\Type\UserPickerType;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
index 8e078702c..6f6e1fe53 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
@@ -81,10 +81,13 @@
 {% endif %}
 
 {%- if form.comment is defined -%}
-    {# TODO .. public and private #}
     {{ form_row(form.comment) }}
 {% endif %}
 
+{%- if form.privateComment is defined -%}
+    {{ form_row(form.privateComment) }}
+{% endif %}
+
 {%- if form.attendee is defined -%}
     {{ form_row(form.attendee) }}
 {% endif %}
diff --git a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
index f3e35bb1f..f7fd41cb5 100644
--- a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
+++ b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
@@ -51,7 +51,10 @@ class PrivateCommentEmbeddable
 
     public function merge(PrivateCommentEmbeddable $newComment): self
     {
-        $mergedComments = $newComment->getComments() + $this->getComments();
+
+        $currentComments = null === $this->getComments() ? [] : $this->getComments();
+
+        $mergedComments = $newComment->getComments() + $currentComments;
 
         $this->setComments($mergedComments);
 

From e19cac168b9c64d38a142eeafe2d201be4beb080 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 4 May 2022 13:00:46 +0200
Subject: [PATCH 23/47] php csfixes

---
 .../ChillActivityBundle/Entity/Activity.php   | 36 +++++-----
 .../Entity/ActivityType.php                   | 68 +++++++++----------
 .../ChillActivityBundle/Form/ActivityType.php |  4 +-
 .../migrations/Version20220425133027.php      | 21 ++++--
 .../ChillCalendarBundle/Entity/Calendar.php   | 36 +++++-----
 .../ChillCalendarBundle/Form/CalendarType.php |  2 +-
 .../Embeddable/PrivateCommentEmbeddable.php   | 28 ++++----
 .../DataMapper/PrivateCommentDataMapper.php   |  6 +-
 .../Form/Type/PrivateCommentType.php          | 12 +---
 .../PrivateCommentEmbeddableNormalizer.php    | 15 ++--
 .../migrations/Version20220426133048.php      | 23 ++++---
 .../AccompanyingPeriodWork.php                | 23 +++----
 12 files changed, 136 insertions(+), 138 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php
index 4b329a0a2..db0d5c7d1 100644
--- a/src/Bundle/ChillActivityBundle/Entity/Activity.php
+++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php
@@ -87,12 +87,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
      */
     private CommentEmbeddable $comment;
 
-    /**
-     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable", columnPrefix="privateComment_")
-     * @Groups({"docgen:read"})
-     */
-    private PrivateCommentEmbeddable $privateComment;
-
     /**
      * @ORM\Column(type="datetime")
      * @Groups({"docgen:read"})
@@ -141,6 +135,12 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
      */
     private ?Collection $persons = null;
 
+    /**
+     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable", columnPrefix="privateComment_")
+     * @Groups({"docgen:read"})
+     */
+    private PrivateCommentEmbeddable $privateComment;
+
     /**
      * @ORM\ManyToMany(targetEntity="Chill\ActivityBundle\Entity\ActivityReason")
      * @Groups({"docgen:read"})
@@ -321,11 +321,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this->comment;
     }
 
-    public function getPrivateComment(): PrivateCommentEmbeddable
-    {
-        return $this->privateComment;
-    }
-
     public function getDate(): DateTime
     {
         return $this->date;
@@ -413,6 +408,11 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return [];
     }
 
+    public function getPrivateComment(): PrivateCommentEmbeddable
+    {
+        return $this->privateComment;
+    }
+
     public function getReasons(): Collection
     {
         return $this->reasons;
@@ -550,13 +550,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this;
     }
 
-    public function setPrivateComment(PrivateCommentEmbeddable $privateComment): self
-    {
-        $this->privateComment = $privateComment;
-
-        return $this;
-    }
-
     public function setDate(DateTime $date): self
     {
         $this->date = $date;
@@ -606,6 +599,13 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this;
     }
 
+    public function setPrivateComment(PrivateCommentEmbeddable $privateComment): self
+    {
+        $this->privateComment = $privateComment;
+
+        return $this;
+    }
+
     public function setReasons(?ArrayCollection $reasons): self
     {
         $this->reasons = $reasons;
diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
index deb28184c..845b31ca2 100644
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
@@ -76,16 +76,6 @@ class ActivityType
      */
     private int $commentVisible = self::FIELD_OPTIONAL;
 
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default": ""})
-     */
-    private string $privateCommentLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
-     */
-    private int $privateCommentVisible = self::FIELD_OPTIONAL;
-
     /**
      * @ORM\Column(type="string", nullable=false, options={"default": ""})
      */
@@ -177,6 +167,16 @@ class ActivityType
      */
     private int $personVisible = self::FIELD_REQUIRED;
 
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default": ""})
+     */
+    private string $privateCommentLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     */
+    private int $privateCommentVisible = self::FIELD_OPTIONAL;
+
     /**
      * @ORM\Column(type="string", nullable=false, options={"default": ""})
      */
@@ -324,16 +324,6 @@ class ActivityType
         return $this->commentVisible;
     }
 
-    public function getPrivateCommentLabel(): string
-    {
-        return $this->privateCommentLabel;
-    }
-
-    public function getPrivateCommentVisible(): int
-    {
-        return $this->privateCommentVisible;
-    }
-
     public function getDateLabel(): string
     {
         return $this->dateLabel;
@@ -436,6 +426,16 @@ class ActivityType
         return $this->personVisible;
     }
 
+    public function getPrivateCommentLabel(): string
+    {
+        return $this->privateCommentLabel;
+    }
+
+    public function getPrivateCommentVisible(): int
+    {
+        return $this->privateCommentVisible;
+    }
+
     public function getReasonsLabel(): string
     {
         return $this->reasonsLabel;
@@ -593,20 +593,6 @@ class ActivityType
         return $this;
     }
 
-    public function setPrivateCommentLabel(string $privateCommentLabel): self
-    {
-        $this->privateCommentLabel = $privateCommentLabel;
-
-        return $this;
-    }
-
-    public function setPrivateCommentVisible(int $privateCommentVisible): self
-    {
-        $this->privateCommentVisible = $privateCommentVisible;
-
-        return $this;
-    }
-
     public function setDateLabel(string $dateLabel): self
     {
         $this->dateLabel = $dateLabel;
@@ -722,6 +708,20 @@ class ActivityType
         return $this;
     }
 
+    public function setPrivateCommentLabel(string $privateCommentLabel): self
+    {
+        $this->privateCommentLabel = $privateCommentLabel;
+
+        return $this;
+    }
+
+    public function setPrivateCommentVisible(int $privateCommentVisible): self
+    {
+        $this->privateCommentVisible = $privateCommentVisible;
+
+        return $this;
+    }
+
     public function setReasonsLabel(string $reasonsLabel): self
     {
         $this->reasonsLabel = $reasonsLabel;
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityType.php b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
index 0fa2fdf76..4361158e5 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -252,10 +252,10 @@ class ActivityType extends AbstractType
             ]);
         }
 
-        if($activityType->isVisible('privateComment')) {
+        if ($activityType->isVisible('privateComment')) {
             $builder->add('privateComment', PrivateCommentType::class, [
                 'label' => empty($activityType->getLabel('privateComment')) ? 'activity.private comment' : $activityType->getPrivateCommentLabel(),
-                'required' => false
+                'required' => false,
             ]);
         }
 
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php b/src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php
index c29f2d66e..d5243b259 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * 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.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Activity;
@@ -12,6 +19,13 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20220425133027 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE activitytype DROP privateCommentLabel');
+        $this->addSql('ALTER TABLE activitytype DROP privateCommentVisible');
+    }
+
     public function getDescription(): string
     {
         return 'add private comment option to activity types';
@@ -23,11 +37,4 @@ final class Version20220425133027 extends AbstractMigration
         $this->addSql('ALTER TABLE activitytype ADD privateCommentLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
         $this->addSql('ALTER TABLE activitytype ADD privateCommentVisible SMALLINT DEFAULT 1 NOT NULL');
     }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE activitytype DROP privateCommentLabel');
-        $this->addSql('ALTER TABLE activitytype DROP privateCommentVisible');
-    }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
index 4783e70b6..c40bddb44 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
@@ -71,12 +71,6 @@ class Calendar
      */
     private CommentEmbeddable $comment;
 
-    /**
-     * @ORM\Embedded(class=PrivateCommentEmbeddable::class, columnPrefix="privateComment_")
-     * @Serializer\Groups({"calendar:read"})
-     */
-    private PrivateCommentEmbeddable $privateComment;
-
     /**
      * @ORM\Column(type="datetimetz_immutable")
      * @Serializer\Groups({"calendar:read"})
@@ -122,6 +116,12 @@ class Calendar
      */
     private Collection $persons;
 
+    /**
+     * @ORM\Embedded(class=PrivateCommentEmbeddable::class, columnPrefix="privateComment_")
+     * @Serializer\Groups({"calendar:read"})
+     */
+    private PrivateCommentEmbeddable $privateComment;
+
     /**
      * @ORM\ManyToMany(
      *     targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty",
@@ -216,11 +216,6 @@ class Calendar
         return $this->comment;
     }
 
-    public function getPrivateComment(): PrivateCommentEmbeddable
-    {
-        return $this->privateComment;
-    }
-
     public function getEndDate(): ?DateTimeImmutable
     {
         return $this->endDate;
@@ -291,6 +286,11 @@ class Calendar
         return [];
     }
 
+    public function getPrivateComment(): PrivateCommentEmbeddable
+    {
+        return $this->privateComment;
+    }
+
     /**
      * @return Collection|ThirdParty[]
      */
@@ -399,13 +399,6 @@ class Calendar
         return $this;
     }
 
-    public function setPrivateComment(PrivateCommentEmbeddable $privateComment): self
-    {
-        $this->privateComment = $privateComment;
-
-        return $this;
-    }
-
     public function setEndDate(DateTimeImmutable $endDate): self
     {
         $this->endDate = $endDate;
@@ -427,6 +420,13 @@ class Calendar
         return $this;
     }
 
+    public function setPrivateComment(PrivateCommentEmbeddable $privateComment): self
+    {
+        $this->privateComment = $privateComment;
+
+        return $this;
+    }
+
     public function setSendSMS(?bool $sendSMS): self
     {
         $this->sendSMS = $sendSMS;
diff --git a/src/Bundle/ChillCalendarBundle/Form/CalendarType.php b/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
index 7269b2a66..b1dccb5fd 100644
--- a/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
+++ b/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
@@ -54,7 +54,7 @@ class CalendarType extends AbstractType
             ])
             ->add('privateComment', PrivateCommentType::class, [
                 'required' => false,
-                'label' => 'private comment'
+                'label' => 'private comment',
             ])
             // ->add('cancelReason', EntityType::class, [
             //     'required' => false,
diff --git a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
index f7fd41cb5..cfca2a86c 100644
--- a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
+++ b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
@@ -24,15 +24,25 @@ class PrivateCommentEmbeddable
      */
     private ?array $comments = [];
 
+    public function getCommentForUser(User $user): string
+    {
+        return $this->comments[$user->getId()] ?? '';
+    }
+
     public function getComments(): ?array
     {
         return $this->comments;
     }
 
-
-    public function getCommentForUser(User $user): string
+    public function merge(PrivateCommentEmbeddable $newComment): self
     {
-        return $this->comments[$user->getId()] ?? '';
+        $currentComments = null === $this->getComments() ? [] : $this->getComments();
+
+        $mergedComments = $newComment->getComments() + $currentComments;
+
+        $this->setComments($mergedComments);
+
+        return $this;
     }
 
     public function setCommentForUser(User $user, string $content): self
@@ -48,16 +58,4 @@ class PrivateCommentEmbeddable
 
         return $this;
     }
-
-    public function merge(PrivateCommentEmbeddable $newComment): self
-    {
-
-        $currentComments = null === $this->getComments() ? [] : $this->getComments();
-
-        $mergedComments = $newComment->getComments() + $currentComments;
-
-        $this->setComments($mergedComments);
-
-        return $this;
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/DataMapper/PrivateCommentDataMapper.php b/src/Bundle/ChillMainBundle/Form/DataMapper/PrivateCommentDataMapper.php
index 5d4cd08cd..2c03c59f1 100644
--- a/src/Bundle/ChillMainBundle/Form/DataMapper/PrivateCommentDataMapper.php
+++ b/src/Bundle/ChillMainBundle/Form/DataMapper/PrivateCommentDataMapper.php
@@ -19,7 +19,6 @@ use Symfony\Component\Security\Core\Security;
 
 final class PrivateCommentDataMapper extends AbstractType implements DataMapperInterface
 {
-
     private Security $security;
 
     public function __construct(Security $security)
@@ -40,8 +39,6 @@ final class PrivateCommentDataMapper extends AbstractType implements DataMapperI
         $forms = iterator_to_array($forms);
 
         $forms['comments']->setData($viewData->getCommentForUser($this->security->getUser()));
-
-
     }
 
     public function mapFormsToData($forms, &$viewData)
@@ -50,5 +47,4 @@ final class PrivateCommentDataMapper extends AbstractType implements DataMapperI
 
         $viewData->setCommentForUser($this->security->getUser(), $forms['comments']->getData());
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php b/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
index 6ab166fe9..8ce33face 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
@@ -11,17 +11,11 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Form\Type;
 
-use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
 use Chill\MainBundle\Form\DataMapper\PrivateCommentDataMapper;
-use DateTime;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\CollectionType;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\FormEvent;
-use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -30,10 +24,10 @@ use Symfony\Component\Security\Core\User\UserInterface;
 
 class PrivateCommentType extends AbstractType
 {
-    protected UserInterface $user;
-
     protected PrivateCommentDataMapper $dataMapper;
 
+    protected UserInterface $user;
+
     public function __construct(TokenStorageInterface $tokenStorage, PrivateCommentDataMapper $dataMapper)
     {
         $this->user = $tokenStorage->getToken()->getUser();
@@ -44,7 +38,7 @@ class PrivateCommentType extends AbstractType
     {
         $builder
             ->add('comments', ChillTextareaType::class, [
-                'label' => 'private comment'
+                'label' => 'private comment',
             ])
             ->setDataMapper($this->dataMapper);
     }
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
index 447b8ddf8..a1ff7e5ba 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Serializer\Normalizer;
 
-use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
@@ -19,7 +18,6 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 class PrivateCommentEmbeddableNormalizer implements NormalizerInterface, DenormalizerInterface
 {
-
     private Security $security;
 
     public function __construct(Security $security)
@@ -40,19 +38,18 @@ class PrivateCommentEmbeddableNormalizer implements NormalizerInterface, Denorma
         return $comment;
     }
 
-    public function supportsDenormalization($data, string $type, ?string $format = null): bool
-    {
-        return $type === PrivateCommentEmbeddable::class;
-    }
-
     public function normalize($comment, $format = null, array $contect = []): string
     {
         return $comment->getCommentForUser($this->security->getUser());
     }
 
+    public function supportsDenormalization($data, string $type, ?string $format = null): bool
+    {
+        return PrivateCommentEmbeddable::class === $type;
+    }
+
     public function supportsNormalization($data, ?string $format = null): bool
     {
         return $data instanceof PrivateCommentEmbeddable;
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220426133048.php b/src/Bundle/ChillMainBundle/migrations/Version20220426133048.php
index 2f1fbab1a..94f866e9b 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220426133048.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220426133048.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * 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.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Main;
@@ -12,6 +19,14 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20220426133048 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP privateComment_comments');
+        $this->addSql('ALTER TABLE activity DROP privateComment_comments');
+        $this->addSql('ALTER TABLE chill_calendar.calendar DROP privateComment_comments');
+    }
+
     public function getDescription(): string
     {
         return 'add private embeddable comment to activity, calendar and accompanyingperiod work';
@@ -24,12 +39,4 @@ final class Version20220426133048 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_calendar.calendar ADD privateComment_comments JSON DEFAULT NULL');
         $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD privateComment_comments JSON DEFAULT NULL');
     }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP privateComment_comments');
-        $this->addSql('ALTER TABLE activity DROP privateComment_comments');
-        $this->addSql('ALTER TABLE chill_calendar.calendar DROP privateComment_comments');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
index 8ea1028f8..9c0eade3b 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
@@ -13,7 +13,6 @@ namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
-use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodLinkedWithSocialIssuesEntityInterface;
@@ -136,12 +135,6 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
      */
     private string $note = '';
 
-    /**
-     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable", columnPrefix="privateComment_")
-     * @Serializer\Groups({"read", "accompanying_period_work:edit"})
-     */
-    private PrivateCommentEmbeddable $privateComment;
-
     /**
      * @ORM\ManyToMany(targetEntity=Person::class)
      * @ORM\JoinTable(name="chill_person_accompanying_period_work_person")
@@ -151,6 +144,12 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
      */
     private Collection $persons;
 
+    /**
+     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable", columnPrefix="privateComment_")
+     * @Serializer\Groups({"read", "accompanying_period_work:edit"})
+     */
+    private PrivateCommentEmbeddable $privateComment;
+
     /**
      * @ORM\ManyToMany(targetEntity=User::class)
      * @ORM\JoinTable(name="chill_person_accompanying_period_work_referrer")
@@ -332,16 +331,16 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this->note;
     }
 
-    public function getPrivateComment(): PrivateCommentEmbeddable
-    {
-        return $this->privateComment;
-    }
-
     public function getPersons(): Collection
     {
         return $this->persons;
     }
 
+    public function getPrivateComment(): PrivateCommentEmbeddable
+    {
+        return $this->privateComment;
+    }
+
     /**
      * @return Collection|User[]
      */

From 6567143ff53d43ffc8d76341e2e92f66e3c7bfc2 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 4 May 2022 15:14:17 +0200
Subject: [PATCH 24/47] update job if users assigns him/herself as referrer and
 job is not null

---
 .../public/vuejs/AccompanyingCourse/store/index.js   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index 57415565b..c5150b015 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -253,7 +253,6 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                state.accompanyingCourse.administrativeLocation = value;
             },
             updateReferrer(state, value) {
-               //console.log('value', value);
                state.accompanyingCourse.user = value;
             },
             updateJob(state, value) {
@@ -775,9 +774,7 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                      throw error;
                   })
             },
-            updateReferrer({ commit }, payload) {
-               console.log('update referrer', payload);
-               console.log('payload !== null', payload !== null);
+            updateReferrer({ commit, state }, payload) {
                const url = `/api/1.0/person/accompanying-course/${id}.json`;
                let body = { type: "accompanying_period", user: null };
 
@@ -788,7 +785,10 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                return makeFetch('PATCH', url, body)
                   .then((response) => {
                      commit('updateReferrer', response.user);
-                     commit('setFilteredReferrersSuggested');
+                     if (null !== payload.user_job && payload.user_job !== state.accompanyingCourse.job) {
+                        this.dispatch('updateJob', payload.user_job);
+                     }
+                     // commit('setFilteredReferrersSuggested'); // this mutation doesn't exist?
                   })
                   .catch((error) => {
                      commit('catchError', error);
@@ -799,6 +799,8 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                const url = `/api/1.0/person/accompanying-course/${id}.json`;
                let body = { type: "accompanying_period", job: null };
 
+               console.log('update job', payload);
+
                if (payload !== null) {
                   body = { type: "accompanying_period", job: { id: payload.id, type: payload.type } };
                }

From 10d00787164688ffe073feebcdc7229bdf543309 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 4 May 2022 15:16:13 +0200
Subject: [PATCH 25/47] add changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90f4c2503..e9b78cdf9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to
 * [person] add maritalStatusComment to PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/582)
 * Load relationships without gender in french fixtures
 * Add command to remove old draft accompanying periods
+* [parcours]: If users assings him/herself as referrer and job is not null. Update parcours job (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/578)
 
 
 

From 380c55698cd4bfca3387e7272f67f5dbca7db3f5 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 16 May 2022 11:28:37 +0200
Subject: [PATCH 26/47] main: add civility to User

---
 CHANGELOG.md                                  |  2 +
 src/Bundle/ChillMainBundle/Entity/User.php    | 17 ++++++++
 src/Bundle/ChillMainBundle/Form/UserType.php  |  6 +++
 .../Resources/views/User/index.html.twig      |  5 +++
 .../migrations/Version20220513151853.php      | 16 +++++---
 .../migrations/Version20220516085659.php      | 40 +++++++++++++++++++
 6 files changed, 81 insertions(+), 5 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/migrations/Version20220516085659.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 077cc0242..5f85ec8c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [main] add civility to User (entity, migration and form type) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
+
 * [admin] refactorisation of the admin section: reorganisation of the menu, translations, form types, new entities (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/592)
 * [admin] add admin section for languages and countries (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/596)
 * [activity] activity admin: translations + remove label field for comment on admin activity type (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/587)
diff --git a/src/Bundle/ChillMainBundle/Entity/User.php b/src/Bundle/ChillMainBundle/Entity/User.php
index ad4888d58..80848e2cf 100644
--- a/src/Bundle/ChillMainBundle/Entity/User.php
+++ b/src/Bundle/ChillMainBundle/Entity/User.php
@@ -47,6 +47,11 @@ class User implements AdvancedUserInterface
      */
     private array $attributes = [];
 
+    /**
+     * @ORM\ManyToOne(targetEntity=Civility::class)
+     */
+    private ?Civility $civility = null;
+
     /**
      * @ORM\ManyToOne(targetEntity=Location::class)
      */
@@ -184,6 +189,11 @@ class User implements AdvancedUserInterface
         return $this->attributes;
     }
 
+    public function getCivility(): ?Civility
+    {
+        return $this->civility;
+    }
+
     public function getCurrentLocation(): ?Location
     {
         return $this->currentLocation;
@@ -363,6 +373,13 @@ class User implements AdvancedUserInterface
         return $this;
     }
 
+    public function setCivility(?Civility $civility): User
+    {
+        $this->civility = $civility;
+
+        return $this;
+    }
+
     public function setCurrentLocation(?Location $currentLocation): User
     {
         $this->currentLocation = $currentLocation;
diff --git a/src/Bundle/ChillMainBundle/Form/UserType.php b/src/Bundle/ChillMainBundle/Form/UserType.php
index 6662d0bab..9ba25b37f 100644
--- a/src/Bundle/ChillMainBundle/Form/UserType.php
+++ b/src/Bundle/ChillMainBundle/Form/UserType.php
@@ -15,6 +15,7 @@ use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\UserJob;
+use Chill\MainBundle\Form\Type\PickCivilityType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\EntityRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
@@ -47,6 +48,11 @@ class UserType extends AbstractType
                 'required' => true,
             ])
             ->add('label', TextType::class)
+            ->add('civility', PickCivilityType::class, [
+                'required' => false,
+                'label' => 'Civility',
+                'placeholder' => 'choose civility',
+            ])
             ->add('mainCenter', EntityType::class, [
                 'label' => 'Main center',
                 'required' => false,
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
index bab54d56e..1d254abb9 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
@@ -11,6 +11,11 @@
         <div class="item-bloc">
             <div class="item-row">
                 <div class="item-col">
+                    {% if entity.civility is not null %}
+                        {% if entity.civility.name|length > 0 %}
+                            {{ entity.civility.name|first }}
+                        {% endif %}
+                    {% endif %}
                     {{ entity.label }}
                     {% if entity.isEnabled %}
                         <i class="fa fa-check chill-green"></i>
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220513151853.php b/src/Bundle/ChillMainBundle/migrations/Version20220513151853.php
index 31319ce1b..ec99ce2ba 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220513151853.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220513151853.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * 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.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Main;
@@ -9,6 +16,10 @@ use Doctrine\Migrations\AbstractMigration;
 
 final class Version20220513151853 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+    }
+
     public function getDescription(): string
     {
         return 'set default on attributes';
@@ -18,9 +29,4 @@ final class Version20220513151853 extends AbstractMigration
     {
         $this->addSql('update users set attributes = \'[]\'::json where attributes IS NULL');
     }
-
-    public function down(Schema $schema): void
-    {
-
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220516085659.php b/src/Bundle/ChillMainBundle/migrations/Version20220516085659.php
new file mode 100644
index 000000000..8e4d7347b
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220516085659.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Add civility to User.
+ */
+final class Version20220516085659 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE users DROP CONSTRAINT FK_1483A5E923D6A298');
+        $this->addSql('DROP INDEX IDX_1483A5E923D6A298');
+        $this->addSql('ALTER TABLE users DROP civility_id');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Add civility to User';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE users ADD civility_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE users ADD CONSTRAINT FK_1483A5E923D6A298 FOREIGN KEY (civility_id) REFERENCES chill_main_civility (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_1483A5E923D6A298 ON users (civility_id)');
+    }
+}

From 8eef073988cd3442223fa71c50cc7ad6184f2f98 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 16 May 2022 11:49:36 +0200
Subject: [PATCH 27/47] [main] filter user jobs by active jobs

---
 CHANGELOG.md                                 | 1 +
 src/Bundle/ChillMainBundle/Form/UserType.php | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f85ec8c9..b20e4422b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [main] filter user jobs by active jobs (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
 * [main] add civility to User (entity, migration and form type) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
 
 * [admin] refactorisation of the admin section: reorganisation of the menu, translations, form types, new entities (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/592)
diff --git a/src/Bundle/ChillMainBundle/Form/UserType.php b/src/Bundle/ChillMainBundle/Form/UserType.php
index 9ba25b37f..c2567df4c 100644
--- a/src/Bundle/ChillMainBundle/Form/UserType.php
+++ b/src/Bundle/ChillMainBundle/Form/UserType.php
@@ -82,6 +82,11 @@ class UserType extends AbstractType
                 'choice_label' => function (UserJob $c) {
                     return $this->translatableStringHelper->localize($c->getLabel());
                 },
+                'query_builder' => static function (EntityRepository $er) {
+                    $qb = $er->createQueryBuilder('uj');
+                    $qb->where('uj.active = TRUE');
+                    return $qb;
+                },
             ])
             ->add('mainLocation', EntityType::class, [
                 'label' => 'Main location',

From f77031630f9d1f58bed8741b577ab845682c26de Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 16 May 2022 13:52:55 +0200
Subject: [PATCH 28/47] [main] allow hide change user password menu

---
 CHANGELOG.md                                  |  1 +
 .../ChillMainExtension.php                    |  5 ++++
 .../DependencyInjection/Configuration.php     |  3 +++
 .../Routing/MenuBuilder/UserMenuBuilder.php   | 25 ++++++++++++-------
 4 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b20e4422b..f86c1b0bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [main] allow hide change user password menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
 * [main] filter user jobs by active jobs (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
 * [main] add civility to User (entity, migration and form type) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
 
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 0611b9848..2c25d35f3 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -129,6 +129,11 @@ class ChillMainExtension extends Extension implements
             $config['access_global_history']
         );
 
+        $container->setParameter(
+            'chill_main.access_user_change_password',
+            $config['access_user_change_password']
+        );
+
         $container->setParameter(
             'chill_main.routing.resources',
             $config['routing']['resources']
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
index 7ced6aac6..2fa6df80a 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
@@ -116,6 +116,9 @@ class Configuration implements ConfigurationInterface
             ->booleanNode('access_global_history')
             ->defaultTrue()
             ->end()
+            ->booleanNode('access_user_change_password')
+            ->defaultTrue()
+            ->end()
             ->arrayNode('redis')
             ->children()
             ->scalarNode('host')
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php
index b2fd5180e..df3ba5121 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php
@@ -15,6 +15,7 @@ use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Notification\Counter\NotificationByUserCounter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\MainBundle\Workflow\Counter\WorkflowByUserCounter;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -28,16 +29,20 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
 
     private WorkflowByUserCounter $workflowByUserCounter;
 
+    protected ParameterBagInterface $parameterBag;
+
     public function __construct(
         NotificationByUserCounter $notificationByUserCounter,
         WorkflowByUserCounter $workflowByUserCounter,
         Security $security,
-        TranslatorInterface $translator
+        TranslatorInterface $translator,
+        ParameterBagInterface $parameterBag
     ) {
         $this->notificationByUserCounter = $notificationByUserCounter;
         $this->workflowByUserCounter = $workflowByUserCounter;
         $this->security = $security;
         $this->translator = $translator;
+        $this->parameterBag = $parameterBag;
     }
 
     public function buildMenu($menuId, \Knp\Menu\MenuItem $menu, array $parameters)
@@ -85,14 +90,16 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
                     'order' => 700,
                 ]);
 
-            $menu
-                ->addChild(
-                    'Change password',
-                    ['route' => 'change_my_password']
-                )
-                ->setExtras([
-                    'order' => 99999999998,
-                ]);
+            if ($this->parameterBag->get('chill_main.access_user_change_password')) {
+                $menu
+                    ->addChild(
+                        'Change password',
+                        ['route' => 'change_my_password']
+                    )
+                    ->setExtras([
+                        'order' => 99999999998,
+                    ]);
+            }
         }
 
         $menu

From cecfa1a18a01babb12531240037d998f4078a892 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 16 May 2022 14:07:34 +0200
Subject: [PATCH 29/47] main: allow creation of user without password

---
 .../ChillMainBundle/Controller/UserController.php    |  9 +++++++--
 src/Bundle/ChillMainBundle/Form/UserType.php         | 12 +++++++++---
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/UserController.php b/src/Bundle/ChillMainBundle/Controller/UserController.php
index 068bd9f73..b344a0b2e 100644
--- a/src/Bundle/ChillMainBundle/Controller/UserController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserController.php
@@ -23,6 +23,7 @@ use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
 use Psr\Log\LoggerInterface;
 use RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormInterface;
@@ -45,16 +46,20 @@ class UserController extends CRUDController
 
     private ValidatorInterface $validator;
 
+    protected ParameterBagInterface $parameterBag;
+
     public function __construct(
         LoggerInterface $chillLogger,
         ValidatorInterface $validator,
         UserPasswordEncoderInterface $passwordEncoder,
-        UserRepository $userRepository
+        UserRepository $userRepository,
+        ParameterBagInterface $parameterBag
     ) {
         $this->logger = $chillLogger;
         $this->userRepository = $userRepository;
         $this->validator = $validator;
         $this->passwordEncoder = $passwordEncoder;
+        $this->parameterBag = $parameterBag;
     }
 
     /**
@@ -307,7 +312,7 @@ class UserController extends CRUDController
     protected function onPrePersist(string $action, $entity, FormInterface $form, Request $request)
     {
         // for "new", encode the password
-        if ('new' === $action) {
+        if ('new' === $action && $this->parameterBag->get('chill_main.access_user_change_password')) {
             $entity->setPassword($this->passwordEncoder
                 ->encodePassword($entity, $form['plainPassword']->getData()));
         }
diff --git a/src/Bundle/ChillMainBundle/Form/UserType.php b/src/Bundle/ChillMainBundle/Form/UserType.php
index c2567df4c..72047ce61 100644
--- a/src/Bundle/ChillMainBundle/Form/UserType.php
+++ b/src/Bundle/ChillMainBundle/Form/UserType.php
@@ -19,6 +19,7 @@ use Chill\MainBundle\Form\Type\PickCivilityType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\EntityRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
@@ -35,9 +36,14 @@ class UserType extends AbstractType
 {
     private TranslatableStringHelper $translatableStringHelper;
 
-    public function __construct(TranslatableStringHelper $translatableStringHelper)
-    {
+    protected ParameterBagInterface $parameterBag;
+
+    public function __construct(
+        TranslatableStringHelper $translatableStringHelper,
+        ParameterBagInterface $parameterBag
+    ) {
         $this->translatableStringHelper = $translatableStringHelper;
+        $this->parameterBag = $parameterBag;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -105,7 +111,7 @@ class UserType extends AbstractType
                 },
             ]);
 
-        if ($options['is_creation']) {
+        if ($options['is_creation'] && $this->parameterBag->get('chill_main.access_user_change_password')) {
             $builder->add('plainPassword', RepeatedType::class, [
                 'mapped' => false,
                 'type' => PasswordType::class,

From b13ac3a919fad652e0fe2611adfb328fc3307135 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 17 May 2022 17:24:17 +0200
Subject: [PATCH 30/47] household filiations: fetch person info when unfolding
 person node

---
 .../ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue  | 3 ++-
 .../ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
index f86c68576..cfc9f2a76 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
@@ -305,7 +305,8 @@ export default {
                   if (this.listenPersonFlag === 'normal') {
                      if (person.folded === true) {
                         //console.log('   @@> expand mode event')
-                        this.$store.commit('unfoldPerson', person)
+                        this.$store.commit('unfoldPerson', person);
+                        this.$store.dispatch('fetchInfoForPerson', person);
                      }
                   } else {
                      //console.log('   @@> create link mode event')
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js
index 32aa5bbc9..8382d460d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js
@@ -252,7 +252,6 @@ const store = createStore({
             if (!person.folded) {
                 return;
             }
-            //console.log('unfoldPerson', person)
             person.label = person._label
             delete person._label
             delete person.title

From d8db8c0f8e7620d6c2ae1c37ec02749c3e576669 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 17 May 2022 17:46:01 +0200
Subject: [PATCH 31/47] upd CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 077cc0242..d9fa5c310 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [person] household filiation: fetch person info when unfolding person (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/586)
 * [admin] refactorisation of the admin section: reorganisation of the menu, translations, form types, new entities (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/592)
 * [admin] add admin section for languages and countries (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/596)
 * [activity] activity admin: translations + remove label field for comment on admin activity type (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/587)

From a4210dd2c7ff97ed560014120e50ad1fe329bcfb Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 18 May 2022 09:30:47 +0200
Subject: [PATCH 32/47] [main] allow hide permissions group list menu

---
 CHANGELOG.md                                   |  1 +
 .../Controller/UserController.php              |  4 ++--
 .../DependencyInjection/ChillMainExtension.php |  5 +++++
 .../DependencyInjection/Configuration.php      |  3 +++
 src/Bundle/ChillMainBundle/Form/UserType.php   |  5 +++--
 .../MenuBuilder/AdminUserMenuBuilder.php       | 18 +++++++++++++-----
 .../Routing/MenuBuilder/UserMenuBuilder.php    |  4 ++--
 7 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f86c1b0bc..509682ed1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [main] allow hide permissions group list menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
 * [main] allow hide change user password menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
 * [main] filter user jobs by active jobs (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
 * [main] add civility to User (entity, migration and form type) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
diff --git a/src/Bundle/ChillMainBundle/Controller/UserController.php b/src/Bundle/ChillMainBundle/Controller/UserController.php
index b344a0b2e..164c2a534 100644
--- a/src/Bundle/ChillMainBundle/Controller/UserController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserController.php
@@ -38,6 +38,8 @@ class UserController extends CRUDController
 {
     public const FORM_GROUP_CENTER_COMPOSED = 'composed_groupcenter';
 
+    protected ParameterBagInterface $parameterBag;
+
     private LoggerInterface $logger;
 
     private UserPasswordEncoderInterface $passwordEncoder;
@@ -46,8 +48,6 @@ class UserController extends CRUDController
 
     private ValidatorInterface $validator;
 
-    protected ParameterBagInterface $parameterBag;
-
     public function __construct(
         LoggerInterface $chillLogger,
         ValidatorInterface $validator,
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 2c25d35f3..929bffe14 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -134,6 +134,11 @@ class ChillMainExtension extends Extension implements
             $config['access_user_change_password']
         );
 
+        $container->setParameter(
+            'chill_main.access_permissions_group_list',
+            $config['access_permissions_group_list']
+        );
+
         $container->setParameter(
             'chill_main.routing.resources',
             $config['routing']['resources']
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
index 2fa6df80a..a9b3ffec0 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
@@ -119,6 +119,9 @@ class Configuration implements ConfigurationInterface
             ->booleanNode('access_user_change_password')
             ->defaultTrue()
             ->end()
+            ->booleanNode('access_permissions_group_list')
+            ->defaultTrue()
+            ->end()
             ->arrayNode('redis')
             ->children()
             ->scalarNode('host')
diff --git a/src/Bundle/ChillMainBundle/Form/UserType.php b/src/Bundle/ChillMainBundle/Form/UserType.php
index 72047ce61..9e7da7a89 100644
--- a/src/Bundle/ChillMainBundle/Form/UserType.php
+++ b/src/Bundle/ChillMainBundle/Form/UserType.php
@@ -34,10 +34,10 @@ use Symfony\Component\Validator\Constraints\Regex;
 
 class UserType extends AbstractType
 {
-    private TranslatableStringHelper $translatableStringHelper;
-
     protected ParameterBagInterface $parameterBag;
 
+    private TranslatableStringHelper $translatableStringHelper;
+
     public function __construct(
         TranslatableStringHelper $translatableStringHelper,
         ParameterBagInterface $parameterBag
@@ -91,6 +91,7 @@ class UserType extends AbstractType
                 'query_builder' => static function (EntityRepository $er) {
                     $qb = $er->createQueryBuilder('uj');
                     $qb->where('uj.active = TRUE');
+
                     return $qb;
                 },
             ])
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php
index 7b3399503..b885e1641 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php
@@ -13,6 +13,7 @@ namespace Chill\MainBundle\Routing\MenuBuilder;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 
 class AdminUserMenuBuilder implements LocalMenuBuilderInterface
@@ -22,9 +23,14 @@ class AdminUserMenuBuilder implements LocalMenuBuilderInterface
      */
     protected $authorizationChecker;
 
-    public function __construct(AuthorizationCheckerInterface $authorizationChecker)
-    {
+    protected ParameterBagInterface $parameterBag;
+
+    public function __construct(
+        AuthorizationCheckerInterface $authorizationChecker,
+        ParameterBagInterface $parameterBag
+    ) {
         $this->authorizationChecker = $authorizationChecker;
+        $this->parameterBag = $parameterBag;
     }
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
@@ -51,9 +57,11 @@ class AdminUserMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'admin_scope',
         ])->setExtras(['order' => 1020]);
 
-        $menu->addChild('Permissions group list', [
-            'route' => 'admin_permissionsgroup',
-        ])->setExtras(['order' => 1030]);
+        if ($this->parameterBag->get('chill_main.access_permissions_group_list')) {
+            $menu->addChild('Permissions group list', [
+                'route' => 'admin_permissionsgroup',
+            ])->setExtras(['order' => 1030]);
+        }
 
         $menu->addChild('crud.admin_user.index.title', [
             'route' => 'chill_crud_admin_user_index',
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php
index df3ba5121..6b6f9cceb 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php
@@ -21,6 +21,8 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class UserMenuBuilder implements LocalMenuBuilderInterface
 {
+    protected ParameterBagInterface $parameterBag;
+
     private NotificationByUserCounter $notificationByUserCounter;
 
     private Security $security;
@@ -29,8 +31,6 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
 
     private WorkflowByUserCounter $workflowByUserCounter;
 
-    protected ParameterBagInterface $parameterBag;
-
     public function __construct(
         NotificationByUserCounter $notificationByUserCounter,
         WorkflowByUserCounter $workflowByUserCounter,

From da2c88c026f56ba69165b3d8055dc803419f704e Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 25 May 2022 10:12:07 +0200
Subject: [PATCH 33/47] [admin] show/hide the user permissions group depending
 on config

---
 .../Controller/UserController.php             | 69 +++++++++++++++
 .../Resources/views/User/edit.html.twig       | 88 ++++++++++---------
 2 files changed, 114 insertions(+), 43 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/UserController.php b/src/Bundle/ChillMainBundle/Controller/UserController.php
index 164c2a534..64a40cdda 100644
--- a/src/Bundle/ChillMainBundle/Controller/UserController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserController.php
@@ -109,6 +109,7 @@ class UserController extends CRUDController
 
         return $this->render('@ChillMain/User/edit.html.twig', [
             'entity' => $user,
+            'access_permissions_group_list' => $this->parameterBag->get('chill_main.access_permissions_group_list'),
             'edit_form' => $this->createEditForm($user)->createView(),
             'add_groupcenter_form' => $this->createAddLinkGroupCenterForm($user, $request)->createView(),
             'delete_groupcenter_form' => array_map(
@@ -158,6 +159,74 @@ class UserController extends CRUDController
         return $this->redirect($this->generateUrl('chill_crud_admin_user_edit', ['id' => $uid]));
     }
 
+
+    public function edit(Request $request, $id): Response
+    {
+        $action = 'edit';
+        $entity = $this->getEntity($action, $id, $request);
+
+        if (null === $entity) {
+            throw $this->createNotFoundException(
+                sprintf(
+                    'The %s with id %s is not found',
+                    $this->getCrudName(),
+                    $id
+                )
+            );
+        }
+
+        $response = $this->checkACL($action, $entity);
+
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        $response = $this->onPostCheckACL($action, $request, $entity);
+
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        $form = $this->createFormFor($action, $entity);
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->onFormValid($action, $entity, $form, $request);
+            $em = $this->getDoctrine()->getManager();
+
+            $this->onPreFlush($action, $entity, $form, $request);
+            $em->flush();
+            $this->onPostFlush($action, $entity, $form, $request);
+
+            $this->addFlash('success', $this->generateFormSuccessMessage($action, $entity));
+
+            $result = $this->onBeforeRedirectAfterSubmission($action, $entity, $form, $request);
+
+            if ($result instanceof Response) {
+                return $result;
+            }
+
+            return $this->redirectToRoute('chill_crud_' . $this->getCrudName() . '_index');
+        }
+
+        if ($form->isSubmitted()) {
+            $this->addFlash('error', $this->generateFormErrorMessage($action, $form));
+        }
+
+        $defaultTemplateParameters = [
+            'form' => $form->createView(),
+            'entity' => $entity,
+            'crud_name' => $this->getCrudName(),
+            'access_permissions_group_list' => $this->parameterBag->get('chill_main.access_permissions_group_list'),
+        ];
+
+        return $this->render(
+            $this->getTemplateFor($action, $entity, $request),
+            $this->generateTemplateParameter($action, $entity, $request, $defaultTemplateParameters)
+        );
+    }
+
     /**
      * Displays a form to edit the user current location.
      *
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig
index 0fa376b34..0ecbdef9f 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig
@@ -3,54 +3,56 @@
 {% block admin_content -%}
     {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
         {% block crud_content_after_form %}
-            <h2>{{ 'Permissions granted'|trans }}</h2>
+            {% if access_permissions_group_list %}
+                <h2>{{ 'Permissions granted'|trans }}</h2>
 
-            {% if entity.groupcenters|length > 0 %}
-                <table>
-                    <thead>
-                    <tr>
-                        <th>{{ 'Permission group'|trans }}</th>
-                        <th>{{ 'Center'|trans }}</th>
-                        <th>&nbsp;</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    {% for groupcenter in entity.groupcenters %}
+                {% if entity.groupcenters|length > 0 %}
+                    <table>
+                        <thead>
                         <tr>
-                            <td>
-                    <span class="user_group permissionsgroup">
-                        {{ groupcenter.permissionsgroup.name }}
-                    </span>
-                            </td>
-                            <td>
-                    <span class="user_group center">
-                        {{ groupcenter.center.name }}
-                    </span>
-                            </td>
-                            <td>
-                                {{ form_start(delete_groupcenter_form[groupcenter.id]) }}
-                                {{ form_row(delete_groupcenter_form[groupcenter.id].submit, { 'attr': { 'class': 'btn btn-chill-red' } } ) }}
-                                {{ form_rest(delete_groupcenter_form[groupcenter.id]) }}
-                                {{ form_end(delete_groupcenter_form[groupcenter.id]) }}
-                            </td>
+                            <th>{{ 'Permission group'|trans }}</th>
+                            <th>{{ 'Center'|trans }}</th>
+                            <th>&nbsp;</th>
                         </tr>
-                    {% endfor %}
-                    </tbody>
-                </table>
-            {% else %}
-                <p>{{ 'Any permissions granted to this user'|trans }}.</p>
+                        </thead>
+                        <tbody>
+                        {% for groupcenter in entity.groupcenters %}
+                            <tr>
+                                <td>
+                        <span class="user_group permissionsgroup">
+                            {{ groupcenter.permissionsgroup.name }}
+                        </span>
+                                </td>
+                                <td>
+                        <span class="user_group center">
+                            {{ groupcenter.center.name }}
+                        </span>
+                                </td>
+                                <td>
+                                    {{ form_start(delete_groupcenter_form[groupcenter.id]) }}
+                                    {{ form_row(delete_groupcenter_form[groupcenter.id].submit, { 'attr': { 'class': 'btn btn-chill-red' } } ) }}
+                                    {{ form_rest(delete_groupcenter_form[groupcenter.id]) }}
+                                    {{ form_end(delete_groupcenter_form[groupcenter.id]) }}
+                                </td>
+                            </tr>
+                        {% endfor %}
+                        </tbody>
+                    </table>
+                {% else %}
+                    <p>{{ 'Any permissions granted to this user'|trans }}.</p>
+                {% endif %}
+
+                <h3>{{ 'Grant new permissions'|trans }}</h3>
+
+                {{ form_start(add_groupcenter_form) }}
+                {{ form_row(add_groupcenter_form.composed_groupcenter.center) }}
+                {{ form_row(add_groupcenter_form.composed_groupcenter.permissionsgroup) }}
+                {{ form_row(add_groupcenter_form.submit, { 'attr' : { 'class': 'btn btn-chill-green' } } ) }}
+
+                {{ form_end(add_groupcenter_form) }}
             {% endif %}
-
-            <h3>{{ 'Grant new permissions'|trans }}</h3>
-
-            {{ form_start(add_groupcenter_form) }}
-            {{ form_row(add_groupcenter_form.composed_groupcenter.center) }}
-            {{ form_row(add_groupcenter_form.composed_groupcenter.permissionsgroup) }}
-            {{ form_row(add_groupcenter_form.submit, { 'attr' : { 'class': 'btn btn-chill-green' } } ) }}
-
-            {{ form_end(add_groupcenter_form) }}
-
         {% endblock %}
+
         {% block content_form_actions_save_and_show %}{% endblock %}
     {% endembed %}
 {% endblock %}

From d6f1aa53dc338d6ace2cdb55eac5f496c7153fe4 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 25 May 2022 10:34:24 +0200
Subject: [PATCH 34/47] [admin]: add select2 to Goal form type entity fields

---
 src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php
index 45a43897d..5fc77b410 100644
--- a/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php
+++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php
@@ -51,6 +51,7 @@ class GoalType extends AbstractType
                 'choice_label' => function (SocialAction $issue) {
                     return $this->translatableStringHelper->localize($issue->getTitle());
                 },
+                'attr' => ['class' => 'select2 '],
             ])
 
             ->add('results', EntityType::class, [
@@ -60,6 +61,7 @@ class GoalType extends AbstractType
                 'choice_label' => function (Result $r) {
                     return $this->translatableStringHelper->localize($r->getTitle());
                 },
+                'attr' => ['class' => 'select2 '],
             ])
 
             ->add('desactivationDate', ChillDateType::class, [

From 4402d52de76815bf2d00c87060f7a3939e84053b Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 25 May 2022 10:35:15 +0200
Subject: [PATCH 35/47] upd CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 509682ed1..8432912a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [admin]: add select2 to Goal form type entity fields (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/702)
 * [main] allow hide permissions group list menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
 * [main] allow hide change user password menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
 * [main] filter user jobs by active jobs (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)

From 5ebaeeb4ba0540ae9e1b3eccfe33afec51149a09 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 25 May 2022 10:38:09 +0200
Subject: [PATCH 36/47] php cs fix

---
 src/Bundle/ChillMainBundle/Controller/UserController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/UserController.php b/src/Bundle/ChillMainBundle/Controller/UserController.php
index 64a40cdda..4eb22c5d3 100644
--- a/src/Bundle/ChillMainBundle/Controller/UserController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserController.php
@@ -159,7 +159,6 @@ class UserController extends CRUDController
         return $this->redirect($this->generateUrl('chill_crud_admin_user_edit', ['id' => $uid]));
     }
 
-
     public function edit(Request $request, $id): Response
     {
         $action = 'edit';

From bc410b02e778da6899ebb36a11af0d5c055a2bfe Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 25 May 2022 11:45:25 +0200
Subject: [PATCH 37/47] admin: do not use disabled for form widget with
 collections, see https://github.com/symfony/symfony/issues/18998

---
 .../views/SocialWork/SocialAction/edit.html.twig    | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/edit.html.twig
index 49d6635df..9ea984903 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/edit.html.twig
@@ -8,9 +8,20 @@
     {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
 
         {% block crud_content_form_rows %}
+
+            <div class="mb-3 row">
+               <label class="col-form-label col-sm-4 required" for="social_action_ordering">{{ 'Parent'|trans }}</label>
+               <div class="col-sm-8">{{ entity.parent|chill_entity_render_box }}</div>
+            </div>
+
+            <div class="mb-3 row">
+               <label class="col-form-label col-sm-4 required" for="social_action_ordering">{{ 'Social issue'|trans }}</label>
+               <div class="col-sm-8">{{ entity.issue|chill_entity_render_box }}</div>
+            </div>
+
             {% for f in form %}
                 {% if f.vars.name == 'parent' or f.vars.name == 'issue' %}
-                    {{ form_row(f, { 'attr':{'disabled':'disabled'}}) }}
+                    {{ form_widget(f, { 'attr':{'hidden':'hidden'}}) }}
                 {% else %}
                     {{ form_row(f) }}
                 {% endif %}

From 2ac78a12db30c8ad8191ba9f2fff9237a3971264 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 25 May 2022 11:46:03 +0200
Subject: [PATCH 38/47] admin: fix adding of evaluation to social action

---
 .../Entity/SocialWork/SocialAction.php        | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
index 904950489..fbd271b44 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
@@ -46,10 +46,8 @@ class SocialAction
     private $desactivationDate;
 
     /**
-     * @ORM\ManyToMany(
-     *     targetEntity=Evaluation::class,
-     *     mappedBy="socialActions"
-     * )
+     * @ORM\ManyToMany(targetEntity=Evaluation::class, inversedBy="socialActions")
+     * @ORM\JoinTable(name="chill_person_social_work_evaluation_action")
      */
     private Collection $evaluations;
 
@@ -110,6 +108,15 @@ class SocialAction
         return $this;
     }
 
+    public function addEvaluation(Evaluation $evaluation): self
+    {
+        if (!$this->evaluations->contains($evaluation)) {
+            $this->evaluations[] = $evaluation;
+        }
+
+        return $this;
+    }
+
     public function addGoal(Goal $goal): self
     {
         if (!$this->goals->contains($goal)) {
@@ -300,6 +307,13 @@ class SocialAction
         return $this;
     }
 
+    public function removeEvaluation(Evaluation $evaluation): self
+    {
+        $this->evaluations->removeElement($evaluation);
+
+        return $this;
+    }
+
     public function removeGoal(Goal $goal): self
     {
         $this->goals->removeElement($goal);

From 8863157fc9c8f113d4362dac6d6e514d6ea05bbc Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 25 May 2022 11:47:02 +0200
Subject: [PATCH 39/47] upd CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 077cc0242..8e0d98a81 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [admin] repair edit of social action in the admin (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/601)
 * [admin] refactorisation of the admin section: reorganisation of the menu, translations, form types, new entities (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/592)
 * [admin] add admin section for languages and countries (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/596)
 * [activity] activity admin: translations + remove label field for comment on admin activity type (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/587)

From 01f1605cb86b19a5af2c09341ff803fc31d4750c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 27 May 2022 14:30:05 +0200
Subject: [PATCH 40/47] change indent of js files

---
 .editorconfig | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index fe115d4c0..d51908caf 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -18,3 +18,10 @@ max_line_length = 80
 
 [COMMIT_EDITMSG]
 max_line_length = 0
+<<<<<<< Updated upstream
+=======
+
+[*.{js, vue, ts}]
+indent_size = 2
+indent_style = space
+>>>>>>> Stashed changes

From 014c460eefbb325dc24288ca69868ebffd05e723 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 27 May 2022 15:39:32 +0200
Subject: [PATCH 41/47] improvements on private comments

---
 .../ChillActivityBundle/Form/ActivityType.php |  2 +-
 .../Resources/views/Activity/show.html.twig   | 34 +++++++--------
 .../migrations/Version20220425133027.php      |  5 ---
 .../migrations/Version20220527124438.php      | 26 ++++++++++++
 .../migrations/Version20220527124558.php      | 26 ++++++++++++
 .../translations/messages.fr.yml              |  1 -
 .../Embeddable/PrivateCommentEmbeddable.php   | 13 ++++--
 .../Form/Type/PrivateCommentType.php          | 10 ++---
 .../Resources/views/Form/fields.html.twig     | 17 ++++++++
 .../migrations/Version20220426133048.php      | 42 -------------------
 .../translations/messages.fr.yml              |  2 +-
 .../migrations/Version20220527124737.php      | 26 ++++++++++++
 12 files changed, 125 insertions(+), 79 deletions(-)
 create mode 100644 src/Bundle/ChillActivityBundle/migrations/Version20220527124438.php
 create mode 100644 src/Bundle/ChillCalendarBundle/migrations/Version20220527124558.php
 delete mode 100644 src/Bundle/ChillMainBundle/migrations/Version20220426133048.php
 create mode 100644 src/Bundle/ChillPersonBundle/migrations/Version20220527124737.php

diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityType.php b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
index 4361158e5..4c767cd54 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -254,7 +254,7 @@ class ActivityType extends AbstractType
 
         if ($activityType->isVisible('privateComment')) {
             $builder->add('privateComment', PrivateCommentType::class, [
-                'label' => empty($activityType->getLabel('privateComment')) ? 'activity.private comment' : $activityType->getPrivateCommentLabel(),
+                'label' => '' === $activityType->getLabel('privateComment') ? 'private comment' : $activityType->getPrivateCommentLabel(),
                 'required' => false,
             ]);
         }
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index 65134a754..8b47f4de2 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -147,6 +147,21 @@
                 </dd>
             {% endif %}
 
+            {% if t.privateCommentVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) and entity.privateComment.hasCommentForUser(app.user) %}
+                {% if t.privateCommentLabel is not empty %}
+                    <dt class="inline">{{ t.privateCommentLabel }}</dt>
+                {% else %}
+                    <dt class="inline">{{ 'Private comment'|trans }}</dt>
+                {% endif %}
+                <dd>
+                    <section class="chill-entity entity-comment-embeddable">
+                        <blockquote class="chill-user-quote private-quote">
+                            {{ entity.privateComment.comments[userId] }}
+                        </blockquote>
+                    </section>
+                </dd>
+            {% endif %}
+
             {% if t.documentsVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) %}
                 <dt class="inline">{{ 'Documents'|trans }}</dt>
                 <dd>
@@ -178,25 +193,6 @@
     </div>
 </div>
 
-{% if t.privateCommentVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) and userId in entity.privateComment.comments|keys %}
-<div class="flex-table">
-    <div class="item-bloc">
-        {% if t.privateCommentLabel is not empty %}
-            <dt class="inline">{{ t.privateCommentLabel }}</dt>
-        {% else %}
-            <dt class="inline">{{ 'Private comment'|trans }}</dt>
-        {% endif %}
-        <dd>
-            <section class="chill-entity entity-comment-embeddable">
-                <blockquote class="chill-user-quote private-quote">
-                    {{ entity.privateComment.comments[userId] }}
-                </blockquote>
-            </section>
-        </dd>
-    </div>
-</div>
-{% endif %}
-
 <div class="notification notification-list">
     {% set notifications =  chill_list_notifications('Chill\\ActivityBundle\\Entity\\Activity', entity.id) %}
     {% if notifications is not empty %}
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php b/src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php
index d5243b259..4a829f18c 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php
@@ -14,14 +14,10 @@ namespace Chill\Migrations\Activity;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
 final class Version20220425133027 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        // this down() migration is auto-generated, please modify it to your needs
         $this->addSql('ALTER TABLE activitytype DROP privateCommentLabel');
         $this->addSql('ALTER TABLE activitytype DROP privateCommentVisible');
     }
@@ -33,7 +29,6 @@ final class Version20220425133027 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        // this up() migration is auto-generated, please modify it to your needs
         $this->addSql('ALTER TABLE activitytype ADD privateCommentLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
         $this->addSql('ALTER TABLE activitytype ADD privateCommentVisible SMALLINT DEFAULT 1 NOT NULL');
     }
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20220527124438.php b/src/Bundle/ChillActivityBundle/migrations/Version20220527124438.php
new file mode 100644
index 000000000..1ccf3f0b3
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20220527124438.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Activity;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20220527124438 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'add private comment to activity';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activity ADD privateComment_comments JSON DEFAULT \'{}\'');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP privateComment_comments');
+    }
+}
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20220527124558.php b/src/Bundle/ChillCalendarBundle/migrations/Version20220527124558.php
new file mode 100644
index 000000000..17c53a004
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/migrations/Version20220527124558.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Calendar;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20220527124558 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'add private comment to calendar';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_calendar.calendar ADD privateComment_comments JSON DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_calendar.calendar DROP privateComment_comments');
+    }
+}
diff --git a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
index eeb12298f..b7aa2e128 100644
--- a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
@@ -26,4 +26,3 @@ The calendar item has been successfully removed.: Le rendez-vous a été supprim
 From the day: Du
 to the day: au
 Transform to activity: Transformer en échange
-private comment: Notes privé
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
index cfca2a86c..e27e906c0 100644
--- a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
+++ b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
@@ -20,15 +20,22 @@ use Doctrine\ORM\Mapping as ORM;
 class PrivateCommentEmbeddable
 {
     /**
-     * @ORM\Column(type="json", nullable=true)
+     * @ORM\Column(type="json", nullable=false, options={"default": "{}"})
+     * @var array<int, string>
      */
-    private ?array $comments = [];
+    private array $comments = [];
 
     public function getCommentForUser(User $user): string
     {
         return $this->comments[$user->getId()] ?? '';
     }
 
+    public function hasCommentForUser(User $user): bool
+    {
+        return array_key_exists($user->getId(), $this->comments)
+            && "" !== $this->comments[$user->getId()];
+    }
+
     public function getComments(): ?array
     {
         return $this->comments;
@@ -47,7 +54,7 @@ class PrivateCommentEmbeddable
 
     public function setCommentForUser(User $user, string $content): self
     {
-        $this->comments[$user->getId()] = $content;
+        $this->comments[$user->getId()] = trim($content);
 
         return $this;
     }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php b/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
index 8ce33face..d4c0d1611 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
@@ -38,19 +38,15 @@ class PrivateCommentType extends AbstractType
     {
         $builder
             ->add('comments', ChillTextareaType::class, [
-                'label' => 'private comment',
+                'disable_editor' => $options['disable_editor'],
+                'label' => false,
             ])
             ->setDataMapper($this->dataMapper);
     }
 
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
-        $view->vars = array_replace(
-            $view->vars,
-            [
-                'hideLabel' => true,
-            ]
-        );
+        $view->vars['hideLabel'] = true;
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
index 1da384920..f45f91692 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
@@ -198,6 +198,23 @@
     {% endfor %}
 {% endblock %}
 
+
+{% block private_comment_row %}
+    {{ form_label(form) }}
+    {{ form_row(form) }}
+{% endblock %}
+
+{% block private_comment_widget %}
+    {% for entry in form %}
+        {{ form_widget(entry) }}
+    {% endfor %}
+{% endblock %}
+
+{% block comment_row %}
+    {{ form_label(form) }}
+    {{ form_row(form) }}
+{% endblock %}
+
 {% block comment_widget %}
     {% for entry in form %}
         {{ form_widget(entry) }}
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220426133048.php b/src/Bundle/ChillMainBundle/migrations/Version20220426133048.php
deleted file mode 100644
index 94f866e9b..000000000
--- a/src/Bundle/ChillMainBundle/migrations/Version20220426133048.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * 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.
- */
-
-declare(strict_types=1);
-
-namespace Chill\Migrations\Main;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20220426133048 extends AbstractMigration
-{
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP privateComment_comments');
-        $this->addSql('ALTER TABLE activity DROP privateComment_comments');
-        $this->addSql('ALTER TABLE chill_calendar.calendar DROP privateComment_comments');
-    }
-
-    public function getDescription(): string
-    {
-        return 'add private embeddable comment to activity, calendar and accompanyingperiod work';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE activity ADD privateComment_comments JSON DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_calendar.calendar ADD privateComment_comments JSON DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD privateComment_comments JSON DEFAULT NULL');
-    }
-}
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index e9a5fce4d..db441af6e 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -65,7 +65,7 @@ Read more: Lire la suite
 
 # comment embeddable
 No comment associated: Aucun commentaire
-private comment: Notes privé
+private comment: Notes privées
 
 #pagination
 Previous: Précédent
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220527124737.php b/src/Bundle/ChillPersonBundle/migrations/Version20220527124737.php
new file mode 100644
index 000000000..b8f5b1dde
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220527124737.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20220527124737 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'add private comment on accompanying period work';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD privateComment_comments JSON DEFAULT \'{}\'');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activity DROP privateComment_comments');
+    }
+}

From 5e5a8555782a4c9abc1eb5dddada107685109452 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 27 May 2022 15:48:50 +0200
Subject: [PATCH 42/47] fix cs

---
 .../migrations/Version20220527124438.php        | 17 ++++++++++++-----
 .../migrations/Version20220527124558.php        | 17 ++++++++++++-----
 .../Embeddable/PrivateCommentEmbeddable.php     | 14 ++++++++------
 .../migrations/Version20220513151853.php        | 16 +++++++++++-----
 .../migrations/Version20220527124737.php        | 17 ++++++++++++-----
 5 files changed, 55 insertions(+), 26 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20220527124438.php b/src/Bundle/ChillActivityBundle/migrations/Version20220527124438.php
index 1ccf3f0b3..2661edf4b 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20220527124438.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20220527124438.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * 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.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Activity;
@@ -9,6 +16,11 @@ use Doctrine\Migrations\AbstractMigration;
 
 final class Version20220527124438 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP privateComment_comments');
+    }
+
     public function getDescription(): string
     {
         return 'add private comment to activity';
@@ -18,9 +30,4 @@ final class Version20220527124438 extends AbstractMigration
     {
         $this->addSql('ALTER TABLE activity ADD privateComment_comments JSON DEFAULT \'{}\'');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP privateComment_comments');
-    }
 }
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20220527124558.php b/src/Bundle/ChillCalendarBundle/migrations/Version20220527124558.php
index 17c53a004..39c4cb7c3 100644
--- a/src/Bundle/ChillCalendarBundle/migrations/Version20220527124558.php
+++ b/src/Bundle/ChillCalendarBundle/migrations/Version20220527124558.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * 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.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Calendar;
@@ -9,6 +16,11 @@ use Doctrine\Migrations\AbstractMigration;
 
 final class Version20220527124558 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_calendar.calendar DROP privateComment_comments');
+    }
+
     public function getDescription(): string
     {
         return 'add private comment to calendar';
@@ -18,9 +30,4 @@ final class Version20220527124558 extends AbstractMigration
     {
         $this->addSql('ALTER TABLE chill_calendar.calendar ADD privateComment_comments JSON DEFAULT NULL');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_calendar.calendar DROP privateComment_comments');
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
index e27e906c0..09a35324e 100644
--- a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
+++ b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
@@ -13,6 +13,7 @@ namespace Chill\MainBundle\Entity\Embeddable;
 
 use Chill\MainBundle\Entity\User;
 use Doctrine\ORM\Mapping as ORM;
+use function array_key_exists;
 
 /**
  * @ORM\Embeddable
@@ -21,6 +22,7 @@ class PrivateCommentEmbeddable
 {
     /**
      * @ORM\Column(type="json", nullable=false, options={"default": "{}"})
+     *
      * @var array<int, string>
      */
     private array $comments = [];
@@ -30,17 +32,17 @@ class PrivateCommentEmbeddable
         return $this->comments[$user->getId()] ?? '';
     }
 
-    public function hasCommentForUser(User $user): bool
-    {
-        return array_key_exists($user->getId(), $this->comments)
-            && "" !== $this->comments[$user->getId()];
-    }
-
     public function getComments(): ?array
     {
         return $this->comments;
     }
 
+    public function hasCommentForUser(User $user): bool
+    {
+        return array_key_exists($user->getId(), $this->comments)
+            && '' !== $this->comments[$user->getId()];
+    }
+
     public function merge(PrivateCommentEmbeddable $newComment): self
     {
         $currentComments = null === $this->getComments() ? [] : $this->getComments();
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220513151853.php b/src/Bundle/ChillMainBundle/migrations/Version20220513151853.php
index 31319ce1b..ec99ce2ba 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220513151853.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220513151853.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * 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.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Main;
@@ -9,6 +16,10 @@ use Doctrine\Migrations\AbstractMigration;
 
 final class Version20220513151853 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+    }
+
     public function getDescription(): string
     {
         return 'set default on attributes';
@@ -18,9 +29,4 @@ final class Version20220513151853 extends AbstractMigration
     {
         $this->addSql('update users set attributes = \'[]\'::json where attributes IS NULL');
     }
-
-    public function down(Schema $schema): void
-    {
-
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220527124737.php b/src/Bundle/ChillPersonBundle/migrations/Version20220527124737.php
index b8f5b1dde..75b598db3 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220527124737.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220527124737.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * 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.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -9,6 +16,11 @@ use Doctrine\Migrations\AbstractMigration;
 
 final class Version20220527124737 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activity DROP privateComment_comments');
+    }
+
     public function getDescription(): string
     {
         return 'add private comment on accompanying period work';
@@ -18,9 +30,4 @@ final class Version20220527124737 extends AbstractMigration
     {
         $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD privateComment_comments JSON DEFAULT \'{}\'');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE activity DROP privateComment_comments');
-    }
 }

From f3800ff38fa0e1a8a812ac7aa561970b09eaa368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 27 May 2022 15:58:51 +0200
Subject: [PATCH 43/47] fix issue with null comment and set correct variable
 name in signature

---
 .../PrivateCommentEmbeddableNormalizer.php           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
index a1ff7e5ba..fc5853c17 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
@@ -27,20 +27,20 @@ class PrivateCommentEmbeddableNormalizer implements NormalizerInterface, Denorma
 
     public function denormalize($data, string $type, ?string $format = null, array $context = []): PrivateCommentEmbeddable
     {
-        if (null === $data) {
-            return null;
-        }
-
         $comment = new PrivateCommentEmbeddable();
 
+        if (null === $data) {
+            return $comment;
+        }
+
         $comment->setCommentForUser($this->security->getUser(), $data);
 
         return $comment;
     }
 
-    public function normalize($comment, $format = null, array $contect = []): string
+    public function normalize($object, $format = null, array $context = []): string
     {
-        return $comment->getCommentForUser($this->security->getUser());
+        return $object->getCommentForUser($this->security->getUser());
     }
 
     public function supportsDenormalization($data, string $type, ?string $format = null): bool

From 7278a5f3faa730ee0d15b3069404197e31ff0a50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 27 May 2022 16:24:55 +0200
Subject: [PATCH 44/47] fix strict typing and do not show link to edit password
 in user list

---
 phpstan-deprecations.neon                                    | 5 -----
 src/Bundle/ChillMainBundle/Controller/UserController.php     | 5 +++++
 src/Bundle/ChillMainBundle/Form/UserType.php                 | 1 +
 .../ChillMainBundle/Resources/views/User/index.html.twig     | 4 ++++
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/phpstan-deprecations.neon b/phpstan-deprecations.neon
index 2de8b8bc8..42981a551 100644
--- a/phpstan-deprecations.neon
+++ b/phpstan-deprecations.neon
@@ -471,11 +471,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Form/Type/UserPickerType.php
 
-		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/UserType.php
-
 		-
 			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
 			count: 2
diff --git a/src/Bundle/ChillMainBundle/Controller/UserController.php b/src/Bundle/ChillMainBundle/Controller/UserController.php
index 4eb22c5d3..b6ded6653 100644
--- a/src/Bundle/ChillMainBundle/Controller/UserController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserController.php
@@ -344,6 +344,11 @@ class UserController extends CRUDController
                     ),
                 ]
             );
+        } elseif ('index' === $action) {
+            return array_merge(
+                ['allow_change_password' => $this->parameterBag->get('chill_main.access_user_change_password')],
+                $defaultTemplateParameters
+            );
         }
 
         // default behaviour
diff --git a/src/Bundle/ChillMainBundle/Form/UserType.php b/src/Bundle/ChillMainBundle/Form/UserType.php
index 9e7da7a89..34c49bc38 100644
--- a/src/Bundle/ChillMainBundle/Form/UserType.php
+++ b/src/Bundle/ChillMainBundle/Form/UserType.php
@@ -112,6 +112,7 @@ class UserType extends AbstractType
                 },
             ]);
 
+        // @phpstan-ignore-next-line
         if ($options['is_creation'] && $this->parameterBag->get('chill_main.access_user_change_password')) {
             $builder->add('plainPassword', RepeatedType::class, [
                 'mapped' => false,
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
index 1d254abb9..ec93cf8a7 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
@@ -50,9 +50,13 @@
                     <li>
                         <a class="btn btn-edit" href="{{ path('chill_crud_admin_user_edit', { 'id': entity.id }) }}"></a>
                     </li>
+
+                    {% if allow_change_password is same as(true) %}
                     <li>
                         <a class="btn btn-chill-red" href="{{ path('admin_user_edit_password',  { 'id' : entity.id }) }}" title="{{ 'Edit password'|trans|e('html_attr') }}"><i class="fa fa-ellipsis-h"></i></a>
                     </li>
+                    {% endif %}
+
                     {% if is_granted('ROLE_ALLOWED_TO_SWITCH') %}
                         <li>
                             <a class="btn btn-chill-blue" href="{{ path('chill_main_homepage', {'_switch_user': entity.username }) }}" title="{{ "Impersonate"|trans|e('html_attr') }}"><i class="fa fa-user-secret"></i></a>

From 3c8b2207c4b021566aed12b27a7a0d59d7004118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 27 May 2022 16:34:14 +0200
Subject: [PATCH 45/47] add civility in user docgen normalizer

---
 .../Serializer/Normalizer/UserNormalizer.php               | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
index 365433ef3..eba8fc7bc 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Serializer\Normalizer;
 
 use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Civility;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
@@ -60,9 +61,14 @@ class UserNormalizer implements ContextAwareNormalizerInterface, NormalizerAware
             $context,
             ['docgen:expects' => Location::class, 'groups' => 'docgen:read']
         );
+        $civilityContext = array_merge(
+            $context,
+            ['docgen:expects' => Civility::class, 'groups' => 'docgen:read']
+        );
 
         if (null === $user && 'docgen' === $format) {
             return array_merge(self::NULL_USER, [
+                'civility' => $this->normalizer->normalize(null, $format, $civilityContext),
                 'user_job' => $this->normalizer->normalize(null, $format, $userJobContext),
                 'main_center' => $this->normalizer->normalize(null, $format, $centerContext),
                 'main_scope' => $this->normalizer->normalize(null, $format, $scopeContext),
@@ -84,6 +90,7 @@ class UserNormalizer implements ContextAwareNormalizerInterface, NormalizerAware
         ];
 
         if ('docgen' === $format) {
+            $data['civility'] = $this->normalizer->normalize($user->getCivility(), $format, $civilityContext);
             $data['current_location'] = $this->normalizer->normalize($user->getCurrentLocation(), $format, $locationContext);
             $data['main_location'] = $this->normalizer->normalize($user->getMainLocation(), $format, $locationContext);
         }

From 9680f7c01e6b90af2af9cb1838dc739a40830506 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 27 May 2022 16:34:30 +0200
Subject: [PATCH 46/47] remove deprecated notation for getting entity

---
 .../Service/DocGenerator/AccompanyingPeriodContext.php         | 3 ++-
 .../ChillPersonBundle/Service/DocGenerator/PersonContext.php   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
index dc6e9c912..d3400034b 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
@@ -17,6 +17,7 @@ use Chill\DocGeneratorBundle\Context\Exception\UnexpectedTypeException;
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\DocGeneratorBundle\Service\Context\BaseContextData;
 use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
+use Chill\DocStoreBundle\Entity\DocumentCategory;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Repository\DocumentCategoryRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
@@ -132,7 +133,7 @@ class AccompanyingPeriodContext implements
             ])
             ->add('category', EntityType::class, [
                 'placeholder' => 'Choose a document category',
-                'class' => 'ChillDocStoreBundle:DocumentCategory',
+                'class' => DocumentCategory::class,
                 'query_builder' => static function (EntityRepository $er) {
                     return $er->createQueryBuilder('c')
                         ->where('c.documentClass = :docClass')
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
index 1561f0735..231e674b2 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
@@ -15,6 +15,7 @@ use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithAdminFormInterface;
 use Chill\DocGeneratorBundle\Context\Exception\UnexpectedTypeException;
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\DocGeneratorBundle\Service\Context\BaseContextData;
+use Chill\DocStoreBundle\Entity\DocumentCategory;
 use Chill\DocStoreBundle\Entity\PersonDocument;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Repository\DocumentCategoryRepository;
@@ -92,7 +93,7 @@ class PersonContext implements DocGeneratorContextWithAdminFormInterface
         $builder
             ->add('category', EntityType::class, [
                 'placeholder' => 'Choose a document category',
-                'class' => 'ChillDocStoreBundle:DocumentCategory',
+                'class' => DocumentCategory::class,
                 'query_builder' => static function (EntityRepository $er) {
                     return $er->createQueryBuilder('c')
                         ->where('c.documentClass = :docClass')

From d4aba04a52a62bb828f742308841a817698d6bb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 27 May 2022 16:41:38 +0200
Subject: [PATCH 47/47] do not show action when editing goals

---
 .../ChillPersonBundle/Form/SocialWork/GoalType.php   | 12 ------------
 .../Resources/views/SocialWork/Goal/index.html.twig  |  6 ------
 2 files changed, 18 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php
index 5fc77b410..812062137 100644
--- a/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php
+++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php
@@ -43,17 +43,6 @@ class GoalType extends AbstractType
             ->add('title', TranslatableStringFormType::class, [
                 'label' => 'Nom',
             ])
-
-            ->add('socialActions', EntityType::class, [
-                'class' => SocialAction::class,
-                'required' => false,
-                'multiple' => true,
-                'choice_label' => function (SocialAction $issue) {
-                    return $this->translatableStringHelper->localize($issue->getTitle());
-                },
-                'attr' => ['class' => 'select2 '],
-            ])
-
             ->add('results', EntityType::class, [
                 'class' => Result::class,
                 'required' => false,
@@ -63,7 +52,6 @@ class GoalType extends AbstractType
                 },
                 'attr' => ['class' => 'select2 '],
             ])
-
             ->add('desactivationDate', ChillDateType::class, [
                 'required' => false,
                 'label' => 'goal.desactivationDate',
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Goal/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Goal/index.html.twig
index 20f944595..14e9bab73 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Goal/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Goal/index.html.twig
@@ -5,7 +5,6 @@
         {% block table_entities_thead_tr %}
             <th>{{ 'Id'|trans }}</th>
             <th>{{ 'Title'|trans }}</th>
-            <th>{{ 'Social actions'|trans }}</th>
             <th>{{ 'goal.results'|trans }}</th>
             <th>{{ 'goal.desactivationDate'|trans }}</th>
             <th>&nbsp;</th>
@@ -17,11 +16,6 @@
                 <td>{{ entity.id }}</td>
                 <td>{{ entity.title|localize_translatable_string }}</td>
                 <td>
-                {% for sa in entity.socialActions %}
-                   {{ sa.title|localize_translatable_string }}{% if not loop.last %},{% else %}.{% endif %}
-                {% endfor %}
-                </td>
-                <td>
                 {% for sa in entity.results %}
                    {{ sa.title|localize_translatable_string }}{% if not loop.last %},{% else %}.{% endif %}
                 {% endfor %}