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

src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php

@@ -322,19 +322,39 @@ final class AccompanyingCourseApiController extends ApiController
     /**
      * @Route("/api/1.0/person/accompanying-course/{id}/confidential.json", name="chill_api_person_accompanying_period_confidential")
      * @ParamConverter("accompanyingCourse", options={"id": "id"})
+     *
+     * @param mixed $id
      */
-    public function toggleConfidentialApi(AccompanyingPeriod $accompanyingCourse, Request $request)
+    public function toggleConfidentialApi(AccompanyingPeriod $accompanyingCourse, $id, Request $request)
     {
         if ($request->getMethod() === 'POST') {
             $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::TOGGLE_CONFIDENTIAL, $accompanyingCourse);
 
             $accompanyingCourse->setConfidential(!$accompanyingCourse->isConfidential());
+
             $this->getDoctrine()->getManager()->flush();
         }
 
         return $this->json($accompanyingCourse->isConfidential(), Response::HTTP_OK, [], ['groups' => ['read']]);
     }
 
+    /**
+     * @Route("/api/1.0/person/accompanying-course/{id}/intensity.json", name="chill_api_person_accompanying_period_intensity")
+     * @ParamConverter("accompanyingCourse", options={"id": "id"})
+     */
+    public function toggleIntensityApi(AccompanyingPeriod $accompanyingCourse, Request $request)
+    {
+        if ($request->getMethod() === 'POST') {
+            $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::TOGGLE_INTENSITY, $accompanyingCourse);
+
+            $status = $accompanyingCourse->getIntensity() === 'regular' ? 'occasional' : 'regular';
+            $accompanyingCourse->setIntensity($status);
+            $this->getDoctrine()->getManager()->flush();
+        }
+
+        return $this->json($accompanyingCourse->getIntensity(), Response::HTTP_OK, [], ['groups' => ['read']]);
+    }
+
     public function workApi($id, Request $request, string $_format): Response
     {
         return $this->addRemoveSomething(

src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php

@@ -69,7 +69,7 @@ class AccompanyingPeriodWorkEvaluationApiController
         $evaluations =
             array_filter(
                 $this->docGeneratorTemplateRepository
-                    ->findByEntity(AccompanyingPeriodWorkEvaluation::class),
+                    ->findByEntity(AccompanyingPeriodWorkEvaluation::class, 0, 500),
                 static function (DocGeneratorTemplate $t) use ($evaluation) {
                     $ids = $t->getOptions()['evaluations'] ?? [];
 

src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php

@@ -395,16 +395,16 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                                 Request::METHOD_POST => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE,
                             ],
                         ],
-                        'confidential' => [
-                            'methods' => [
-                                Request::METHOD_POST => true,
-                                Request::METHOD_GET => true,
-                            ],
-                            'controller_action' => 'toggleConfidentialApi',
-                            'roles' => [
-                                Request::METHOD_POST => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::TOGGLE_CONFIDENTIAL,
-                            ],
-                        ],
+                        // 'confidential' => [
+                        //     'methods' => [
+                        //         Request::METHOD_POST => true,
+                        //         Request::METHOD_GET => true,
+                        //     ],
+                        //     'controller_action' => 'toggleConfidentialApi',
+                        //     'roles' => [
+                        //         Request::METHOD_POST => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::TOGGLE_CONFIDENTIAL,
+                        //     ],
+                        // ],
                         'findAccompanyingPeriodsByPerson' => [
                             'path' => '/by-person/{person_id}.{_format}',
                             'controller_action' => 'getAccompanyingPeriodsByPerson',

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php

@@ -30,6 +30,8 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod\Resource;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\UserHistory;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\AccompanyingPeriodValidity;
+use Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ConfidentialCourseMustHaveReferrer;
+use Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\LocationValidity;
 use Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ParticipationOverlap;
 use Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ResourceDuplicateCheck;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
@@ -62,12 +64,9 @@ use const SORT_REGULAR;
  *     "accompanying_period": AccompanyingPeriod::class
  * })
  * @Assert\GroupSequenceProvider
- * @Assert\Expression(
- *     "this.isConfidential and this.getUser === NULL",
- *     message="If the accompanying course is confirmed and confidential, a referrer must remain assigned."
- * )
- *
  * @AccompanyingPeriodValidity(groups={AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED})
+ * @LocationValidity(groups={AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED})
+ * @ConfidentialCourseMustHaveReferrer(groups={AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED})
  */
 class AccompanyingPeriod implements
     GroupSequenceProviderInterface,
@@ -201,7 +200,7 @@ class AccompanyingPeriod implements
     /**
      * @var string
      * @ORM\Column(type="string", nullable=true)
-     * @Groups({"read", "write"})
+     * @Groups({"read"})
      * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_CONFIRMED})
      */
     private $intensity = self::INTENSITY_OCCASIONAL;
@@ -1000,7 +999,7 @@ class AccompanyingPeriod implements
     }
 
     /**
-     * Validation function.
+     * Validation functions.
      */
     public function isDateConsistent(ExecutionContextInterface $context)
     {

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

@@ -250,10 +250,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this->accompanyingPeriod;
     }
 
-    /**
-     * @return Collection
-     */
-    public function getAccompanyingPeriodWorkEvaluations()
+    public function getAccompanyingPeriodWorkEvaluations(): Collection
     {
         return $this->accompanyingPeriodWorkEvaluations;
     }

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

@@ -67,10 +67,15 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
     private ?User $createdBy = null;
 
     /**
+     * **Note on deserialization/denormalization**: denormalization of documents is handled by.
+     *
+     * @see{Chill\PersonBundle\Serializer\Normalizer\AccompanyingPeriodWorkEvaluationDenormalizer}
+     *
      * @ORM\OneToMany(
      *     targetEntity=AccompanyingPeriodWorkEvaluationDocument::class,
      *     mappedBy="accompanyingPeriodWorkEvaluation",
-     *     cascade={"remove"}
+     *     cascade={"remove", "persist"},
+     *     orphanRemoval=true
      * )
      * @Serializer\Groups({"read"})
      */
@@ -261,6 +266,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
     public function removeDocument(AccompanyingPeriodWorkEvaluationDocument $document): self
     {
         $this->documents->removeElement($document);
+        $document->setAccompanyingPeriodWorkEvaluation(null);
 
         return $this;
     }

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

@@ -41,6 +41,7 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
      * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      */
     private ?\DateTimeImmutable $createdAt = null;
 
@@ -49,6 +50,7 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
      *     targetEntity=User::class
      * )
      * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      */
     private ?User $createdBy = null;
 
@@ -60,15 +62,32 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
      * @internal the default name exceeds 64 characters, we must set manually:
      * @ORM\SequenceGenerator(sequenceName="chill_person_social_work_eval_doc_id_seq", allocationSize=1, initialValue=1000)
      * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      */
-    private ?int $id;
+    private ?int $id = null;
+
+    /**
+     * This is a workaround for client, to allow them to assign arbitrary data
+     * dedicated to their job.
+     *
+     * This data is not persisted into database, but will appears on the data
+     * normalized during the same request (like PUT/PATCH request)
+     *
+     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"write"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
+     *
+     * @var mixed
+     */
+    private $key;
 
     /**
      * @ORM\ManyToOne(
      *     targetEntity=StoredObject::class,
-     *     cascade={"remove"},
      * )
      * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"write"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      */
     private ?StoredObject $storedObject = null;
 
@@ -77,12 +96,22 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
      *     targetEntity=DocGeneratorTemplate::class
      * )
      * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      */
     private ?DocGeneratorTemplate $template = null;
 
+    /**
+     * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"write"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
+     */
+    private ?string $title = '';
+
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
      * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      */
     private ?\DateTimeImmutable $updatedAt = null;
 
@@ -91,6 +120,7 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
      *     targetEntity=User::class
      * )
      * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      */
     private ?User $updatedBy = null;
 
@@ -117,6 +147,14 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
         return $this->id;
     }
 
+    /**
+     * @return mixed
+     */
+    public function getKey()
+    {
+        return $this->key;
+    }
+
     public function getStoredObject(): ?StoredObject
     {
         return $this->storedObject;
@@ -127,6 +165,11 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
         return $this->template;
     }
 
+    public function getTitle(): ?string
+    {
+        return $this->title;
+    }
+
     /**
      * @return DateTimeImmutable|null
      */
@@ -171,6 +214,18 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
         return $this;
     }
 
+    /**
+     * @param mixed $key
+     *
+     * @return AccompanyingPeriodWorkEvaluationDocument
+     */
+    public function setKey($key)
+    {
+        $this->key = $key;
+
+        return $this;
+    }
+
     public function setStoredObject(?StoredObject $storedObject): AccompanyingPeriodWorkEvaluationDocument
     {
         $this->storedObject = $storedObject;
@@ -185,6 +240,13 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
         return $this;
     }
 
+    public function setTitle(?string $title): AccompanyingPeriodWorkEvaluationDocument
+    {
+        $this->title = $title;
+
+        return $this;
+    }
+
     public function setUpdatedAt(DateTimeInterface $datetime): TrackUpdateInterface
     {
         $this->updatedAt = $datetime;

src/Bundle/ChillPersonBundle/Entity/Person.php

@@ -37,6 +37,7 @@ use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\Mapping as ORM;
 use Exception;
+use libphonenumber\PhoneNumber;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
@@ -371,15 +372,10 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * The person's mobile phone number.
      *
-     * @ORM\Column(type="text")
-     * @Assert\Regex(
-     *     pattern="/^([\+{1}])([0-9\s*]{4,20})$/",
-     * )
-     * @PhonenumberConstraint(
-     *     type="mobile",
-     * )
+     * @PhonenumberConstraint(type="mobile")
+     * @ORM\Column(type="phone_number", nullable=true)
      */
-    private string $mobilenumber = '';
+    private ?PhoneNumber $mobilenumber = null;
 
     /**
      * The person's nationality.
@@ -429,15 +425,12 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * The person's phonenumber.
      *
-     * @ORM\Column(type="text")
-     * @Assert\Regex(
-     *     pattern="/^([\+{1}])([0-9\s*]{4,20})$/",
-     * )
+     * @ORM\Column(type="phone_number", nullable=true)
      * @PhonenumberConstraint(
      *     type="landline",
      * )
      */
-    private string $phonenumber = '';
+    private ?PhoneNumber $phonenumber = null;
 
     /**
      * The person's place of birth.
@@ -1227,10 +1220,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->memo;
     }
 
-    /**
-     * Get mobilenumber.
-     */
-    public function getMobilenumber(): string
+    public function getMobilenumber(): ?PhoneNumber
     {
         return $this->mobilenumber;
     }
@@ -1295,10 +1285,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->otherPhoneNumbers;
     }
 
-    /**
-     * Get phonenumber.
-     */
-    public function getPhonenumber(): string
+    public function getPhonenumber(): ?PhoneNumber
     {
         return $this->phonenumber;
     }
@@ -1737,16 +1724,9 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    /**
-     * Set mobilenumber.
-     *
-     * @param string $mobilenumber
-     *
-     * @return Person
-     */
-    public function setMobilenumber(?string $mobilenumber = '')
+    public function setMobilenumber(?PhoneNumber $mobilenumber)
     {
-        $this->mobilenumber = (string) $mobilenumber;
+        $this->mobilenumber = $mobilenumber;
 
         return $this;
     }
@@ -1782,16 +1762,9 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    /**
-     * Set phonenumber.
-     *
-     * @param string $phonenumber
-     *
-     * @return Person
-     */
-    public function setPhonenumber(?string $phonenumber = '')
+    public function setPhonenumber(?PhoneNumber $phonenumber)
     {
-        $this->phonenumber = (string) $phonenumber;
+        $this->phonenumber = $phonenumber;
 
         return $this;
     }

src/Bundle/ChillPersonBundle/Form/CreationPersonType.php

@@ -13,17 +13,18 @@ namespace Chill\PersonBundle\Form;
 
 use Chill\MainBundle\Form\Event\CustomizeFormEvent;
 use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Form\Type\ChillPhoneNumberType;
 use Chill\MainBundle\Form\Type\PickCenterType;
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Form\Type\GenderType;
 use Chill\PersonBundle\Form\Type\PersonAltNameType;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use libphonenumber\PhoneNumberType;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
-use Symfony\Component\Form\Extension\Core\Type\TelType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -60,11 +61,13 @@ final class CreationPersonType extends AbstractType
             ->add('birthdate', ChillDateType::class, [
                 'required' => false,
             ])
-            ->add('phonenumber', TelType::class, [
+            ->add('phonenumber', ChillPhoneNumberType::class, [
                 'required' => false,
+                'type' => PhoneNumberType::FIXED_LINE,
             ])
-            ->add('mobilenumber', TelType::class, [
+            ->add('mobilenumber', ChillPhoneNumberType::class, [
                 'required' => false,
+                'type' => PhoneNumberType::MOBILE,
             ])
             ->add('email', EmailType::class, [
                 'required' => false,

src/Bundle/ChillPersonBundle/Form/PersonType.php

@@ -14,26 +14,27 @@ namespace Chill\PersonBundle\Form;
 use Chill\CustomFieldsBundle\Form\Type\CustomFieldType;
 use Chill\MainBundle\Form\Type\ChillCollectionType;
 use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Form\Type\ChillPhoneNumberType;
 use Chill\MainBundle\Form\Type\ChillTextareaType;
 use Chill\MainBundle\Form\Type\CommentType;
 use Chill\MainBundle\Form\Type\PickCivilityType;
 use Chill\MainBundle\Form\Type\Select2CountryType;
 use Chill\MainBundle\Form\Type\Select2LanguageType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\PersonPhone;
 use Chill\PersonBundle\Form\Type\GenderType;
 use Chill\PersonBundle\Form\Type\PersonAltNameType;
-use Chill\PersonBundle\Form\Type\PersonPhoneType;
 use Chill\PersonBundle\Form\Type\Select2MaritalStatusType;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\CallbackTransformer;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
 use Symfony\Component\Form\Extension\Core\Type\IntegerType;
-use Symfony\Component\Form\Extension\Core\Type\TelType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -57,17 +58,21 @@ class PersonType extends AbstractType
 
     protected TranslatableStringHelper $translatableStringHelper;
 
+    private ParameterBagInterface $parameterBag;
+
     /**
      * @param string[] $personFieldsConfiguration configuration of visibility of some fields
      */
     public function __construct(
         array $personFieldsConfiguration,
         ConfigPersonAltNamesHelper $configAltNamesHelper,
-        TranslatableStringHelper $translatableStringHelper
+        TranslatableStringHelperInterface $translatableStringHelper,
+        ParameterBagInterface $parameterBag
     ) {
         $this->config = $personFieldsConfiguration;
         $this->configAltNamesHelper = $configAltNamesHelper;
         $this->translatableStringHelper = $translatableStringHelper;
+        $this->parameterBag = $parameterBag;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -126,22 +131,34 @@ class PersonType extends AbstractType
         }
 
         if ('visible' === $this->config['phonenumber']) {
-            $builder->add('phonenumber', TelType::class, [
-                'required' => false,
-                // 'placeholder' => '+33623124554' //TODO placeholder for phone numbers
-            ]);
+            $builder
+                ->add(
+                    'phonenumber',
+                    ChillPhoneNumberType::class,
+                    [
+                        'required' => false,
+                        'type' => \libphonenumber\PhoneNumberType::FIXED_LINE,
+                    ]
+                );
         }
 
         if ('visible' === $this->config['mobilenumber']) {
             $builder
-                ->add('mobilenumber', TelType::class, ['required' => false])
+                ->add(
+                    'mobilenumber',
+                    ChillPhoneNumberType::class,
+                    [
+                        'type' => \libphonenumber\PhoneNumberType::MOBILE,
+                        'required' => false,
+                    ]
+                )
                 ->add('acceptSMS', CheckboxType::class, [
                     'required' => false,
                 ]);
         }
 
         $builder->add('otherPhoneNumbers', ChillCollectionType::class, [
-            'entry_type' => PersonPhoneType::class,
+            'entry_type' => ChillPhoneNumberType::class,
             'button_add_label' => 'Add new phone',
             'button_remove_label' => 'Remove phone',
             'required' => false,

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

@@ -0,0 +1,61 @@
+<?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\PersonBundle\Repository\AccompanyingPeriod;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ObjectRepository;
+
+class AccompanyingPeriodWorkEvaluationDocumentRepository implements ObjectRepository
+{
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $em)
+    {
+        $this->repository = $em->getRepository(AccompanyingPeriodWorkEvaluationDocument::class);
+    }
+
+    public function find($id): ?AccompanyingPeriodWorkEvaluationDocument
+    {
+        return $this->repository->find($id);
+    }
+
+    /**
+     * @return array|object[]|AccompanyingPeriodWorkEvaluationDocument[]
+     */
+    public function findAll(): array
+    {
+        return $this->repository->findAll();
+    }
+
+    /**
+     * @param null|mixed $limit
+     * @param null|mixed $offset
+     *
+     * @return array|object[]|AccompanyingPeriodWorkEvaluationDocument[]
+     */
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria): ?AccompanyingPeriodWorkEvaluationDocument
+    {
+        return $this->repository->findOneBy($criteria);
+    }
+
+    public function getClassName(): string
+    {
+        return AccompanyingPeriodWorkEvaluationDocument::class;
+    }
+}

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/ToggleFlags.vue

@@ -58,7 +58,7 @@ export default {
          this.$store.dispatch('toggleIntensity', value)
             .catch(({name, violations}) => {
                if (name === 'ValidationException' || name === 'AccessException') {
-                  violations.forEach((violation) => this.$toast.open({message: violation}));
+                  this.$toast.open({message: this.$t('Only the referrer can toggle the intensity of an accompanying course')})
                } else {
                   this.$toast.open({message: 'An error occurred'})
                }
@@ -75,20 +75,15 @@ export default {
             });
       },
       toggleConfidential() {
-         this.$store.dispatch('fetchPermissions').then(() => {
-           if (!this.$store.getters.canTogglePermission) {
-             this.$toast.open({message: "Seul le référent peut modifier la confidentialité"});
-             return Promise.resolve();
-           } else {
-             return this.$store.dispatch('toggleConfidential', (!this.isConfidential));
-           }
-         }).catch(({name, violations}) => {
-             if (name === 'ValidationException' || name === 'AccessException') {
-                violations.forEach((violation) => this.$toast.open({message: violation}));
-             } else {
-                this.$toast.open({message: 'An error occurred'})
-             }
-          });
+         this.$store.dispatch('toggleConfidential')
+            .catch(({name, violations}) => {
+               console.log(name);
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  this.$toast.open({message: this.$t('Only the referrer can toggle the confidentiality of an accompanying course')})
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       },
    },
 }

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

@@ -9,7 +9,7 @@
          <input type="checkbox" v-model="requestorIsAnonymous" class="me-2" />
          {{ $t('requestor.is_anonymous') }}
       </label>
-      <confidential v-if="accompanyingCourse.requestor.type === 'thirdparty'">
+      <confidential :positionBtn="false" v-if="accompanyingCourse.requestor.type === 'thirdparty'">
          <template v-slot:confidential-content>
             <third-party-render-box
                :thirdparty="accompanyingCourse.requestor"
@@ -33,7 +33,7 @@
          </template>
       </confidential>
 
-      <confidential v-else-if="accompanyingCourse.requestor.type === 'person'">
+      <confidential :positionBtnFar="false" v-else-if="accompanyingCourse.requestor.type === 'person'">
          <template v-slot:confidential-content>
             <person-render-box render="bloc"
                :person="accompanyingCourse.requestor"

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

@@ -168,7 +168,7 @@ export default {
          }
          else if (payload.type === 'thirdparty') {
             console.log('data', payload.data)
-            body.name = payload.data.text;
+            body.name = payload.data.name;
             body.email = payload.data.email;
             body.telephone = payload.data.phonenumber;
             body.address = payload.data.address ? { id: payload.data.address.address_id } :  null;

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

@@ -46,6 +46,12 @@ if (root === 'banner') {
       })
       .use(store)
       .use(i18n)
+      .use(VueToast, {
+         position: "bottom-right",
+         type: "error",
+         duration: 5000,
+         dismissible: true
+      })
       .component('banner', Banner)
       .mount('#banner-accompanying-course');
    });

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

@@ -167,6 +167,8 @@ const appMessages = {
       'Error while retriving users.': "Erreur du serveur lors du chargement de la liste des travailleurs.",
       'Error while getting whoami.': "Erreur du serveur lors de la requête 'qui suis-je ?'",
       'Error while retriving origin\'s list.': "Erreur du serveur lors du chargement de la liste des origines de la demande.",
+      'Only the referrer can toggle the intensity of an accompanying course': "Seul le référent peut modifier l'intensité d'un parcours.",
+      'Only the referrer can toggle the confidentiality of an accompanying course': "Seul le référent peut modifier la confidentialité d'un parcours."
    }
 };
 

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

@@ -420,24 +420,24 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                const url = `/api/1.0/person/accompanying-course/resource/${id}.json`;
 
                return makeFetch('PATCH', url, body)
-                   .then((response) => {
-                      commit('patchResource', response);
-                   })
-                   .catch((error) => {
-                      commit('catchError', error);
-                      throw error;
-                   })
+                  .then((response) => {
+                     commit('patchResource', response);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
             /**
              * Update accompanying course intensity/emergency/confidentiality
              */
             toggleIntensity({ commit }, payload) {
-               const url = `/api/1.0/person/accompanying-course/${id}.json`
+               const url = `/api/1.0/person/accompanying-course/${id}/intensity.json`
                const body = { type: "accompanying_period", 'intensity': payload }
 
-               return makeFetch('PATCH', url, body)
+               return makeFetch('POST', url, body)
                   .then((response) => {
-                     commit('toggleIntensity', response.intensity);
+                     commit('toggleIntensity', response);
 
                   })
                   .catch((error) => {
@@ -459,14 +459,18 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                   })
             },
             toggleConfidential({ commit }, payload) {
-               const url = `/api/1.0/person/accompanying-course/${id}.json`
+               const url = `/api/1.0/person/accompanying-course/${id}/confidential.json`
                const body = { type: "accompanying_period", confidential: payload }
 
-               return makeFetch('PATCH', url, body)
+               console.log('url', url, 'body', body);
+
+               return makeFetch('POST', url, body)
                   .then((response) => {
-                     commit('toggleConfidential', response.confidential);
+                     console.log('response', response);
+                     commit('toggleConfidential', response);
                   })
                   .catch((error) => {
+                     console.log('error', error)
                      commit('catchError', error);
                      throw error;
                   })
@@ -737,10 +741,10 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                   "object": {
                      "type": "accompanying_period",
                      "id": id
-                   },
-                   "class": "Chill\\PersonBundle\\Entity\\AccompanyingPeriod",
-                   "roles": [
-                      "CHILL_PERSON_ACCOMPANYING_PERIOD_TOGGLE_CONFIDENTIAL"
+                  },
+                  "class": "Chill\\PersonBundle\\Entity\\AccompanyingPeriod",
+                  "roles": [
+                     "CHILL_PERSON_ACCOMPANYING_PERIOD_TOGGLE_CONFIDENTIAL"
                      ]
                }
 

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue

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

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue

@@ -106,8 +106,6 @@ export default {
          this.toggleEditEvaluation();
       },
       goToGenerateWorkflow({event, link, workflowName}) {
-        console.log('goToGenerate in evaluation', event, link, workflowName);
-
         const callback = (data) => {
           let evaluationId = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key).id;
           window.location.assign(buildLinkCreate(workflowName,

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue

@@ -65,29 +65,55 @@
        <h5>{{ $t('Documents') }} :</h5>
 
        <div class="flex-table">
-         <div class="item-bloc" v-for="d in evaluation.documents">
+         <div class="item-bloc" v-for="(d, i) in evaluation.documents" :key="d.key">
            <div class="item-row">
-             <div class="item-col"><h6>{{ d.template.name.fr }}</h6></div>
-             <div class="item-col">
-               <p>Créé par {{ d.createdBy.text }}<br/>
-               Le {{ $d(ISOToDatetime(d.createdAt.datetime), 'long') }}</p>
-
-             </div>
+               <div class="input-group input-group-lg mb-3">
+                  <div>
+                     <input
+                         class="form-control form-control-lg"
+                         style="font-weight: bold;"
+                         type="text"
+                         :value="d.title"
+                         :id="d.id"
+                         @input="onInputDocumentTitle"/>
+                  </div>
+               </div>
            </div>
            <div class="item-row">
-            <ul class="record_actions" >
-             <li>
-               <a :href="buildEditLink(d.storedObject)" class="btn btn-action btn-sm">
-                 <i class="fa fa-edit"></i>
-               </a>
-             </li>
-            </ul>
+               <div class="item-col item-meta">
+                  <p v-if="d.createdBy" class="createdBy">Créé par {{ d.createdBy.text }}<br/>
+                  Le {{ $d(ISOToDatetime(d.createdAt.datetime), 'long') }}</p>
+               </div>
+               <div class="item-col">
+                 <ul class="record_actions" >
+                   <li v-if="d.workflows_availables.length > 0">
+                     <list-workflow-modal
+                         :workflows="d.workflows"
+                         :allowCreate="true"
+                         relatedEntityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument"
+                         :relatedEntityId="d.id"
+                         :workflowsAvailables="d.workflows_availables"
+                         :preventDefaultMoveToGenerate="true"
+                         :goToGenerateWorkflowPayload="{doc: d}"
+                         @go-to-generate-workflow="goToGenerateWorkflowEvaluationDocument"
+                     ></list-workflow-modal>
+                   </li>
+                   <li>
+                     <a :href="buildEditLink(d.storedObject)" class="btn btn-wopilink"></a>
+                   </li>
+                   <li>
+                     <a class="btn btn-delete" @click="removeDocument(d)">
+                     </a>
+                   </li>
+                 </ul>
+               </div>
            </div>
          </div>
        </div>
      </div>
 
      <div class="row mb-3">
+      <h6>{{ $t('document_add') }} :</h6>
        <pick-template
            entityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation"
            :id="evaluation.id"
@@ -99,6 +125,20 @@
            <label class="col-sm-4 col-form-label">{{ $t('evaluation_generate_a_document') }}</label>
          </template>
        </pick-template>
+      <div>
+         <label class="col-sm-4 col-form-label">{{ $t('document_upload') }}</label>
+         <ul class="record_actions">
+            <li>
+               <add-async-upload
+                  :buttonTitle="$t('browse')"
+                  :options="asyncUploadOptions"
+                  @addDocument="addDocument"
+               >
+               </add-async-upload>
+            </li>
+         </ul>
+      </div>
+
      </div>
    </div>
 </div>
@@ -111,6 +151,9 @@ import ClassicEditor from 'ChillMainAssets/module/ckeditor5/index.js';
 import { mapGetters, mapState } from 'vuex';
 import PickTemplate from 'ChillDocGeneratorAssets/vuejs/_components/PickTemplate.vue';
 import {buildLink} from 'ChillDocGeneratorAssets/lib/document-generator';
+import AddAsyncUpload from 'ChillDocStoreAssets/vuejs/_components/AddAsyncUpload.vue';
+import ListWorkflowModal from 'ChillMainAssets/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue';
+import {buildLinkCreate} from 'ChillMainAssets/lib/entity-workflow/api.js';
 
 const i18n = {
    messages: {
@@ -129,6 +172,11 @@ const i18n = {
          evaluation_add_a_document: "Ajouter un document",
          evaluation_add: "Ajouter une évaluation",
          Documents: "Documents",
+         document_add: "Générer ou téléverser un document",
+         document_upload: "Téléverser un document",
+         document_title: "Titre du document",
+         template_title: "Nom du template",
+         browse: "Ajouter un document"
       }
    }
 };
@@ -139,12 +187,19 @@ export default {
    components: {
       ckeditor: CKEditor.component,
       PickTemplate,
+      AddAsyncUpload,
+      ListWorkflowModal,
    },
    i18n,
    data() {
       return {
          editor: ClassicEditor,
          template: null,
+         asyncUploadOptions: {
+            maxFiles: 1,
+            maxPostSize: 15000000,
+            required: false,
+         }
       }
    },
    computed: {
@@ -162,7 +217,6 @@ export default {
           return dateToISO(this.evaluation.startDate);
         },
         set(v) {
-          console.log(v);
           this.$store.commit('setEvaluationStartDate', { key: this.evaluation.key, date: ISOToDate(v) });
         }
       },
@@ -205,11 +259,11 @@ export default {
          })
          ;
       },
-     buildEditLink(storedObject) {
-       return `/wopi/edit/${storedObject.uuid}?returnPath=` + encodeURIComponent(
+      buildEditLink(storedObject) {
+         return `/wopi/edit/${storedObject.uuid}?returnPath=` + encodeURIComponent(
            window.location.pathname + window.location.search + window.location.hash);
-     },
-     submitBeforeGenerate({template}) {
+      },
+      submitBeforeGenerate({template}) {
         const callback = (data) => {
           let evaluationId = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key).id;
 
@@ -217,7 +271,36 @@ export default {
         };
 
         return this.$store.dispatch('submit', callback).catch(e => { console.log(e); throw e; });
-      }
+      },
+      onInputDocumentTitle(event) {
+         const id = Number(event.target.id);
+         const title = event.target.value;
+         this.$store.commit('updateDocumentTitle', {id: id, evaluationKey: this.evaluation.key, title: title});
+      },
+      addDocument(storedObject) {
+         let document = {
+            type: 'accompanying_period_work_evaluation_document',
+            storedObject: storedObject,
+            title: 'Nouveau document',
+         };
+         this.$store.commit('addDocument', {key: this.evaluation.key, document: document});
+      },
+      removeDocument(document) {
+         if (window.confirm("Êtes-vous sûr·e de vouloir supprimer le document qui a pour titre \"" + document.title +"\" ?")) {
+           this.$store.commit('removeDocument', {key: this.evaluation.key, document: document});
+         }
+      },
+      goToGenerateWorkflowEvaluationDocument({event, link, workflowName, payload}) {
+       const callback = (data) => {
+         let evaluation = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key);
+         let updatedDocument = evaluation.documents.find(d => d.key === payload.doc.key);
+         window.location.assign(buildLinkCreate(workflowName,
+             'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument', updatedDocument.id));
+       };
+
+       return this.$store.dispatch('submit', callback)
+           .catch(e => { console.log(e); throw e; });
+     },
    },
 }
 </script>

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

@@ -110,6 +110,7 @@ const store = createStore({
             maxDate: e.maxDate !== null ? { datetime: datetimeToISO(e.maxDate) } : null,
             warningInterval: intervalDaysToISO(e.warningInterval),
             comment: e.comment,
+            documents: e.documents
           };
           if (e.id !== undefined) {
             o.id = e.id;
@@ -130,6 +131,11 @@ const store = createStore({
           endDate: e.endDate !== null ? ISOToDatetime(e.endDate.datetime) : null,
           maxDate: e.maxDate !== null ? ISOToDatetime(e.maxDate.datetime) : null,
           warningInterval: e.warningInterval !== null ? intervalISOToDays(e.warningInterval) : null,
+          documents: e.documents.map((d, dindex) => {
+            return Object.assign(d, {
+              key: index
+            });
+          }),
         });
 
         return k;
@@ -197,6 +203,24 @@ const store = createStore({
 
       found.results = found.results.filter(r => r.id !== result.id);
     },
+    addDocument(state, payload) {
+      let evaluation = state.evaluationsPicked.find(e => e.key === payload.key);
+      evaluation.documents.push(Object.assign(
+        payload.document, {
+          key: evaluation.documents.length + 1,
+          workflows_availables: state.work.workflows_availables_evaluation_documents,
+          workflows: [],
+        }));
+    },
+    removeDocument(state, {key, document}) {
+      let evaluations = state.evaluationsPicked.find(e => e.key === key);
+
+      if (evaluations === undefined) {
+        return;
+      }
+
+      evaluations.documents = evaluations.documents.filter(d => d.key !== document.key);
+    },
     addEvaluation(state, evaluation) {
       let e = {
         type: "accompanying_period_work_evaluation",
@@ -284,6 +308,10 @@ const store = createStore({
     setIsPosting(state, st) {
       state.isPosting = st;
     },
+    updateDocumentTitle(state, payload) {
+      state.evaluationsPicked.find(e => e.key === payload.evaluationKey)
+          .documents.find(d => d.id === payload.id).title = payload.title;
+    }
   },
   actions: {
     updateThirdParty({ commit }, payload) {
@@ -374,13 +402,18 @@ const store = createStore({
           });
       }
     },
+    addDocument({commit}, payload) {
+      commit('addDocument', payload);
+    },
+    removeDocument({commit}, payload) {
+      commit('removeDocument', payload);
+    },
     submit({ getters, state, commit }, callback) {
       let
         payload = getters.buildPayload,
         url = `/api/1.0/person/accompanying-course/work/${state.work.id}.json`,
         errors = []
       ;
-
       commit('setIsPosting', true);
 
       return makeFetch('PUT', url, payload)
@@ -397,6 +430,9 @@ const store = createStore({
           commit('setErrors', error.violations);
         });
     },
+    updateDocumentTitle({commit}, payload) {
+      commit('updateDocumentTitle', payload)
+    }
   }
 });
 

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue

@@ -1,6 +1,7 @@
 <template>
     <div class="container tpartycontainer">
       <div class="tparty-identification">
+        <span v-if="item.result.profession" class="profession">{{ item.result.profession.name.fr }}</span>
         <span class="name">
           {{ item.result.text }}&nbsp;
         </span>
@@ -110,19 +111,24 @@ export default {
 
 <style lang="scss" scoped>
 .tpartycontainer {
- .tpartyparent {
-    .name {
-      font-weight: bold;
-      font-variant: all-small-caps;
+  .tpartyparent {
+      .name {
+        font-weight: bold;
+        font-variant: all-small-caps;
+      }
+  }
+  .tparty-identification {
+    span:not(.name) {
+      margin-left: 0.5em;
+      opacity: 0.5;
+      font-size: 90%;
+      font-style: italic;
     }
- }
- .tparty-identification {
-   span:not(.name) {
-     margin-left: 0.5em;
-     opacity: 0.5;
-     font-size: 90%;
-     font-style: italic;
-   }
- }
+    .profession {
+      font-weight: 800;
+      color: black;
+      font-style: normal !important;
+    }
+  }
 }
 </style>

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

@@ -151,14 +151,14 @@
                     {% if accompanyingCourse.requestorPerson is not null %}
                         <h4 class="item-key">{{ 'Requestor'|trans }}</h4>
                         {% if accompanyingCourse.requestorAnonymous %}
-                            <div class="confidential"><p>{{ _self.insert_onthefly('person', accompanyingCourse.requestorPerson) }}</p></div>
+                            <div class="confidential toggle-close-twig"><p>{{ _self.insert_onthefly('person', accompanyingCourse.requestorPerson) }}</p></div>
                         {% else %}
                             {{ _self.insert_onthefly('person', accompanyingCourse.requestorPerson) }}
                         {% endif %}
                     {% elseif accompanyingCourse.requestorThirdParty is not null %}
                         <h4 class="item-key">{{ 'Requestor'|trans }}</h4>
                         {% if accompanyingCourse.requestorAnonymous %}
-                            <div class="confidential"><p>{{ _self.insert_onthefly('thirdparty', accompanyingCourse.requestorThirdParty) }}</p></div>
+                            <div class="confidential toggle-close-twig"><p>{{ _self.insert_onthefly('thirdparty', accompanyingCourse.requestorThirdParty) }}</p></div>
                         {% else %}
                             {{ _self.insert_onthefly('thirdparty', accompanyingCourse.requestorThirdParty) }}
                         {% endif %}

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

@@ -101,26 +101,41 @@
             {% if notif_counter.total > 0 %}
                 {{ chill_counter_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', w.id) }}
             {% endif %}
-            
+
             {% import '@ChillPerson/Macro/updatedBy.html.twig' as macro %}
             {{ macro.updatedBy(w) }}
         </div>
-            
+
         {% if displayAction is defined and displayAction == true %}
-            <div class="item-col">
-                <ul class="record_actions">
-                    <li>
-                        <a class="btn btn-edit" title="{{ 'Edit'|trans }}"
-                           href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}"
-                        ></a>
-                    </li>
-                    <li>
-                        <a class="btn btn-delete" title="{{ 'Delete'|trans }}"
-                           href="{{ path('chill_person_accompanying_period_work_delete', { 'id': w.id } ) }}"
-                        ></a>
-                    </li>
-                </ul>
-            </div>
+        <ul class="item-col record_actions">
+            {% set suppEvaluations = [] %}
+            {% for e in w.accompanyingPeriodWorkEvaluations %}
+                {% set suppEvaluations = suppEvaluations|merge([
+                    {'relatedEntityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluation', 'relatedEntityId': e.id }
+                ]) %}
+
+                {% for d in e.documents %}
+                    {% set suppEvaluations = suppEvaluations|merge([
+                        {'relatedEntityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument', 'relatedEntityId': d.id }
+                    ]) %}
+                {% endfor %}
+            {% endfor %}
+            <li>
+                {{ chill_entity_workflow_list(
+                    'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork',
+                    w.id, [], suppEvaluations) }}
+            </li>
+            <li>
+                <a class="btn btn-edit" title="{{ 'Edit'|trans }}"
+                   href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}"
+                ></a>
+            </li>
+            <li>
+                <a class="btn btn-delete" title="{{ 'Delete'|trans }}"
+                   href="{{ path('chill_person_accompanying_period_work_delete', { 'id': w.id } ) }}"
+                ></a>
+            </li>
+        </ul>
         {% endif %}
     </div>
 

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

@@ -2,6 +2,16 @@
 
 {% block title 'accompanying_course_work.List accompanying course work'|trans %}
 
+{% block js %}
+    {{ parent() }}
+    {{ encore_entry_script_tags('mod_entity_workflow_pick') }}
+{% endblock %}
+
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('mod_entity_workflow_pick') }}
+{% endblock %}
+
 {% block content %}
     <div class="accompanying_course_work">
 

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

@@ -5,6 +5,12 @@
 {% block title %}{{ 'My accompanying periods in draft'|trans }}{% endblock title %}
 
 {% macro recordAction(period) %}
+    {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_DELETE', period) %}
+        <li>
+            <a href="{{ path('chill_person_accompanying_course_delete', {'accompanying_period_id': period.id }) }}"
+               class="btn btn-delete" title="{{ 'Delete'|trans }}"></a>
+        </li>
+    {% endif %}
     <li>
         <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': period.id }) }}"
         class="btn btn-show" title="{{ 'See accompanying period'|trans }}"></a>

src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig

@@ -146,22 +146,27 @@
                     'with_valid_from': false
                 }) }}
             {% endif %}
-            <li>
-                {% if person.mobilenumber %}
-                    <i class="fa fa-li fa-mobile"></i><a href="{{ 'tel:' ~ person.mobilenumber }}">
+            {% if person.phonenumber is not null %}
+                <li>
+                    <i class="fa fa-li fa-phone"></i>
+                    <a href="{{ 'tel:' ~ person.phonenumber|phone_number_format('E164') }}">
+                        {{ person.phonenumber|chill_format_phonenumber }}
+                    </a>
+                </li>
+            {% endif %}
+            {% if person.mobilenumber is not null %}
+                <li>
+                    <i class="fa fa-li fa-mobile"></i><a href="{{ 'tel:' ~ person.mobilenumber|phone_number_format('E164') }}">
                         {{ person.mobilenumber|chill_format_phonenumber }}
                     </a>
-                {% else %}
+                </li>
+            {% endif %}
+            {% if person.phonenumber is null and person.mobilenumber is null %}
+                <li>
                     <i class="fa fa-li fa-phone"></i>
-                    {% if person.phonenumber %}
-                        <a href="{{ 'tel:' ~ person.phonenumber }}">
-                            {{ person.phonenumber|chill_format_phonenumber }}
-                        </a>
-                    {% else %}
-                        <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
-                    {% endif %}
-                {% endif %}
-            </li>
+                    <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
+                </li>
+            {% endif %}
             {% if options['addCenter'] and person|chill_resolve_center|length > 0 %}
                 <li>
                     <i class="fa fa-li fa-long-arrow-right"></i>

src/Bundle/ChillPersonBundle/Resources/views/Macro/updatedBy.html.twig

@@ -1,11 +1,17 @@
 {% macro updatedBy(entity) %}
     <div class="updatedBy">
-        {{ 'Last updated on'|trans }}
-        <span class="date">
-            {{ entity.updatedAt|format_datetime('medium', 'short') }}
-        </span>
-        {% if entity.updatedBy %}
-            {{ ', ' ~ 'by_user'|trans }}
+        {% if entity.updatedAt != null %}
+            {{ 'Last updated on'|trans }}
+            <span class="date">
+                {{ entity.updatedAt|format_datetime('medium', 'short') }}
+            </span>
+        {% endif %}
+        {% if entity.updatedBy != null %}
+            {% if entity.updatedAt != null %}
+                {{ ', ' ~ 'by_user'|trans }}
+            {% else %}
+                {{ 'Last updated by'|trans }}
+            {% endif %}
             <span class="user">
                 {{ entity.updatedBy|chill_entity_render_box }}
             </span>
@@ -14,13 +20,19 @@
 {% endmacro %}
 
 {% macro createdBy(entity) %}
-    <div class="updatedBy">
-        {{ 'Created on'|trans }}
-        <span class="date">
-            {{ entity.createdAt|format_datetime('medium', 'short') }}
-        </span>
-        {% if entity.createdBy %}
-            {{ ', ' ~ 'by_user'|trans }}
+    <div class="createdBy">
+        {% if entity.createdAt != null %}
+            {{ 'Created on'|trans }}
+            <span class="date">
+                {{ entity.createdAt|format_datetime('medium', 'short') }}
+            </span>
+        {% endif %}
+        {% if entity.createdBy != null %}
+            {% if entity.createdAt != null %}
+                {{ ', ' ~ 'by_user'|trans }}
+            {% else %}
+                {{ 'Created by'|trans }}
+            {% endif %}
             <span class="user">
                 {{ entity.createdBy|chill_entity_render_string }}
             </span>

src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig

@@ -25,14 +25,14 @@
                         {% if person.phonenumber %}
                             <span class="phonenumber d-block d-sm-inline-block">
                                 <i class="fa fa-fw fa-phone"></i>
-                                <a href="{{ 'tel:' ~ person.phonenumber }}" class="phone mr-3" title="{{ 'Phonenumber'|trans }}">
+                                <a href="{{ 'tel:' ~ person.phonenumber|phone_number_format('E164') }}" class="phone mr-3" title="{{ 'Phonenumber'|trans }}">
                                     {{ person.phonenumber|chill_format_phonenumber }}</a>
                             </span>
                         {% endif %}
                         {% if person.mobilenumber %}
                             <span class="mobilenumber d-block d-sm-inline-block">
                                 <i class="fa fa-fw fa-mobile"></i>
-                                <a href="{{ 'tel:' ~ person.mobilenumber }}" class="phone mr-3" title="{{ 'Mobilenumber'|trans }}">
+                                <a href="{{ 'tel:' ~ person.mobilenumber|phone_number_format('E164') }}" class="phone mr-3" title="{{ 'Mobilenumber'|trans }}">
                                     {{ person.mobilenumber|chill_format_phonenumber }}</a>
                             </span>
                         {% endif %}

src/Bundle/ChillPersonBundle/Resources/views/Person/list_by_phonenumber.html.twig

@@ -62,12 +62,12 @@
                             <ul>
                                 {% if person.phonenumber is not empty %}
                                     <li>
-                                        <a href="tel:{{ person.phonenumber }}"><img src="{{ asset('build/images/mobile-alt-solid.svg') }}">&nbsp;<pre>{{ person.phonenumber|chill_format_phonenumber }}</pre></a>
+                                        <a href="tel:{{ person.phonenumber|phone_number_format('E164') }}"><img src="{{ asset('build/images/mobile-alt-solid.svg') }}">&nbsp;<pre>{{ person.phonenumber|chill_format_phonenumber }}</pre></a>
                                     </li>
                                 {% endif %}
                                 {% if person.mobilenumber is not empty%}
                                     <li>
-                                        <a href="tel:{{ person.mobilenumber }}"><img src="{{ asset('build/images/phone-alt-solid.svg') }}">&nbsp;<pre>{{ person.mobilenumber|chill_format_phonenumber }}</pre></a>
+                                        <a href="tel:{{ person.mobilenumber|phone_number_format('E164') }}"><img src="{{ asset('build/images/phone-alt-solid.svg') }}">&nbsp;<pre>{{ person.mobilenumber|chill_format_phonenumber }}</pre></a>
                                     </li>
                                 {% endif %}
                             </ul>

src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig

@@ -232,14 +232,14 @@ This view should receive those arguments:
                 {%- if chill_person.fields.phonenumber == 'visible' -%}
                         <dl>
                             <dt>{{ 'Phonenumber'|trans }}&nbsp;:</dt>
-                            <dd>{% if person.phonenumber is not empty %}<a href="tel:{{ person.phonenumber }}"><pre>{{ person.phonenumber|chill_format_phonenumber }}</pre></a>{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}{% endif %}</dd>
+                            <dd>{% if person.phonenumber is not empty %}<a href="tel:{{ person.phonenumber|phone_number_format('E164') }}">{{ person.phonenumber|chill_format_phonenumber }}</a>{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}{% endif %}</dd>
                         </dl>
                 {% endif %}
 
                 {%- if chill_person.fields.mobilenumber == 'visible' -%}
                 <dl>
                     <dt>{{ 'Mobilenumber'|trans }}&nbsp;:</dt>
-                    <dd>{% if person.mobilenumber is not empty %}<a href="tel:{{ person.mobilenumber }}">{{ person.mobilenumber|chill_format_phonenumber }}</a>{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}{% endif %}</dd>
+                    <dd>{% if person.mobilenumber is not empty %}<a href="tel:{{ person.mobilenumber|phone_number_format('E164') }}">{{ person.mobilenumber|chill_format_phonenumber }}</a>{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}{% endif %}</dd>
                     <p>{% if person.acceptSMS %}{{ 'Accept short text message'|trans }}{% endif %}</p>
                 </dl>
                 {% endif %}
@@ -250,7 +250,7 @@ This view should receive those arguments:
                     <dt>{{ 'Others phone numbers'|trans }}&nbsp;:</dt>
                     {% for el in person.otherPhoneNumbers %}
                         {% if el.phonenumber is not empty %}
-                        <dd>{% if el.description is not empty %}{{ el.description }}&nbsp;:&nbsp;{% endif %}<a href="tel:{{ el.phonenumber }}">{{ el.phonenumber|chill_format_phonenumber }}</a></dd>
+                        <dd>{% if el.description is not empty %}{{ el.description }}&nbsp;:&nbsp;{% endif %}<a href="tel:{{ el.phonenumber|phone_number_format('E164') }}">{{ el.phonenumber|chill_format_phonenumber }}</a></dd>
                         {% endif %}
                     {% endfor %}
                     </ul>
@@ -317,4 +317,4 @@ This view should receive those arguments:
     {% endif %}
 
 </div>
-{% endblock %}
+{% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/Workflow/_accompanying_period_work.title.html.twig

@@ -1,19 +0,0 @@
-{% import '@ChillMain/Workflow/macro_breadcrumb.html.twig' as m %}
-
-<div class="flex-grow-1 {% if add_classes is defined %}{{ add_classes }}{% else %}h2{% endif %}">
-    <div>
-        {% if concerne is defined and concerne == true %}
-            <span class="item-key">{{ 'Concerne'|trans }}: </span>
-        {% endif %}
-        
-        {{ 'workflow.Work (n°%w%)'|trans({'%w%': work.id }) }}
-        
-        {% if description is defined and description == true %}
-            {{ ' — ' ~ work.socialAction|chill_entity_render_string }}
-        {% endif %}
-    </div>
-    
-    {% if breadcrumb is defined and breadcrumb == true %}
-        {{ m.breadcrumb(_context) }}
-    {% endif %}
-</div>

src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation.html.twig

@@ -62,10 +62,14 @@
                                             </li>
                                         {% endif %}
                                         <li>
+                                            {% if evaluation.createdBy is not null %}
                                             <span class="item-key">créé par</span>
                                             <b>{{ evaluation.createdBy.username }}</b>
+                                            {% endif %}
+                                            {% if evaluation.createdAt is not null %}
                                             <span class="item-key">{{ 'le'|trans }}</span>
                                             <b>{{ evaluation.createdAt|format_date('short') }}</b>
+                                            {% endif %}
                                         </li>
                                     </ul>
                                     {% if evaluation.comment %}

src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation.title.html.twig

@@ -1,19 +0,0 @@
-{% import '@ChillMain/Workflow/macro_breadcrumb.html.twig' as m %}
-
-<div class="flex-grow-1 {% if add_classes is defined %}{{ add_classes }}{% else %}h2{% endif %}">
-    <div>
-        {% if concerne is defined and concerne == true %}
-            <span class="item-key">{{ 'Concerne'|trans }}: </span>
-        {% endif %}
-    
-        {{ 'workflow.Evaluation (n°%eval%)'|trans({'%eval%': evaluation.id}) }}
-    
-        {% if description is defined and description == true %}
-            {{ ' — ' ~ evaluation.evaluation.title|localize_translatable_string }}
-        {% endif %}
-    </div>
-    
-    {% if breadcrumb is defined and breadcrumb == true %}
-        {{ m.breadcrumb(_context) }}
-    {% endif %}
-</div>

src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig

@@ -0,0 +1,103 @@
+<div class="flex-table accompanying_course_work-list">
+    <div class="item-bloc evaluation-item bg-chill-llight-gray">
+        <div class="item-row mb-2">
+            <h2 class="badge-title">
+                <span class="title_label"></span>
+                <span class="title_action">
+                    {{ evaluation.accompanyingPeriodWork.socialAction|chill_entity_render_string }}
+                    <ul class="small_in_title columns mt-1">
+                        <li>
+                            <span class="item-key">{{ 'accompanying_course_work.start_date'|trans ~ ' : ' }}</span>
+                            <b>{{ evaluation.accompanyingPeriodWork.startDate|format_date('short') }}</b>
+                        </li>
+                        {% if evaluation.accompanyingPeriodWork.endDate %}
+                            <li>
+                                <span class="item-key">{{ 'accompanying_course_work.end_date'|trans ~ ' : ' }}</span>
+                                <b>{{ evaluation.accompanyingPeriodWork.endDate|format_date('short') }}</b>
+                            </li>
+                        {% endif %}
+                    </ul>
+                </span>
+            </h2>
+        </div>
+        <div class="item-row column">
+            <table class="obj-res-eval my-3" style="font-size: 110% !important;">
+                <thead>
+                    <tr>
+                        <th class="eval">
+                            <h4 class="title_label">
+                                {{ 'Évaluation'|trans }}
+                            </h4>
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td class="eval">
+                            <ul class="eval_title">
+                                <li class="my-2">
+                                    {{ evaluation.evaluation.title|localize_translatable_string }}
+                                    <ul class="columns pt-2">
+                                        <li>
+                                            <span class="item-key">{{ 'accompanying_course_work.start_date'|trans ~ ' : ' }}</span>
+                                            <b>{{ evaluation.startDate|format_date('short') }}</b>
+                                        </li>
+                                        {% if evaluation.endDate %}
+                                            <li>
+                                                <span class="item-key">{{ 'accompanying_course_work.end_date'|trans ~ ' : ' }}</span>
+                                                <b>{{ evaluation.endDate|format_date('short') }}</b>
+                                            </li>
+                                        {% endif %}
+                                        {% if evaluation.maxDate %}
+                                            <li>
+                                                <span class="item-key">{{ 'accompanying_course_work.max_date'|trans ~ ' : ' }}</span>
+                                                <b>{{ evaluation.maxDate|format_date('short') }}</b>
+                                            </li>
+                                        {% endif %}
+                                        {% if evaluation.warningInterval and evaluation.warningInterval.d > 0 %}
+                                            <li>
+                                                {% set days = (evaluation.warningInterval.d + evaluation.warningInterval.m * 30) %}
+                                                <span class="item-key">{{ 'accompanying_course_work.warning_interval'|trans ~ ' : ' }}</span>
+                                                {{ 'accompanying_course_work.%days% days before max_date'|trans({'%days%': days }) }}
+                                            </li>
+                                        {% endif %}
+                                        <li>
+                                            {% if evaluation.createdBy is not null %}
+                                            <span class="item-key">créé par</span>
+                                            <b>{{ evaluation.createdBy.username }}</b>
+                                            {% endif %}
+                                            {% if evaluation.createdAt is not null %}
+                                            <span class="item-key">{{ 'le'|trans }}</span>
+                                            <b>{{ evaluation.createdAt|format_date('short') }}</b>
+                                            {% endif %}
+                                        </li>
+                                    </ul>
+                                    {% if evaluation.comment %}
+                                        <blockquote class="chill-user-quote" style="margin-left: 0;">
+                                            {{ evaluation.comment }}
+                                        </blockquote>
+                                    {% endif %}
+                                </li>
+                            </ul>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+        <div class="item-row">
+            {% import '@ChillPerson/Macro/updatedBy.html.twig' as macro %}
+            {{ macro.updatedBy(evaluation) }}
+        </div>
+    </div>
+</div>
+
+{% if display_action is defined and display_action == true %}
+    {# TODO add acl #}
+    <ul class="record_actions">
+        <li>
+            <a class="btn btn-show" href="{{ path('chill_person_accompanying_period_work_edit', {'id': evaluation.accompanyingPeriodWork.id}) }}">
+                {{ 'Show'|trans }}
+            </a>
+        </li>
+    </ul>
+{% endif %}

src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php

@@ -33,6 +33,7 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
         self::DELETE,
         self::FULL,
         self::TOGGLE_CONFIDENTIAL_ALL,
+        self::TOGGLE_INTENSITY,
     ];
 
     public const CREATE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_CREATE';
@@ -62,6 +63,11 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
      */
     public const TOGGLE_CONFIDENTIAL_ALL = 'CHILL_PERSON_ACCOMPANYING_PERIOD_TOGGLE_CONFIDENTIAL_ALL';
 
+    /**
+     * Right to toggle urgency of parcours.
+     */
+    public const TOGGLE_INTENSITY = 'CHILL_PERSON_ACCOMPANYING_PERIOD_TOGGLE_INTENSITY';
+
     private Security $security;
 
     private VoterHelperInterface $voterHelper;
@@ -125,11 +131,20 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
             }
 
             if (self::TOGGLE_CONFIDENTIAL === $attribute) {
-                if ($subject->getUser() === $token->getUser()) {
+                if (null !== $subject->getUser() && ($subject->getUser() === $token->getUser())) {
                     return true;
                 }
 
-                return $this->voterHelper->voteOnAttribute(self::TOGGLE_CONFIDENTIAL_ALL, $subject, $token);
+                return false;
+                // return $this->voterHelper->voteOnAttribute(self::TOGGLE_CONFIDENTIAL_ALL, $subject, $token);
+            }
+
+            if (self::TOGGLE_INTENSITY === $attribute) {
+                if (null !== $subject->getUser() && ($subject->getUser() === $token->getUser())) {
+                    return true;
+                }
+
+                return false;
             }
 
             // if confidential, only the referent can see it

src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationDocumentVoter.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\PersonBundle\Security\Authorization;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
+use Symfony\Component\Security\Core\Authorization\Voter\Voter;
+use UnexpectedValueException;
+
+/**
+ * Voter for AccompanyingPeriodWorkEvaluationDocument.
+ *
+ * Delegates to the sames authorization than for Evalution
+ */
+class AccompanyingPeriodWorkEvaluationDocumentVoter extends Voter
+{
+    public const SEE = 'CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_EVALUATION_DOCUMENT_SHOW';
+
+    private AccessDecisionManagerInterface $accessDecisionManager;
+
+    public function __construct(AccessDecisionManagerInterface $accessDecisionManager)
+    {
+        $this->accessDecisionManager = $accessDecisionManager;
+    }
+
+    protected function supports($attribute, $subject)
+    {
+        return $subject instanceof AccompanyingPeriodWorkEvaluationDocument
+            && self::SEE === $attribute;
+    }
+
+    /**
+     * @param string $attribute
+     * @param AccompanyingPeriodWorkEvaluationDocument $subject
+     *
+     * @return bool|void
+     */
+    protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
+    {
+        switch ($attribute) {
+            case self::SEE:
+                return $this->accessDecisionManager->decide(
+                    $token,
+                    [AccompanyingPeriodWorkEvaluationVoter::SEE],
+                    $subject->getAccompanyingPeriodWorkEvaluation()
+                );
+
+            default:
+                throw new UnexpectedValueException("The attribute {$attribute} is not supported");
+        }
+    }
+}

src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDenormalizer.php

@@ -0,0 +1,124 @@
+<?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\PersonBundle\Serializer\Normalizer;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
+use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Component\Serializer\Normalizer\ContextAwareDenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
+use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
+use Symfony\Component\Serializer\Normalizer\ObjectToPopulateTrait;
+
+use function array_key_exists;
+use function array_merge;
+use function is_array;
+
+/**
+ * This denormalizer rely on AbstractNormalizer for most of the job, and
+ * add some logic for synchronizing collection.
+ */
+class AccompanyingPeriodWorkEvaluationDenormalizer implements ContextAwareDenormalizerInterface, DenormalizerAwareInterface
+{
+    use DenormalizerAwareTrait;
+
+    use ObjectToPopulateTrait;
+
+    private EntityManagerInterface $em;
+
+    private AccompanyingPeriodWorkRepository $workRepository;
+
+    public function __construct(
+        AccompanyingPeriodWorkRepository $workRepository,
+        EntityManagerInterface $em
+    ) {
+        $this->workRepository = $workRepository;
+        $this->em = $em;
+    }
+
+    public function denormalize($data, $type, $format = null, array $context = [])
+    {
+        $evaluation = $this->denormalizer->denormalize($data, $type, $format, array_merge(
+            $context,
+            ['skip' => self::class]
+        ));
+
+        $this->handleDocumentCollection($data, $evaluation, $format, $context);
+
+        return $evaluation;
+    }
+
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
+    {
+        return AccompanyingPeriodWorkEvaluation::class === $type
+            && self::class !== ($context['skip'] ?? null)
+            && is_array($data)
+            && array_key_exists('type', $data)
+            && 'accompanying_period_work_evaluation' === $data['type'];
+    }
+
+    private function handleDocumentCollection(array $data, AccompanyingPeriodWorkEvaluation $evaluation, string $format, array $context)
+    {
+        $dataById = [];
+        $dataWithoutId = [];
+
+        foreach ($data['documents'] as $e) {
+            if (array_key_exists('id', $e)) {
+                $dataById[$e['id']] = $e;
+            } else {
+                $dataWithoutId[] = $e;
+            }
+        }
+
+        //partition the separate kept documents and removed one
+        [$kept, $removed] = $evaluation->getDocuments()
+            ->partition(
+                static fn (int $key, AccompanyingPeriodWorkEvaluationDocument $a) => array_key_exists($a->getId(), $dataById)
+            );
+
+        // remove the document from evaluation
+        foreach ($removed as $r) {
+            $evaluation->removeDocument($r);
+        }
+
+        // handle the documents kept
+        foreach ($kept as $k) {
+            $this->denormalizer->denormalize(
+                $dataById[$k->getId()],
+                AccompanyingPeriodWorkEvaluationDocument::class,
+                $format,
+                array_merge(
+                    $context,
+                    [
+                        'groups' => ['write'],
+                        AbstractNormalizer::OBJECT_TO_POPULATE => $k,
+                    ]
+                )
+            );
+        }
+        // create new document
+        foreach ($dataWithoutId as $newData) {
+            $document = $this->denormalizer->denormalize(
+                $newData,
+                AccompanyingPeriodWorkEvaluationDocument::class,
+                $format,
+                array_merge(
+                    $context,
+                    ['groups' => ['accompanying_period_work_evaluation:create']]
+                )
+            );
+            $evaluation->addDocument($document);
+        }
+    }
+}

src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDocumentNormalizer.php

@@ -0,0 +1,71 @@
+<?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\PersonBundle\Serializer\Normalizer;
+
+use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
+use Chill\MainBundle\Workflow\Helper\MetadataExtractor;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
+use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
+use Symfony\Component\Workflow\Registry;
+use function array_key_exists;
+
+class AccompanyingPeriodWorkEvaluationDocumentNormalizer implements ContextAwareNormalizerInterface, NormalizerAwareInterface
+{
+    use NormalizerAwareTrait;
+
+    private const SKIP = 'accompanying_period_work_evaluation_document_skip';
+
+    private EntityWorkflowRepository $entityWorkflowRepository;
+
+    private MetadataExtractor $metadataExtractor;
+
+    private Registry $registry;
+
+    public function __construct(EntityWorkflowRepository $entityWorkflowRepository, MetadataExtractor $metadataExtractor, Registry $registry)
+    {
+        $this->entityWorkflowRepository = $entityWorkflowRepository;
+        $this->metadataExtractor = $metadataExtractor;
+        $this->registry = $registry;
+    }
+
+    public function normalize($object, ?string $format = null, array $context = []): array
+    {
+        $initial = $this->normalizer->normalize($object, $format, array_merge($context, [
+            self::SKIP => spl_object_hash($object),
+        ]));
+
+        $initial['workflows_availables'] = $this->metadataExtractor->availableWorkflowFor(
+            AccompanyingPeriodWorkEvaluationDocument::class,
+            $object->getId()
+        );
+
+        $workflows = $this->entityWorkflowRepository->findBy([
+            'relatedEntityClass' => AccompanyingPeriodWorkEvaluationDocument::class,
+            'relatedEntityId' => $object->getId(),
+        ]);
+        $initial['workflows'] = $this->normalizer->normalize($workflows, 'json', $context);
+
+        return $initial;
+    }
+
+    public function supportsNormalization($data, ?string $format = null, array $context = [])
+    {
+        return $data instanceof AccompanyingPeriodWorkEvaluationDocument
+            && 'json' === $format
+            && (
+                !array_key_exists(self::SKIP, $context)
+                || spl_object_hash($data) !== $context[self::SKIP]
+            );
+    }
+}

src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php

@@ -49,6 +49,15 @@ class AccompanyingPeriodWorkEvaluationNormalizer implements ContextAwareNormaliz
             [self::IGNORE_EVALUATION => spl_object_hash($object)]
         ));
 
+        // due to bug: https://api-platform.com/docs/core/serialization/#collection-relation
+        // and also: https://github.com/symfony/symfony/issues/36965
+        // we have to rewrite the documents as a collection
+        $initial['documents'] = $this->normalizer->normalize(
+            $object->getDocuments()->getValues(),
+            $format,
+            $context
+        );
+
         // then, we add normalization for things which are not into the entity
 
         $initial['workflows_availables'] = $this->metadataExtractor->availableWorkflowFor(

src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkNormalizer.php

@@ -16,6 +16,7 @@ use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
 use Chill\MainBundle\Workflow\Helper\MetadataExtractor;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
 use Symfony\Component\Serializer\Exception\ExceptionInterface;
 use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
@@ -56,6 +57,15 @@ class AccompanyingPeriodWorkNormalizer implements ContextAwareNormalizerInterfac
             [self::IGNORE_WORK => spl_object_hash($object)]
         ));
 
+        // due to bug: https://api-platform.com/docs/core/serialization/#collection-relation
+        // and also: https://github.com/symfony/symfony/issues/36965
+        // we have to rewrite the evaluations as a collection
+        $initial['accompanyingPeriodWorkEvaluations'] = $this->normalizer->normalize(
+            $object->getAccompanyingPeriodWorkEvaluations()->getValues(),
+            $format,
+            $context
+        );
+
         // then, we add normalization for things which are not into the entity
 
         $initial['workflows_availables'] = $this->metadataExtractor->availableWorkflowFor(
@@ -67,10 +77,15 @@ class AccompanyingPeriodWorkNormalizer implements ContextAwareNormalizerInterfac
             AccompanyingPeriodWorkEvaluation::class
         );
 
+        $initial['workflows_availables_evaluation_documents'] = $this->metadataExtractor->availableWorkflowFor(
+            AccompanyingPeriodWorkEvaluationDocument::class
+        );
+
         $workflows = $this->entityWorkflowRepository->findBy([
             'relatedEntityClass' => AccompanyingPeriodWork::class,
             'relatedEntityId' => $object->getId(),
         ]);
+
         $initial['workflows'] = $this->normalizer->normalize($workflows, 'json', $context);
 
         return $initial;

src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php

@@ -95,9 +95,9 @@ class PersonDocGenNormalizer implements
             'maritalStatus' => null !== ($ms = $person->getMaritalStatus()) ? $this->translatableStringHelper->localize($ms->getName()) : '',
             'maritalStatusDate' => $this->normalizer->normalize($person->getMaritalStatusDate(), $format, $dateContext),
             'email' => $person->getEmail(),
-            'firstPhoneNumber' => $person->getPhonenumber() ?? $person->getMobilenumber(),
-            'fixPhoneNumber' => $person->getPhonenumber(),
-            'mobilePhoneNumber' => $person->getMobilenumber(),
+            'firstPhoneNumber' => $this->normalizer->normalize($person->getPhonenumber() ?? $person->getMobilenumber(), $format, $context),
+            'fixPhoneNumber' => $this->normalizer->normalize($person->getPhonenumber(), $format, $context),
+            'mobilePhoneNumber' => $this->normalizer->normalize($person->getMobilenumber(), $format, $context),
             'nationality' => null !== ($c = $person->getNationality()) ? $this->translatableStringHelper->localize($c->getName()) : '',
             'placeOfBirth' => $person->getPlaceOfBirth(),
             'memo' => $person->getMemo(),

src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Serializer\Normalizer;
 
 use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Phonenumber\PhoneNumberHelperInterface;
 use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderExtension;
 use Chill\PersonBundle\Entity\Person;
@@ -21,6 +22,7 @@ use Chill\PersonBundle\Repository\ResidentialAddressRepository;
 use DateTime;
 use DateTimeImmutable;
 use Doctrine\Common\Collections\Collection;
+use libphonenumber\PhoneNumber;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
@@ -43,6 +45,8 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
 
     private CenterResolverManagerInterface $centerResolverManager;
 
+    private PhoneNumberHelperInterface $phoneNumberHelper;
+
     private ChillEntityRenderExtension $render;
 
     private PersonRepository $repository;
@@ -53,12 +57,14 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
         ChillEntityRenderExtension $render,
         PersonRepository $repository,
         CenterResolverManagerInterface $centerResolverManager,
-        ResidentialAddressRepository $residentialAddressRepository
+        ResidentialAddressRepository $residentialAddressRepository,
+        PhoneNumberHelperInterface $phoneNumberHelper
     ) {
         $this->render = $render;
         $this->repository = $repository;
         $this->centerResolverManager = $centerResolverManager;
         $this->residentialAddressRepository = $residentialAddressRepository;
+        $this->phoneNumberHelper = $phoneNumberHelper;
     }
 
     public function denormalize($data, $type, $format = null, array $context = [])
@@ -112,12 +118,12 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
                     break;
 
                 case 'phonenumber':
-                    $person->setPhonenumber($data[$item]);
+                    $person->setPhonenumber($this->denormalizer->denormalize($data[$item], PhoneNumber::class, $format, $context));
 
                     break;
 
                 case 'mobilenumber':
-                    $person->setMobilenumber($data[$item]);
+                    $person->setMobilenumber($this->denormalizer->denormalize($data[$item], PhoneNumber::class, $format, $context));
 
                     break;
 
@@ -195,6 +201,10 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
             'birthdate' => $this->normalizer->normalize($person->getBirthdate(), $format, $context),
             'deathdate' => $this->normalizer->normalize($person->getDeathdate(), $format, $context),
             'age' => $this->normalizer->normalize($person->getAge(), $format, $context),
+            'phonenumber' => $this->normalizer->normalize($person->getPhonenumber()),
+            'mobilenumber' => $this->normalizer->normalize($person->getMobilenumber()),
+            'email' => $person->getEmail(),
+            'gender' => $person->getGender(),
         ];
 
         if (in_array("minimal", $groups) && 1 === count($groups)) {
@@ -203,11 +213,7 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
 
         return array_merge($data, [
             'centers' => $this->normalizer->normalize($this->centerResolverManager->resolveCenters($person), $format, $context),
-            'phonenumber' => $person->getPhonenumber(),
-            'mobilenumber' => $person->getMobilenumber(),
-            'email' => $person->getEmail(),
             'altNames' => $this->normalizeAltNames($person->getAltNames()),
-            'gender' => $person->getGender(),
             'current_household_id' => $household ? $this->normalizer->normalize($household->getId(), $format, $context) : null,
             'current_residential_addresses' => $currentResidentialAddresses ?
                 $this->normalizer->normalize($currentResidentialAddresses, $format, $context) :

src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/AccompanyingPeriodConfidentialTest.php

@@ -13,9 +13,7 @@ namespace Chill\PersonBundle\Tests\AccompanyingPeriod;
 
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\Person;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use Symfony\Component\HttpFoundation\Request;
 
 /**
  * @internal
@@ -42,7 +40,7 @@ final class AccompanyingPeriodConfidentialTest extends WebTestCase
         ]);
     }
 
-    public function dataGenerateRandomAccompanyingCourse()
+    public function testConfidentialInvalid()
     {
         // Disabling this dataprovider to avoid having errors while running the test.
         return yield from [];
@@ -88,10 +86,7 @@ final class AccompanyingPeriodConfidentialTest extends WebTestCase
         }
     }
 
-    /**
-     * @dataProvider dataGenerateRandomAccompanyingCourse
-     */
-    public function testRemoveUserWhenConfidential(int $periodId)
+    public function testConfidentialValid()
     {
         $this->markTestIncomplete(
             'Marked as incomplete because of a problem in the dataprovider, at line 81.'
@@ -101,8 +96,7 @@ final class AccompanyingPeriodConfidentialTest extends WebTestCase
             ->find($periodId);
         $em = self::$kernel->getContainer()->get('doctrine.orm.entity_manager');
 
-        $isConfidential = $period->isConfidential();
-        $step = $period->getStep();
+        $violations = self::$validator->validate($period, null, ['confirmed']);
 
         $initialUser = $period->getUser();
 

src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php

@@ -297,13 +297,14 @@ final class PersonControllerUpdateTest extends WebTestCase
             // reminder: this value is capitalized
             ['placeOfBirth', 'A PLACE', static function (Person $person) { return $person->getPlaceOfBirth(); }],
             ['birthdate', '1980-12-15', static function (Person $person) { return $person->getBirthdate()->format('Y-m-d'); }],
-            ['phonenumber', '+32123456789', static function (Person $person) { return $person->getPhonenumber(); }],
+            // TODO test on phonenumber update
+            // ['phonenumber', '+32123456789', static function (Person $person) { return $person->getPhonenumber(); }],
             ['memo', 'jfkdlmq jkfldmsq jkmfdsq', static function (Person $person) { return $person->getMemo(); }],
             ['countryOfBirth', 'BE', static function (Person $person) { return $person->getCountryOfBirth()->getCountryCode(); }],
             ['nationality', 'FR', static function (Person $person) { return $person->getNationality()->getCountryCode(); }],
             ['placeOfBirth', '', static function (Person $person) { return $person->getPlaceOfBirth(); }],
             ['birthdate', '', static function (Person $person) { return $person->getBirthdate(); }],
-            ['phonenumber', '', static function (Person $person) { return $person->getPhonenumber(); }],
+            //['phonenumber', '', static function (Person $person) { return $person->getPhonenumber(); }],
             ['memo', '', static function (Person $person) { return $person->getMemo(); }],
             ['countryOfBirth', null, static function (Person $person) { return $person->getCountryOfBirth(); }],
             ['nationality', null, static function (Person $person) { return $person->getNationality(); }],

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

@@ -158,7 +158,7 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
 
         $participationL = $period->closeParticipationFor($person);
         $this->assertSame($participationL, $participation);
-        $this->assertTrue($participation->getEndDate() instanceof DateTimeInterface);
+        $this->assertTrue($participationL->getEndDate() instanceof DateTimeInterface);
 
         $participation = $period->getOpenParticipationContainsPerson($person);
         $this->assertNull($participation);

src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php

@@ -15,6 +15,7 @@ use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
@@ -28,10 +29,13 @@ class AccompanyingPeriodValidityValidator extends ConstraintValidator
 
     private SocialIssueRender $socialIssueRender;
 
-    public function __construct(ActivityRepository $activityRepository, SocialIssueRender $socialIssueRender)
+    private TokenStorageInterface $token;
+
+    public function __construct(ActivityRepository $activityRepository, SocialIssueRender $socialIssueRender, TokenStorageInterface $token)
     {
         $this->activityRepository = $activityRepository;
         $this->socialIssueRender = $socialIssueRender;
+        $this->token = $token;
     }
 
     public function validate($period, Constraint $constraint)
@@ -44,6 +48,7 @@ class AccompanyingPeriodValidityValidator extends ConstraintValidator
             throw new UnexpectedValueException($period, AccompanyingPeriod::class);
         }
 
+        /** Check if a social issue can be deleted (is not linked to an action or activity within the parcours) */
         $socialIssues = [];
 
         $activities = $this->activityRepository->findBy(['accompanyingPeriod' => $period]);

src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ConfidentialCourseMustHaveReferrer.php

@@ -0,0 +1,27 @@
+<?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\PersonBundle\Validator\Constraints\AccompanyingPeriod;
+
+use Symfony\Component\Validator\Constraint;
+
+/**
+ * @Annotation
+ */
+class ConfidentialCourseMustHaveReferrer extends Constraint
+{
+    public string $message = 'A confidential parcours must have a referrer';
+
+    public function getTargets()
+    {
+        return [self::CLASS_CONSTRAINT];
+    }
+}

src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ConfidentialCourseMustHaveReferrerValidator.php

@@ -0,0 +1,38 @@
+<?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\PersonBundle\Validator\Constraints\AccompanyingPeriod;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+
+class ConfidentialCourseMustHaveReferrerValidator extends ConstraintValidator
+{
+    public function validate($value, Constraint $constraint)
+    {
+        if (!$value instanceof AccompanyingPeriod) {
+            throw new UnexpectedTypeException($value, AccompanyingPeriod::class);
+        }
+
+        if (!$constraint instanceof ConfidentialCourseMustHaveReferrer) {
+            throw new UnexpectedTypeException($constraint, ConfidentialCourseMustHaveReferrer::class);
+        }
+
+        if ($value->isConfidential() && null === $value->getUser()) {
+            $this->context
+                ->buildViolation($constraint->message)
+                ->atPath('user')
+                ->addViolation();
+        }
+    }
+}

src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php

@@ -0,0 +1,96 @@
+<?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\PersonBundle\Workflow;
+
+use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
+use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocumentRepository;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodWorkEvaluationDocumentVoter;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler implements EntityWorkflowHandlerInterface
+{
+    private AccompanyingPeriodWorkEvaluationDocumentRepository $repository;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    private TranslatorInterface $translator;
+
+    public function __construct(
+        AccompanyingPeriodWorkEvaluationDocumentRepository $repository,
+        TranslatableStringHelperInterface $translatableStringHelper,
+        TranslatorInterface $translator
+    ) {
+        $this->repository = $repository;
+        $this->translatableStringHelper = $translatableStringHelper;
+        $this->translator = $translator;
+    }
+
+    public function getEntityData(EntityWorkflow $entityWorkflow, array $options = []): array
+    {
+        $doc = $this->getRelatedEntity($entityWorkflow);
+
+        return [
+            'persons' => $doc->getAccompanyingPeriodWorkEvaluation()
+                ->getAccompanyingPeriodWork()->getPersons(),
+        ];
+    }
+
+    public function getEntityTitle(EntityWorkflow $entityWorkflow, array $options = []): string
+    {
+        $doc = $this->getRelatedEntity($entityWorkflow);
+
+        return $this->translator->trans(
+            'workflow.Doc for evaluation (n°%eval%)',
+            ['%eval%' => $entityWorkflow->getRelatedEntityId()]
+        ) . ' - ' . $this->translatableStringHelper->localize($doc->getAccompanyingPeriodWorkEvaluation()
+            ->getEvaluation()->getTitle());
+    }
+
+    public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingPeriodWorkEvaluationDocument
+    {
+        return $this->repository->find($entityWorkflow->getRelatedEntityId());
+    }
+
+    public function getRoleShow(EntityWorkflow $entityWorkflow): ?string
+    {
+        return AccompanyingPeriodWorkEvaluationDocumentVoter::SEE;
+    }
+
+    public function getTemplate(EntityWorkflow $entityWorkflow, array $options = []): string
+    {
+        return '@ChillPerson/Workflow/_evaluation_document.html.twig';
+    }
+
+    public function getTemplateData(EntityWorkflow $entityWorkflow, array $options = []): array
+    {
+        $doc = $this->getRelatedEntity($entityWorkflow);
+
+        return [
+            'entity_workflow' => $entityWorkflow,
+            'evaluation' => $doc->getAccompanyingPeriodWorkEvaluation(),
+            'doc' => $doc,
+        ];
+    }
+
+    public function supports(EntityWorkflow $entityWorkflow, array $options = []): bool
+    {
+        return $entityWorkflow->getRelatedEntityClass() === AccompanyingPeriodWorkEvaluationDocument::class;
+    }
+
+    public function supportsFreeze(EntityWorkflow $entityWorkflow, array $options = []): bool
+    {
+        return false;
+    }
+}

src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Workflow;
 
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationRepository;
@@ -22,11 +23,17 @@ class AccompanyingPeriodWorkEvaluationWorkflowHandler implements EntityWorkflowH
 {
     private AccompanyingPeriodWorkEvaluationRepository $repository;
 
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
     private TranslatorInterface $translator;
 
-    public function __construct(AccompanyingPeriodWorkEvaluationRepository $repository, TranslatorInterface $translator)
-    {
+    public function __construct(
+        AccompanyingPeriodWorkEvaluationRepository $repository,
+        TranslatableStringHelperInterface $translatableStringHelper,
+        TranslatorInterface $translator
+    ) {
         $this->repository = $repository;
+        $this->translatableStringHelper = $translatableStringHelper;
         $this->translator = $translator;
     }
 
@@ -41,7 +48,12 @@ class AccompanyingPeriodWorkEvaluationWorkflowHandler implements EntityWorkflowH
 
     public function getEntityTitle(EntityWorkflow $entityWorkflow, array $options = []): string
     {
-        return $this->translator->trans('workflow.Evaluation (n°%eval%)', ['%eval%' => $entityWorkflow->getRelatedEntityId()]);
+        $evaluation = $this->getRelatedEntity($entityWorkflow);
+
+        return $this->translator->trans(
+            'workflow.Evaluation (n°%eval%)',
+            ['%eval%' => $entityWorkflow->getRelatedEntityId()]
+        ) . ' - ' . $this->translatableStringHelper->localize($evaluation->getEvaluation()->getTitle());
     }
 
     public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingPeriodWorkEvaluation
@@ -67,16 +79,6 @@ class AccompanyingPeriodWorkEvaluationWorkflowHandler implements EntityWorkflowH
         ];
     }
 
-    public function getTemplateTitle(EntityWorkflow $entityWorkflow, array $options = []): string
-    {
-        return '@ChillPerson/Workflow/_evaluation.title.html.twig';
-    }
-
-    public function getTemplateTitleData(EntityWorkflow $entityWorkflow, array $options = []): array
-    {
-        return $this->getTemplateData($entityWorkflow, $options);
-    }
-
     public function supports(EntityWorkflow $entityWorkflow, array $options = []): bool
     {
         return $entityWorkflow->getRelatedEntityClass() === AccompanyingPeriodWorkEvaluation::class;

src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Workflow;
 
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
@@ -21,11 +22,17 @@ class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInte
 {
     private AccompanyingPeriodWorkRepository $repository;
 
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
     private TranslatorInterface $translator;
 
-    public function __construct(AccompanyingPeriodWorkRepository $repository, TranslatorInterface $translator)
-    {
+    public function __construct(
+        AccompanyingPeriodWorkRepository $repository,
+        TranslatableStringHelperInterface $translatableStringHelper,
+        TranslatorInterface $translator
+    ) {
         $this->repository = $repository;
+        $this->translatableStringHelper = $translatableStringHelper;
         $this->translator = $translator;
     }
 
@@ -39,7 +46,11 @@ class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInte
 
     public function getEntityTitle(EntityWorkflow $entityWorkflow, array $options = []): string
     {
-        return $this->translator->trans('workflow.Work (n°%w%)', ['%w%' => $entityWorkflow->getRelatedEntityId()]);
+        $work = $this->getRelatedEntity($entityWorkflow);
+
+        return
+            $this->translator->trans('workflow.Work (n°%w%)', ['%w%' => $entityWorkflow->getRelatedEntityId()])
+            . ' - ' . $this->translatableStringHelper->localize($work->getSocialAction()->getTitle());
     }
 
     public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingPeriodWork
@@ -65,16 +76,6 @@ class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInte
         ];
     }
 
-    public function getTemplateTitle(EntityWorkflow $entityWorkflow, array $options = []): string
-    {
-        return '@ChillPerson/Workflow/_accompanying_period_work.title.html.twig';
-    }
-
-    public function getTemplateTitleData(EntityWorkflow $entityWorkflow, array $options = []): array
-    {
-        return $this->getTemplateData($entityWorkflow, $options);
-    }
-
     public function supports(EntityWorkflow $entityWorkflow, array $options = []): bool
     {
         return $entityWorkflow->getRelatedEntityClass() === AccompanyingPeriodWork::class;

src/Bundle/ChillPersonBundle/chill.api.specs.yaml

@@ -1177,6 +1177,44 @@ paths:
         422:
           description: "object with validation errors"
 
+  /1.0/person/accompanying-course/{id}/intensity.json:
+    post:
+      tags:
+        - person
+      summary: "Toggle intensity status of accompanying course"
+      parameters:
+        - name: id
+          in: path
+          required: true
+          description: The accompanying period's id
+          schema:
+            type: integer
+            format: integer
+            minimum: 1
+      requestBody:
+        description: "Intensity toggle"
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                type:
+                  type: string
+                  enum:
+                    - "accompanying_period"
+                intensity:
+                  type: string
+      responses:
+        401:
+          description: "Unauthorized"
+        404:
+          description: "Not found"
+        200:
+          description: "OK"
+        422:
+          description: "object with validation errors"
+
   /1.0/person/accompanying-course/by-person/{person_id}.json:
     get:
       tags:

src/Bundle/ChillPersonBundle/config/services/form.yaml

@@ -1,15 +1,15 @@
 services:
-
     Chill\PersonBundle\Form\:
         autowire: true
         autoconfigure: true
         resource: '../../Form/'
 
     Chill\PersonBundle\Form\PersonType:
+        autowire: true
+        autoconfigure: true
         arguments:
             $personFieldsConfiguration: '%chill_person.person_fields%'
             $configAltNamesHelper: '@Chill\PersonBundle\Config\ConfigPersonAltNamesHelper'
-            $translatableStringHelper: '@Chill\MainBundle\Templating\TranslatableStringHelper'
         tags:
             - { name: form.type, alias: '@chill.person.form.person_creation' }
 

src/Bundle/ChillPersonBundle/config/services/security.yaml

@@ -34,6 +34,10 @@ services:
         autowire: true
         autoconfigure: true
 
+    Chill\PersonBundle\Security\Authorization\AccompanyingPeriodWorkEvaluationDocumentVoter:
+        autowire: true
+        autoconfigure: true
+
     Chill\PersonBundle\Security\Authorization\HouseholdVoter:
         autowire: true
         autoconfigure: true

src/Bundle/ChillPersonBundle/config/validation.yaml

@@ -19,8 +19,5 @@ Chill\PersonBundle\Entity\AccompanyingPeriod:
 Chill\PersonBundle\Entity\PersonPhone:
     properties:
         phonenumber:
-            - Regex:
-                pattern: '/^([\+{1}])([0-9\s*]{4,20})$/'
-                message: 'Invalid phone number: it should begin with the international prefix starting with "+", hold only digits and be smaller than 20 characters. Ex: +33123456789'
             - Chill\MainBundle\Validation\Constraint\PhonenumberConstraint:
                 type: any

src/Bundle/ChillPersonBundle/migrations/Version20220215135509.php

@@ -0,0 +1,86 @@
+<?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;
+use Exception;
+use libphonenumber\PhoneNumberUtil;
+use RuntimeException;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+
+final class Version20220215135509 extends AbstractMigration implements ContainerAwareInterface
+{
+    use ContainerAwareTrait;
+
+    public function down(Schema $schema): void
+    {
+        throw new Exception('You should not do that.');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Update phone numbers for person';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $carrier_code = $this->container
+            ->getParameter('chill_main')['phone_helper']['default_carrier_code'];
+
+        if (null === $carrier_code) {
+            throw new RuntimeException('no carrier code');
+        }
+
+        $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 phonenumber DROP NOT NULL');
+        $this->addSql('COMMENT ON COLUMN chill_person_person.phonenumber IS 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 mobilenumber DROP NOT NULL');
+        $this->addSql('COMMENT ON COLUMN chill_person_person.mobilenumber IS NULL');
+
+        $this->addSql(
+            'UPDATE chill_person_person SET ' .
+            $this->buildMigrationPhonenumberClause($carrier_code, 'phonenumber') .
+            ', ' .
+            $this->buildMigrationPhoneNumberClause($carrier_code, 'mobilenumber')
+        );
+
+        $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(
+            'UPDATE chill_person_phone SET ' .
+            $this->buildMigrationPhoneNumberClause($carrier_code, 'phonenumber')
+        );
+    }
+
+    private function buildMigrationPhoneNumberClause(string $defaultCarriercode, string $field): string
+    {
+        $util = PhoneNumberUtil::getInstance();
+
+        $countryCode = $util->getCountryCodeForRegion($defaultCarriercode);
+
+        return sprintf('%s=CASE
+                WHEN %s = \'\' THEN NULL
+                WHEN LEFT(%s, 1) = \'0\'
+                    THEN \'+%s\' || replace(replace(substr(%s, 2), \'(0)\', \'\'), \' \', \'\')
+                ELSE replace(replace(%s, \'(0)\', \'\'),\' \', \'\')
+            END', $field, $field, $field, $countryCode, $field, $field);
+    }
+}

src/Bundle/ChillPersonBundle/migrations/Version20220224145951.php

@@ -0,0 +1,38 @@
+<?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;
+
+/**
+ * Add title to AccompanyingPeriodWorkEvaluationDocument.
+ */
+final class Version20220224145951 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document DROP title');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Add title to AccompanyingPeriodWorkEvaluationDocument';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document ADD title TEXT NOT NULL DEFAULT \'\'');
+        $this->addSql('UPDATE chill_person_accompanying_period_work_evaluation_document SET title=name->>\'fr\'
+            FROM chill_docgen_template cdt WHERE cdt.id = chill_person_accompanying_period_work_evaluation_document.template_id');
+    }
+}

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

@@ -571,3 +571,6 @@ Linked evaluations: Évaluations associées
 # Accompanying period per user
 My accompanying periods: Mes parcours
 My accompanying periods in draft: Mes parcours brouillons
+
+workflow:
+    Doc for evaluation (n°%eval%): Document de l'évaluation n°%eval%

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

@@ -20,6 +20,7 @@ Two addresses has the same validFrom date: La date de validité est identique à
 The firstname cannot be empty: Le prénom ne peut pas être vide
 The lastname cannot be empty: Le nom de famille ne peut pas être vide
 The gender must be set: Le genre doit être renseigné
+You are not allowed to perform this action: Vous n'avez pas le droit de changer cette valeur.
 
 #export list
 You must select at least one element: Vous devez sélectionner au moins un élément
@@ -51,6 +52,8 @@ household_membership:
 A course must contains at least one social issue: 'Un parcours doit être associé à au moins une problématique sociale'
 A course must be associated to at least one scope: 'Un parcours doit être associé à au moins un service'
 The social %name% issue cannot be deleted because it is associated with an activity or an action: 'La problématique sociale "%name%" ne peut pas être supprimée car elle est associée à une activité ou une action'
+A confidential parcours must have a referrer: 'Un parcours confidentiel doit avoir un référent'
+Only the referrer can change the confidentiality of a parcours: 'Seul le référent peut modifier la confidentialité'
 
 # resource
 You must associate at least one entity: Associez un usager, un tiers ou indiquez une description libre