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

CHANGELOG.md

@@ -11,15 +11,33 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
-* [Activity form] invert 'incoming' and 'receiving' in Activity form
-* [Activity form] keep the same order for 'attendee' field in new and edit form
-* [list with period] use "sameas" test operator to introduce requestor in list
 * [Datepickers] datepickers fixed when using keyboard to enter date (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/545)
-
+* [social_action] Display 'agents traitants' in parcours resumé and social action list (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/568)
 
 ## Test releases
 
+### 2021-04-24
+
+* [notification email on course designation] allow raw string in email content generation
+* [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older
+* [Documents] Change wording 'créer' to 'enregistrer' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/634)
+* [Parcours]: The number of 'mes parcours' displayed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/572)
+* [Hompage_widget]: Renaming of tabs and removal of social actions tab (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/570)
+* [activity]: Ignore thirdparties when creating a social action via an activity (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/573)
+* [parcours]: change wording of warning message and button when user is not associated to a household yet (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/590#note_918370943)
+* [Accompanying period work evaluations] list documents associated to a work by creation date, and then by id, from the most recent to older
+* [Course comment] add validationConstraint NotNull and NotBlank on comment content, to avoid sql error
+* [Notifications] delay the sending of notificaiton to kernel.terminate
+* [Notifications / Period user change] fix the sending of notification when user changes 
+* [Activity form] invert 'incoming' and 'receiving' in Activity form
+* [Activity form] keep the same order for 'attendee' field in new and edit form
+* [list with period] use "sameas" test operator to introduce requestor in list
+* [notification email on course designation] allow raw string in email content generation
+* [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older
+
+
 ### 2021-04-13
+
 * [person] household address: add a form for editing the validFrom date (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/541)
 * [person] householdmemberseditor: fix composition type bug in select form (vuejs) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/543)
 * [docgen] add more persons choices in docgen for course: amongst requestor (if person), resources of course (if person), and PersonResource (if person);

src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php

@@ -66,9 +66,6 @@ class ActivityEntityListener
                     $newAction->addPerson($person);
                 }
 
-                foreach ($associatedThirdparties as $thirdparty) {
-                    $newAction->setHandlingThierparty($thirdparty);
-                }
                 $this->em->persist($newAction);
                 $this->em->flush();
             }

src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/new.html.twig

@@ -30,7 +30,7 @@
 			</a>
 		</li>
 		<li class="create">
-			<button class="btn btn-create">{{ 'Create'|trans }}</button>
+			<button class="btn btn-save">{{ 'Save'|trans }}</button>
 		</li>
 	</ul>
 	{{ form_end(form) }}

src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig

@@ -47,7 +47,7 @@
 			</a>
 		</li>
 		<li class="create">
-			<button class="btn btn-create">{{ 'Create'|trans }}</button>
+			<button class="btn btn-save">{{ 'Save'|trans }}</button>
 		</li>
 	</ul>
 	{{ form_end(form) }}

src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php

@@ -0,0 +1,58 @@
+<?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\Notification\EventListener;
+
+use Chill\MainBundle\Notification\NotificationPersisterInterface;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\Event\TerminateEvent;
+use function count;
+
+class PersistNotificationOnTerminateEventSubscriber implements EventSubscriberInterface
+{
+    private EntityManagerInterface $em;
+
+    private NotificationPersisterInterface $persister;
+
+    public function __construct(EntityManagerInterface $em, NotificationPersisterInterface $persister)
+    {
+        $this->em = $em;
+        $this->persister = $persister;
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return [
+            'kernel.terminate' => [
+                ['onKernelTerminate', 1024], // we must ensure that the priority is before sending email
+            ],
+        ];
+    }
+
+    public function onKernelTerminate(TerminateEvent $event): void
+    {
+        if ($event->isMasterRequest()) {
+            $this->persistNotifications();
+        }
+    }
+
+    private function persistNotifications(): void
+    {
+        if (0 < count($this->persister->getWaitingNotifications())) {
+            foreach ($this->persister->getWaitingNotifications() as $notification) {
+                $this->em->persist($notification);
+            }
+
+            $this->em->flush();
+        }
+    }
+}

src/Bundle/ChillMainBundle/Notification/NotificationPersister.php

@@ -0,0 +1,32 @@
+<?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\Notification;
+
+use Chill\MainBundle\Entity\Notification;
+
+class NotificationPersister implements NotificationPersisterInterface
+{
+    private array $waitingNotifications = [];
+
+    /**
+     * @return array|Notification[]
+     */
+    public function getWaitingNotifications(): array
+    {
+        return $this->waitingNotifications;
+    }
+
+    public function persist(Notification $notification): void
+    {
+        $this->waitingNotifications[] = $notification;
+    }
+}

src/Bundle/ChillMainBundle/Notification/NotificationPersisterInterface.php

@@ -0,0 +1,31 @@
+<?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\Notification;
+
+use Chill\MainBundle\Entity\Notification;
+
+/**
+ * Store the notification.
+ *
+ * Those notification will be stored into database by the kernel. This
+ * will also ensure that this happens outside of regular operations
+ * operated by the entity manager.
+ */
+interface NotificationPersisterInterface
+{
+    /**
+     * @return array|Notification[]
+     */
+    public function getWaitingNotifications(): array;
+
+    public function persist(Notification $notification): void;
+}

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue

@@ -25,14 +25,14 @@
             {{ $t('my_accompanying_courses.tab') }}
          </a>
       </li>
-      <li class="nav-item">
+      <!-- <li class="nav-item">
          <a class="nav-link"
             :class="{'active': activeTab === 'MyWorks'}"
             @click="selectTab('MyWorks')">
             {{ $t('my_works.tab') }}
             <tab-counter :count="state.works.count"></tab-counter>
          </a>
-      </li>
+      </li> -->
       <li class="nav-item">
          <a class="nav-link"
             :class="{'active': activeTab === 'MyEvaluations'}"
@@ -135,7 +135,7 @@ export default {
       for (const m of [
          'MyNotifications',
          'MyAccompanyingCourses',
-         'MyWorks',
+         // 'MyWorks',
          'MyEvaluations',
          'MyTasks',
          'MyWorkflows',

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue

@@ -1,3 +1,4 @@
+// CURRENTLY NOT IN USE
 <template>
 <div class="accompanying_course_work">
    <div class="alert alert-light">{{ $t('my_works.description') }}</div>

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js

@@ -15,11 +15,11 @@ const appMessages = {
             description_warning: "Liste des tâches auxquelles je suis assigné et dont la date d'échéance est dépassée.",
         },
         my_accompanying_courses: {
-            tab: "Mes parcours",
+            tab: "Mes nouveaux parcours",
-            description: "Liste des parcours d'accompagnement que l'on vient de m'attribuer.",
+            description: "Liste des parcours d'accompagnement que l'on vient de m'attribuer depuis moins de 15 jours.",
         },
         my_notifications: {
-            tab: "Mes notifications",
+            tab: "Mes nouvelles notifications",
             description: "Liste des notifications reçues et non lues.",
         },
         my_workflows: {

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/store.js

@@ -13,7 +13,7 @@ const isEmpty = (obj) => {
 const store = createStore({
     strict: debug,
     state: {
-        works: {},
+        // works: {},
         evaluations: {},
         tasks: {
             warning: {},
@@ -26,9 +26,9 @@ const store = createStore({
         loading: false
     },
     getters: {
-        isWorksLoaded(state) {
+        // isWorksLoaded(state) {
-            return !isEmpty(state.works);
+        //     return !isEmpty(state.works);
-        },
+        // },
         isEvaluationsLoaded(state) {
             return !isEmpty(state.evaluations);
         },
@@ -49,7 +49,7 @@ const store = createStore({
         },
         counter(state) {
             return {
-                works: state.works.count,
+                // works: state.works.count,
                 evaluations: state.evaluations.count,
                 tasksWarning: state.tasks.warning.count,
                 tasksAlert: state.tasks.alert.count,
@@ -60,10 +60,10 @@ const store = createStore({
         }
     },
     mutations: {
-        addWorks(state, works) {
+        // addWorks(state, works) {
-            //console.log('addWorks', works);
+        //     //console.log('addWorks', works);
-            state.works = works;
+        //     state.works = works;
-        },
+        // },
         addEvaluations(state, evaluations) {
             //console.log('addEvaluations', evaluations);
             state.evaluations = evaluations;
@@ -99,22 +99,22 @@ const store = createStore({
             switch (tab) {
                 case 'MyCustoms':
                     break;
-                case 'MyWorks':
+                // case 'MyWorks':
-                    if (!getters.isWorksLoaded) {
+                //     if (!getters.isWorksLoaded) {
-                        commit('setLoading', true);
+                //         commit('setLoading', true);
-                        const url = `/api/1.0/person/accompanying-period/work/my-near-end${'?'+ param}`;
+                //         const url = `/api/1.0/person/accompanying-period/work/my-near-end${'?'+ param}`;
-                        makeFetch('GET', url)
+                //         makeFetch('GET', url)
-                            .then((response) => {
+                //             .then((response) => {
-                                commit('addWorks', response);
+                //                 commit('addWorks', response);
-                                commit('setLoading', false);
+                //                 commit('setLoading', false);
-                            })
+                //             })
-                            .catch((error) => {
+                //             .catch((error) => {
-                                commit('catchError', error);
+                //                 commit('catchError', error);
-                                throw error;
+                //                 throw error;
-                            })
+                //             })
-                        ;
+                //         ;
-                    }
+                //     }
-                    break;
+                //     break;
                 case 'MyEvaluations':
                     if (!getters.isEvaluationsLoaded) {
                         commit('setLoading', true);

src/Bundle/ChillMainBundle/Tests/Notification/EventListener/PersistNotificationOnTerminateEventSubscriberTest.php

@@ -0,0 +1,47 @@
+<?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 Notification\EventListener;
+
+use Chill\MainBundle\Entity\Notification;
+use Chill\MainBundle\Notification\EventListener\PersistNotificationOnTerminateEventSubscriber;
+use Chill\MainBundle\Notification\NotificationPersister;
+use Doctrine\ORM\EntityManagerInterface;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\HttpKernel\Event\TerminateEvent;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class PersistNotificationOnTerminateEventSubscriberTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testNotificationIsPersisted()
+    {
+        $persister = new NotificationPersister();
+        $em = $this->prophesize(EntityManagerInterface::class);
+        $em->persist(Argument::type(Notification::class))->shouldBeCalledTimes(1);
+        $em->flush()->shouldBeCalledTimes(1);
+        $event = $this->prophesize(TerminateEvent::class);
+        $event->isMasterRequest()->willReturn(true);
+
+        $eventSubscriber = new PersistNotificationOnTerminateEventSubscriber($em->reveal(), $persister);
+
+        $notification = new Notification();
+        $persister->persist($notification);
+
+        $eventSubscriber->onKernelTerminate($event->reveal());
+    }
+}

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

@@ -3,6 +3,11 @@ services:
         autowire: true
         autoconfigure: true
 
+    Chill\MainBundle\Notification\:
+        resource: ../../Notification/
+        autoconfigure: true
+        autowire: true
+
     Chill\MainBundle\Notification\Mailer:
         arguments:
             $logger: '@Psr\Log\LoggerInterface'
@@ -17,12 +22,6 @@ services:
         arguments:
             $handlers: !tagged_iterator chill_main.notification_handler
 
-    Chill\MainBundle\Notification\NotificationPresence: ~
-
-    Chill\MainBundle\Notification\Templating\NotificationTwigExtension: ~
-
-    Chill\MainBundle\Notification\Templating\NotificationTwigExtensionRuntime: ~
-
     Chill\MainBundle\Notification\Counter\NotificationByUserCounter:
         autoconfigure: true
         autowire: true

src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/PersonAddressMoveEventSubscriber.php

@@ -13,10 +13,10 @@ namespace Chill\PersonBundle\AccompanyingPeriod\Events;
 
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\Notification;
+use Chill\MainBundle\Notification\NotificationPersisterInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Event\Person\PersonAddressMoveEvent;
 use DateTimeImmutable;
-use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Templating\EngineInterface;
@@ -26,7 +26,7 @@ class PersonAddressMoveEventSubscriber implements EventSubscriberInterface
 {
     private EngineInterface $engine;
 
-    private EntityManagerInterface $entityManager;
+    private NotificationPersisterInterface $notificationPersister;
 
     private Security $security;
 
@@ -34,12 +34,12 @@ class PersonAddressMoveEventSubscriber implements EventSubscriberInterface
 
     public function __construct(
         EngineInterface $engine,
-        EntityManagerInterface $entityManager,
+        NotificationPersisterInterface $notificationPersister,
         Security $security,
         TranslatorInterface $translator
     ) {
         $this->engine = $engine;
-        $this->entityManager = $entityManager;
+        $this->notificationPersister = $notificationPersister;
         $this->security = $security;
         $this->translator = $translator;
     }
@@ -87,7 +87,7 @@ class PersonAddressMoveEventSubscriber implements EventSubscriberInterface
                             'period' => $period,
                         ]));
 
-                    $this->entityManager->persist($notification);
+                    $this->notificationPersister->persist($notification);
                 }
             }
         }

src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php

@@ -13,8 +13,8 @@ namespace Chill\PersonBundle\AccompanyingPeriod\Events;
 
 use Chill\MainBundle\Entity\Notification;
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Notification\NotificationPersisterInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\Event\LifecycleEventArgs;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Security\Core\Security;
@@ -24,20 +24,20 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class UserRefEventSubscriber implements EventSubscriberInterface
 {
-    private EntityManagerInterface $em;
-
     private EngineInterface $engine;
 
+    private NotificationPersisterInterface $notificationPersister;
+
     private Security $security;
 
     private TranslatorInterface $translator;
 
-    public function __construct(Security $security, TranslatorInterface $translator, EngineInterface $engine, EntityManagerInterface $em)
+    public function __construct(Security $security, TranslatorInterface $translator, EngineInterface $engine, NotificationPersisterInterface $notificationPersister)
     {
         $this->security = $security;
         $this->translator = $translator;
         $this->engine = $engine;
-        $this->em = $em;
+        $this->notificationPersister = $notificationPersister;
     }
 
     public static function getSubscribedEvents()
@@ -58,16 +58,13 @@ class UserRefEventSubscriber implements EventSubscriberInterface
 
     public function postUpdate(AccompanyingPeriod $period, LifecycleEventArgs $args): void
     {
-        if ($period->hasPreviousUser()
+        if ($period->isChangedUser()
             && $period->getUser() !== $this->security->getUser()
             && null !== $period->getUser()
             && $period->getStep() !== AccompanyingPeriod::STEP_DRAFT
         ) {
             $this->generateNotificationToUser($period);
         }
-
-        // we are just out of a flush operation. Launch a new one
-        $this->em->flush();
     }
 
     private function generateNotificationToUser(AccompanyingPeriod $period)
@@ -89,7 +86,7 @@ class UserRefEventSubscriber implements EventSubscriberInterface
             ))
             ->addAddressee($period->getUser());
 
-        $this->em->persist($notification);
+        $this->notificationPersister->persist($notification);
     }
 
     private function onPeriodConfirmed(AccompanyingPeriod $period)

src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php

@@ -102,7 +102,6 @@ class HouseholdApiController extends ApiController
             $event
                 ->setPreviousAddress($household->getPreviousAddressOf($address))
                 ->setNextAddress($address);
-            dump($event);
             $this->eventDispatcher->dispatch($event);
         }
 

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php

@@ -361,6 +361,8 @@ class AccompanyingPeriod implements
      */
     private Collection $userHistories;
 
+    private bool $userIsChanged = false;
+
     /**
      * Temporary field, which is filled when the user is changed.
      *
@@ -978,6 +980,11 @@ class AccompanyingPeriod implements
         return null !== $this->userPrevious;
     }
 
+    public function isChangedUser(): bool
+    {
+        return $this->userIsChanged && $this->user !== $this->userPrevious;
+    }
+
     /**
      * Returns true if the closing date is after the opening date.
      */
@@ -1103,6 +1110,14 @@ class AccompanyingPeriod implements
         $this->setStep(AccompanyingPeriod::STEP_CONFIRMED);
     }
 
+    public function resetPreviousUser(): self
+    {
+        $this->userPrevious = null;
+        $this->userIsChanged = false;
+
+        return $this;
+    }
+
     /**
      * @Groups({"write"})
      */
@@ -1329,6 +1344,7 @@ class AccompanyingPeriod implements
     {
         if ($this->user !== $user) {
             $this->userPrevious = $this->user;
+            $this->userIsChanged = true;
 
             foreach ($this->userHistories as $history) {
                 if (null === $history->getEndDate()) {

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php

@@ -57,6 +57,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
      *     orphanRemoval=true
      * )
      * @Serializer\Groups({"read", "docgen:read"})
+     * @ORM\OrderBy({"startDate": "DESC", "id": "DESC"})
      *
      * @internal /!\ the serialization for write evaluations is handled in `AccompanyingPeriodWorkDenormalizer`
      */

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php

@@ -77,6 +77,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
      *     cascade={"remove", "persist"},
      *     orphanRemoval=true
      * )
+     * @ORM\OrderBy({"createdAt": "DESC", "id": "DESC"})
      * @Serializer\Groups({"read"})
      */
     private Collection $documents;

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php

@@ -19,6 +19,7 @@ use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Symfony\Component\Serializer\Annotation\Groups;
+use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ORM\Entity
@@ -40,6 +41,8 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface
     /**
      * @ORM\Column(type="text")
      * @Groups({"read", "write"})
+     * @Assert\NotBlank
+     * @Assert\NotNull
      */
     private $content;
 

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StartDate.vue

@@ -26,27 +26,6 @@ export default {
             lastRecordedDate: null
         }
     },
-    methods: {
-        updateStartDate(e) {
-            this.lastRecordedDate = e.target.value;
-
-            setTimeout(() => {
-                console.log('timeout finished')
-                const date = e.target.value
-                if (this.lastRecordedDate === date) {
-                    console.log('last recorded', this.lastRecordedDate, 'value', e.target.value)
-                    this.$store.dispatch('updateStartDate', date)
-                        .catch(({name, violations}) => {
-                            if (name === 'ValidationException' || name === 'AccessException') {
-                                violations.forEach((violation) => this.$toast.open({message: violation}));
-                            } else {
-                                this.$toast.open({message: 'An error occurred'})
-                            }
-                    })
-                }
-            }, 3000)
-        },
-    },
     computed: {
         ...mapState({
             startDate: state => dateToISO(ISOToDatetime(state.accompanyingCourse.openingDate.datetime))
@@ -87,4 +66,4 @@ export default {
         margin-left: 1rem;
     }
 }
-</style>
+</style>

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

@@ -59,8 +59,8 @@ const appMessages = {
          ok: "Oui, l'usager quitte le parcours",
          show_household_number: "Voir le ménage (n° {id})",
          show_household: "Voir le ménage",
-         person_without_household_warning: "Certaines usagers n'appartiennent actuellement à aucun ménage. Renseignez leur appartenance dès que possible.",
+         person_without_household_warning: "Certaines usagers n'appartiennent actuellement à aucun ménage. Veuillez les associer à un ménage dès que possible.",
-         update_household: "Renseigner l'appartenance",
+         update_household: "Associer à un ménage",
          participation_not_valid: "Sélectionnez ou créez au minimum 1 usager",
       },
       requestor: {

src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js

@@ -302,7 +302,7 @@ const store = createStore({
           },
           number_of_children: state.numberOfChildren,
           start_date: {
-            datetime: datetimeToISO(state.startDate),
+            datetime: datetimeToISO(ISOToDate(state.startDate)),
           },
         };
       }

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/Comment/index.html.twig

@@ -40,6 +40,7 @@
         {% endif %}
             {{ form_start(form) }}
             {{ form_errors(form) }}
+            {{ form_errors(form.content) }}
             {{ form_widget(form.content) }}
             <ul class="record_actions">
                 <li>

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig

@@ -25,22 +25,6 @@
     <div class="item-row separator">
         <div class="wrap-list">
 
-            {% if w.createdBy %}
-                <div class="wl-row">
-                    <div class="wl-col title">
-                        <h3>{{ 'Referrers'|trans }}</h3>
-                    </div>
-                    <div class="wl-col list">
-                        <p class="wl-item">
-                            {% for u in w.referrers %}
-                                {{ u|chill_entity_render_box }}
-                                {% if not loop.last %}, {% endif %}
-                            {% endfor %}
-                        </p>
-                    </div>
-                </div>
-            {% endif %}
-
             {%- if w.persons -%}
                 <div class="wl-row">
                     <div class="wl-col title">
@@ -78,6 +62,22 @@
                 </div>
             {% endif %}
 
+            {%- if w.referrers -%}
+                <div class="wl-row">
+                    <div class="wl-col title">
+                        <h3>{{ 'Referrers'|trans }}</h3>
+                    </div>
+                    <div class="wl-col list">
+                        {% for u in w.referrers %}
+                            <span class="wl-item">
+                                {{ u|chill_entity_render_box }}
+                                {% if not loop.last %}, {% endif %}
+                            </span>
+                        {% endfor %}
+                    </div>
+                </div>
+            {% endif %}
+
             {%- if w.socialAction.issue -%}
                 <div class="wl-row">
                     <div class="wl-col title">

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig

@@ -28,6 +28,15 @@
                         <span class="badge-thirdparty">{{ w.handlingThierParty|chill_entity_render_box }}</span>
                     </li>
                     {% endif %}
+                    {% if w.referrers %}
+                    <li>
+                        <span class="item-key">{{ 'Referrers'|trans ~ ' : ' }}</span>
+                        {% for u in w.referrers %}
+                            <span class="badge-user">{{ u|chill_entity_render_box }}</span>
+                            {% if not loop.last %}, {% endif %}
+                        {% endfor %}
+                    </li>
+                    {% endif %}
                     <li class="associated-persons">
                         <span class="item-key">{{ 'Participants'|trans ~ ' : ' }}</span>
                         {% for p in w.persons %}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/user_periods_list.html.twig

@@ -17,6 +17,8 @@
     <div class="col-md-10">
         <h1>{{ 'My accompanying periods'|trans }}</h1>
 
+        <p>{{ 'Number of periods'|trans }}: <span class="badge rounded-pill bg-primary">{{ pagination.totalItems }}</span></p>
+
         <div class="flex-table accompanyingcourse-list">
             {% for period in accompanyingPeriods %}
                 {% include '@ChillPerson/AccompanyingPeriod/_list_item.html.twig' with {'period': period, 'recordAction': _self.recordAction(period)} %}

src/Bundle/ChillPersonBundle/Resources/views/Notification/accompanying_course_designation.md.twig

@@ -1,14 +1,14 @@
-{{ 'period_notification.You are designated to a new period'|trans }}
+{{ 'period_notification.You are designated to a new period'|trans|raw }}
 
-{{ 'period_notification.See it online'|trans }}:
+{{ 'period_notification.See it online'|trans|raw }}:
 
 {{ absolute_url(path('chill_person_accompanying_course_index', {'accompanying_period_id': accompanyingCourse.id}, false)) }}
 
-{{ 'period_notification.Persons are'|trans }}:
+{{ 'period_notification.Persons are'|trans|raw }}:
 
 {% for p in accompanyingCourse.getCurrentParticipations %}
 * {{ p.person|chill_entity_render_string }}
 {% endfor %}
 
-{{ 'period_notification.Social issues are'|trans }}: {% for s in accompanyingCourse.socialIssues %}{{ s|chill_entity_render_string }}{% if not loop.last %}, {% endif %}{% endfor %}.
+{{ 'period_notification.Social issues are'|trans|raw }}: {% for s in accompanyingCourse.socialIssues %}{{ s|chill_entity_render_string }}{% if not loop.last %}, {% endif %}{% endfor %}.
 

src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Events/PersonMoveEventSubscriberTest.php

@@ -14,6 +14,8 @@ namespace AccompanyingPeriod\Events;
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\Notification;
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Notification\NotificationPersister;
+use Chill\MainBundle\Notification\NotificationPersisterInterface;
 use Chill\PersonBundle\AccompanyingPeriod\Events\PersonAddressMoveEventSubscriber;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Household\Household;
@@ -22,7 +24,6 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Event\Person\PersonAddressMoveEvent;
 use DateTime;
 use DateTimeImmutable;
-use Doctrine\ORM\EntityManagerInterface;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use ReflectionClass;
@@ -73,9 +74,9 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase
             ->setPreviousMembership($previousMembership)
             ->setNextMembership($nextMembership);
 
-        $em = $this->prophesize(EntityManagerInterface::class);
+        $notificationPersister = $this->prophesize(NotificationPersisterInterface::class);
-        $em->persist(Argument::type(Notification::class))->shouldNotBeCalled();
+        $notificationPersister->persist(Argument::type(Notification::class))->shouldNotBeCalled();
-        $eventSubscriber = $this->buildSubscriber(null, $em->reveal(), null, null);
+        $eventSubscriber = $this->buildSubscriber(null, $notificationPersister->reveal(), null, null);
 
         $eventSubscriber->resetPeriodLocation($event);
     }
@@ -115,9 +116,9 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase
             ->setPreviousMembership($previousMembership)
             ->setNextMembership($nextMembership);
 
-        $em = $this->prophesize(EntityManagerInterface::class);
+        $notificationPersister = $this->prophesize(NotificationPersisterInterface::class);
-        $em->persist(Argument::type(Notification::class))->shouldBeCalledTimes(1);
+        $notificationPersister->persist(Argument::type(Notification::class))->shouldBeCalledTimes(1);
-        $eventSubscriber = $this->buildSubscriber(null, $em->reveal(), null, null);
+        $eventSubscriber = $this->buildSubscriber(null, $notificationPersister->reveal(), null, null);
 
         $eventSubscriber->resetPeriodLocation($event);
 
@@ -160,9 +161,9 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase
             ->setPreviousMembership($previousMembership)
             ->setNextMembership($nextMembership);
 
-        $em = $this->prophesize(EntityManagerInterface::class);
+        $notificationPersister = $this->prophesize(NotificationPersisterInterface::class);
-        $em->persist(Argument::type(Notification::class))->shouldBeCalled(1);
+        $notificationPersister->persist(Argument::type(Notification::class))->shouldBeCalled(1);
-        $eventSubscriber = $this->buildSubscriber(null, $em->reveal(), null, null);
+        $eventSubscriber = $this->buildSubscriber(null, $notificationPersister->reveal(), null, null);
 
         $eventSubscriber->resetPeriodLocation($event);
 
@@ -195,9 +196,9 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase
         $event
             ->setPreviousMembership($previousMembership);
 
-        $em = $this->prophesize(EntityManagerInterface::class);
+        $notificationPersister = $this->prophesize(NotificationPersisterInterface::class);
-        $em->persist(Argument::type(Notification::class))->shouldBeCalledTimes(1);
+        $notificationPersister->persist(Argument::type(Notification::class))->shouldBeCalledTimes(1);
-        $eventSubscriber = $this->buildSubscriber(null, $em->reveal(), null, null);
+        $eventSubscriber = $this->buildSubscriber(null, $notificationPersister->reveal(), null, null);
 
         $eventSubscriber->resetPeriodLocation($event);
 
@@ -235,9 +236,9 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase
             ->setPreviousAddress($household->getPreviousAddressOf($newAddress))
             ->setNextAddress($newAddress);
 
-        $em = $this->prophesize(EntityManagerInterface::class);
+        $notificationPersister = $this->prophesize(NotificationPersisterInterface::class);
-        $em->persist(Argument::type(Notification::class))->shouldBeCalledTimes(1);
+        $notificationPersister->persist(Argument::type(Notification::class))->shouldBeCalledTimes(1);
-        $eventSubscriber = $this->buildSubscriber(null, $em->reveal(), null, null);
+        $eventSubscriber = $this->buildSubscriber(null, $notificationPersister->reveal(), null, null);
 
         $eventSubscriber->resetPeriodLocation($event);
 
@@ -247,7 +248,7 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase
 
     private function buildSubscriber(
         ?EngineInterface $engine = null,
-        ?EntityManagerInterface $entityManager = null,
+        ?NotificationPersisterInterface $notificationPersister = null,
         ?Security $security = null,
         ?TranslatorInterface $translator = null
     ): PersonAddressMoveEventSubscriber {
@@ -267,14 +268,13 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase
             $engine = $double->reveal();
         }
 
-        if (null === $entityManager) {
+        if (null === $notificationPersister) {
-            $double = $this->prophesize(EntityManagerInterface::class);
+            $notificationPersister = new NotificationPersister();
-            $entityManager = $double->reveal();
         }
 
         return new PersonAddressMoveEventSubscriber(
             $engine,
-            $entityManager,
+            $notificationPersister,
             $security,
             $translator
         );

src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php

@@ -13,6 +13,7 @@ namespace Chill\PersonBundle\Tests\Entity;
 
 use ArrayIterator;
 use Chill\MainBundle\Entity\Address;
+use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Comment;
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
@@ -62,6 +63,29 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
         $this->assertFalse($period->isClosingAfterOpening());
     }
 
+    public function testHasChangedUser()
+    {
+        $period = new AccompanyingPeriod();
+
+        $this->assertFalse($period->isChangedUser());
+        $this->assertFalse($period->hasPreviousUser());
+
+        $period->setUser($user1 = new User());
+
+        $this->assertTrue($period->isChangedUser());
+        $this->assertFalse($period->hasPreviousUser());
+
+        $period->resetPreviousUser();
+        $this->assertFalse($period->isChangedUser());
+        $this->assertFalse($period->hasPreviousUser());
+
+        $period->setUser($user2 = new User());
+
+        $this->assertTrue($period->isChangedUser());
+        $this->assertTrue($period->hasPreviousUser());
+        $this->assertSame($user1, $period->getPreviousUser());
+    }
+
     public function testHistoryLocation()
     {
         $period = new AccompanyingPeriod();

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

@@ -214,7 +214,7 @@ No requestor: Pas de demandeur
 No resources: "Pas d'interlocuteurs privilégiés"
 Persons associated: Usagers concernés
 Referrer: Référent
-Referrers: Référents
+Referrers: Agents traitants
 Some peoples does not belong to any household currently. Add them to an household soon: Certaines personnes n'appartiennent à aucun ménage actuellement. Renseignez leur ménage dès que possible.
 Add to household now: Ajouter à un ménage
 Any resource for this accompanying course: Aucun interlocuteur privilégié pour ce parcours
@@ -581,6 +581,7 @@ Linked evaluations: Évaluations associées
 # Accompanying period per user
 My accompanying periods: Mes parcours
 My accompanying periods in draft: Mes parcours brouillons
+Number of periods: Nombre de parcours
 
 workflow:
     Doc for evaluation (n°%eval%): Document de l'évaluation n°%eval%