Merge remote-tracking branch 'origin/master' into issue577_user_admin

.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

CHANGELOG.md

@@ -38,6 +38,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)
 
 ### 2021-04-28
 

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;
@@ -134,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"})
@@ -193,6 +200,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     {
         $this->reasons = new ArrayCollection();
         $this->comment = new CommentEmbeddable();
+        $this->privateComment = new PrivateCommentEmbeddable();
         $this->persons = new ArrayCollection();
         $this->thirdParties = new ArrayCollection();
         $this->documents = new ArrayCollection();
@@ -400,6 +408,11 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return [];
     }
 
+    public function getPrivateComment(): PrivateCommentEmbeddable
+    {
+        return $this->privateComment;
+    }
+
     public function getReasons(): Collection
     {
         return $this->reasons;
@@ -586,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;

src/Bundle/ChillActivityBundle/Entity/ActivityType.php

@@ -167,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": ""})
      */
@@ -416,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;
@@ -688,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;

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;
@@ -251,6 +252,13 @@ class ActivityType extends AbstractType
             ]);
         }
 
+        if ($activityType->isVisible('privateComment')) {
+            $builder->add('privateComment', PrivateCommentType::class, [
+                'label' => '' === $activityType->getLabel('privateComment') ? 'private comment' : $activityType->getPrivateCommentLabel(),
+                'required' => false,
+            ]);
+        }
+
         if ($activityType->isVisible('persons')) {
             $builder->add('persons', HiddenType::class);
             $builder->get('persons')

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', 'sentReceived', 'documents',
+            'reasons', 'comment', 'privateComment', 'sentReceived', 'documents',
             'emergency', 'socialIssues', 'socialActions', 'users',
         ];
 

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 %}

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 %}

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,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>

src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php

@@ -0,0 +1,35 @@
+<?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;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20220425133027 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $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';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activitytype ADD privateCommentLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD privateCommentVisible SMALLINT DEFAULT 1 NOT NULL');
+    }
+}

src/Bundle/ChillActivityBundle/migrations/Version20220527124438.php

@@ -0,0 +1,33 @@
+<?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;
+
+use Doctrine\DBAL\Schema\Schema;
+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';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activity ADD privateComment_comments JSON DEFAULT \'{}\'');
+    }
+}

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

@@ -44,6 +44,7 @@ Received: Recevoir
 by: 'Par '
 location: Lieu
 Reasons: Sujets
+Private comment: Commentaire privé
 
 
 #forms
@@ -175,6 +176,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

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;
@@ -115,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",
@@ -151,6 +158,7 @@ class Calendar
     public function __construct()
     {
         $this->comment = new CommentEmbeddable();
+        $this->privateComment = new PrivateCommentEmbeddable();
         $this->persons = new ArrayCollection();
         $this->professionals = new ArrayCollection();
         $this->invites = new ArrayCollection();
@@ -278,6 +286,11 @@ class Calendar
         return [];
     }
 
+    public function getPrivateComment(): PrivateCommentEmbeddable
+    {
+        return $this->privateComment;
+    }
+
     /**
      * @return Collection|ThirdParty[]
      */
@@ -407,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;

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,

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 %}

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 %}
@@ -50,22 +54,22 @@
 <div id="fullCalendar"></div>
 
 <ul class="record_actions sticky-form-buttons">
-  <li class="cancel">
+    <li class="cancel">
-    <a
+        <a
-      class="btn btn-cancel"
+        class="btn btn-cancel"
-      {%- if context == 'person' -%}
+        {%- if context == 'person' -%}
-      href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'person_id': person.id } )}}"
+        href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'person_id': person.id } )}}"
-      {%- else -%}
+        {%- else -%}
-      href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'accompanying_period_id': accompanyingCourse.id } )}}"
+        href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'accompanying_period_id': accompanyingCourse.id } )}}"
-      {%- endif -%}
+        {%- endif -%}
-      >
+        >
-      {{ 'Cancel'|trans|chill_return_path_label }}
+        {{ 'Cancel'|trans|chill_return_path_label }}
-    </a>
+        </a>
-  </li>
+    </li>
-  <li>
+    <li>
-    <button class="btn btn-create" type="submit">
+        <button class="btn btn-create" type="submit">
-      {{ 'Create'|trans }}
+        {{ 'Create'|trans }}
-    </button>
+        </button>
-  </li>
+    </li>
 </ul>
 {{ form_end(form) }}

src/Bundle/ChillCalendarBundle/migrations/Version20220527124558.php

@@ -0,0 +1,33 @@
+<?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;
+
+use Doctrine\DBAL\Schema\Schema;
+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';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_calendar.calendar ADD privateComment_comments JSON DEFAULT NULL');
+    }
+}

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

@@ -26,6 +26,7 @@ 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
+
 canceledBy: supprimé par
 Canceled by: supprimé par
 Calendar configuration: Gestion des rendez-vous

src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\DocStoreBundle\Form;
 
 use Chill\DocStoreBundle\Entity\Document;
+use Chill\DocStoreBundle\Entity\DocumentCategory;
 use Chill\DocStoreBundle\Entity\PersonDocument;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ChillTextareaType;
@@ -63,7 +64,7 @@ class PersonDocumentType extends AbstractType
             ->add('date', ChillDateType::class)
             ->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')

src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php

@@ -0,0 +1,70 @@
+<?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;
+use function array_key_exists;
+
+/**
+ * @ORM\Embeddable
+ */
+class PrivateCommentEmbeddable
+{
+    /**
+     * @ORM\Column(type="json", nullable=false, options={"default": "{}"})
+     *
+     * @var array<int, string>
+     */
+    private array $comments = [];
+
+    public function getCommentForUser(User $user): string
+    {
+        return $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();
+
+        $mergedComments = $newComment->getComments() + $currentComments;
+
+        $this->setComments($mergedComments);
+
+        return $this;
+    }
+
+    public function setCommentForUser(User $user, string $content): self
+    {
+        $this->comments[$user->getId()] = trim($content);
+
+        return $this;
+    }
+
+    public function setComments($comments)
+    {
+        $this->comments = $comments;
+
+        return $this;
+    }
+}

src/Bundle/ChillMainBundle/Form/DataMapper/PrivateCommentDataMapper.php

@@ -0,0 +1,50 @@
+<?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());
+    }
+}

src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php

@@ -0,0 +1,62 @@
+<?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\Type;
+
+use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
+use Chill\MainBundle\Form\DataMapper\PrivateCommentDataMapper;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\User\UserInterface;
+
+class PrivateCommentType extends AbstractType
+{
+    protected PrivateCommentDataMapper $dataMapper;
+
+    protected UserInterface $user;
+
+    public function __construct(TokenStorageInterface $tokenStorage, PrivateCommentDataMapper $dataMapper)
+    {
+        $this->user = $tokenStorage->getToken()->getUser();
+        $this->dataMapper = $dataMapper;
+    }
+
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('comments', ChillTextareaType::class, [
+                'disable_editor' => $options['disable_editor'],
+                'label' => false,
+            ])
+            ->setDataMapper($this->dataMapper);
+    }
+
+    public function buildView(FormView $view, FormInterface $form, array $options)
+    {
+        $view->vars['hideLabel'] = true;
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefined('disable_editor')
+            ->setAllowedTypes('disable_editor', 'bool')
+            ->setDefaults([
+                'data_class' => PrivateCommentEmbeddable::class,
+                'disable_editor' => false,
+            ]);
+    }
+}

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

@@ -298,6 +298,10 @@ table.table-bordered {
    }
 }
 
+.private-quote {
+   border-left: 10px solid $pink;
+}
+
 /// meta-data
 div.createdBy,
 div.updatedBy,

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) }}

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

@@ -0,0 +1,55 @@
+<?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\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 = []): PrivateCommentEmbeddable
+    {
+        $comment = new PrivateCommentEmbeddable();
+
+        if (null === $data) {
+            return $comment;
+        }
+
+        $comment->setCommentForUser($this->security->getUser(), $data);
+
+        return $comment;
+    }
+
+    public function normalize($object, $format = null, array $context = []): string
+    {
+        return $object->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;
+    }
+}

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

src/Bundle/ChillMainBundle/config/services/serializer.yaml

@@ -10,4 +10,9 @@ services:
     Chill\MainBundle\Serializer\Normalizer\DoctrineExistingEntityNormalizer:
         tags:
             - { name: 'serializer.normalizer', priority: 8 }
+    Chill\MainBundle\Serializer\Normalizer\PrivateCommentEmbeddableNormalizer:
+        autowire: true
+        autoconfigure: true
+        tags:
+            - { name: 'serializer.normalizer', priority: 64 }
 

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ées
 
 #pagination
 Previous: Précédent

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\PrivateCommentEmbeddable;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodLinkedWithSocialIssuesEntityInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
@@ -143,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")
@@ -202,6 +209,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
     public function __construct()
     {
         $this->goals = new ArrayCollection();
+        $this->privateComment = new PrivateCommentEmbeddable();
         $this->results = new ArrayCollection();
         $this->thirdParties = new ArrayCollection();
         $this->persons = new ArrayCollection();
@@ -328,6 +336,11 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this->persons;
     }
 
+    public function getPrivateComment(): PrivateCommentEmbeddable
+    {
+        return $this->privateComment;
+    }
+
     /**
      * @return Collection|User[]
      */
@@ -505,6 +518,13 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this;
     }
 
+    public function setPrivateComment(PrivateCommentEmbeddable $privateComment): self
+    {
+        $this->privateComment->merge($privateComment);
+
+        return $this;
+    }
+
     public function setSocialAction(?SocialAction $socialAction): self
     {
         $this->socialAction = $socialAction;

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) {
+            updateReferrer({ commit, state }, payload) {
-               console.log('update referrer', payload);
-               console.log('payload !== null', payload !== null);
                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 } };
                }

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="privateComment" 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,6 +42,7 @@
          ></ckeditor>
       </div>
 
+
       <div id="objectives" class="action-row">
          <div aria="hidden" class="title">
             <div><h3>{{ $t('goals_title') }}</h3></div>
@@ -141,12 +151,12 @@
 
          <ul class="list-unstyled">
             <li v-for="p in personsReachables" :key="p.id">
-              <div class="form-check">
+               <div class="form-check">
-                <input v-model="personsPicked" :value="p.id" type="checkbox" class="me-2 form-check-input" :id="'person_check'+p.id">
+                  <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">
+                  <label :for="'person_check'+p.id" class="form-check-label">
-                  <person-text :person="p"></person-text>
+                     <person-text :person="p"></person-text>
-               </label>
+                  </label>
-              </div>
+               </div>
             </li>
          </ul>
       </div>
@@ -274,18 +284,18 @@
       </div>
 
    </div>
-  <ul class="record_actions sticky-form-buttons">
+   <ul class="record_actions sticky-form-buttons">
-    <li>
+      <li>
-       <list-workflow-modal
+         <list-workflow-modal
-          :workflows="this.work.workflows"
+            :workflows="this.work.workflows"
-          :allowCreate="true"
+            :allowCreate="true"
-          relatedEntityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork"
+            relatedEntityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork"
-          :relatedEntityId="this.work.id"
+            :relatedEntityId="this.work.id"
-          :workflowsAvailables="this.work.workflows_availables"
+            :workflowsAvailables="this.work.workflows_availables"
-          :preventDefaultMoveToGenerate="true"
+            :preventDefaultMoveToGenerate="true"
-          @go-to-generate-workflow="goToGenerateWorkflow"
+            @go-to-generate-workflow="goToGenerateWorkflow"
-       ></list-workflow-modal>
+         ></list-workflow-modal>
-    </li>
+      </li>
 
       <li v-if="!isPosting">
          <button class="btn btn-save" @click="submit">
@@ -355,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é"
       }
    }
 };
@@ -417,8 +428,8 @@ export default {
          },
       };
    },
-  computed: {
+   computed: {
-    ...mapState([
+      ...mapState([
          'work',
          'resultsForAction',
          'evaluationsForAction',
@@ -461,6 +472,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);
 
@@ -573,6 +592,7 @@ div#workEditor {
       "title title"
       "startDate endDate"
       "comment comment"
+      "privateComment privateComment"
       "objectives objectives"
       "evaluations evaluations"
       "persons persons"
@@ -589,6 +609,8 @@ div#workEditor {
       grid-area: endDate; }
    #comment {
       grid-area: comment; }
+   #privateComment {
+      grid-area: privateComment; }
    #objectives {
       grid-area: objectives; }
    #evaluations {

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js

@@ -17,6 +17,7 @@ const store = createStore({
     endDate: window.accompanyingCourseWork.endDate !== null ?
         dateToISO(new Date(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(ISOToDate(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,
@@ -297,6 +299,9 @@ const store = createStore({
     setNote(state, note) {
       state.note = note;
     },
+    setPrivateComment(state, privateComment) {
+      state.privateComment = privateComment;
+    },
     setHandlingThirdParty(state, thirdParty) {
       state.handlingThirdParty = thirdParty;
     },
@@ -454,6 +459,8 @@ const store = createStore({
       ;
       commit('setIsPosting', true);
 
+      console.log('payload', payload);
+
       return makeFetch('PUT', url, payload)
         .then(data => {
           if (typeof(callback) !== 'undefined') {

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:

src/Bundle/ChillPersonBundle/migrations/Version20220527124737.php

@@ -0,0 +1,33 @@
+<?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;
+
+use Doctrine\DBAL\Schema\Schema;
+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';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD privateComment_comments JSON DEFAULT \'{}\'');
+    }
+}

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

@@ -608,6 +608,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