Merge branch 'master' into 295_resume_retouches

CHANGELOG.md

@@ -11,6 +11,10 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [person] suggest entities (person | thirdparty) when creating/editing the accompanying course (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/119)
+* [activity] add custom validation on the Activity class, based on what is required from the ActivityType (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/188)
+* [main] translate multiselect messages when selecting/creating address
+* [main] set the coordinates of the city when creating a new address OR choosing "pas d'adresse complète"
 * Use the user.label in accompanying course banner, instead of username;
 * fix: show validation message when closing accompanying course;
 * [thirdparty] link from modal to thirdparty detail page fixed (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/228)
@@ -23,6 +27,14 @@ and this project adheres to
   * https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/101
   * https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/295
 * [activity/calendar] on show page, concerned groups of persons table adapt itself to isVisibles options
+* [activity] remove the "plus" button in activity list
+* [activity] check ACL on activity list in person context
+* [list for accompanying course in person] filter list using ACL
+* [validation] toasts are displayed for errors when modifying accompanying course (generalization required).
+* [period] only the user can enable confidentiality
+* add an endpoint for checking permissions. See https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/232
+* [activity] for a new activity: suggest and create on-the-fly locations based on the accompanying course location + location of the suggested parties
+* [calendar] for a new rdv: suggest and create on-the-fly locations based on the accompanying course location + location of the suggested parties
 
 ## Test releases
 

phpstan-critical.neon

@@ -70,11 +70,6 @@ parameters:
             count: 1
             path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
 
-        -
-            message: "#^Undefined variable\\: \\$value$#"
-            count: 1
-            path: src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidityValidator.php
-
         -
             message: "#^Undefined variable\\: \\$choiceSlug$#"
             count: 1

phpstan-deprecations.neon

@@ -1330,14 +1330,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$centerResolverDispatcher of method Chill\\\\PersonBundle\\\\Validator\\\\Constraints\\\\Person\\\\PersonHasCenterValidator\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
-					Use CenterResolverManager and its interface CenterResolverManagerInterface$#
-				"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenterValidator.php
 
 		-
 			message:

src/Bundle/ChillActivityBundle/Controller/ActivityController.php

@@ -105,18 +105,19 @@ final class ActivityController extends AbstractController
 
         [$person, $accompanyingPeriod] = $this->getEntity($request);
 
-        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillActivityBundle:Activity:confirm_deleteAccompanyingCourse.html.twig';
-        } elseif ($person instanceof Person) {
-            $view = 'ChillActivityBundle:Activity:confirm_deletePerson.html.twig';
-        }
-
         $activity = $this->activityRepository->find($id);
 
         if (!$activity) {
             throw $this->createNotFoundException('Unable to find Activity entity.');
         }
 
+        if ($activity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
+            $view = 'ChillActivityBundle:Activity:confirm_deleteAccompanyingCourse.html.twig';
+            $accompanyingPeriod = $activity->getAccompanyingPeriod();
+        } else {
+            $view = 'ChillActivityBundle:Activity:confirm_deletePerson.html.twig';
+        }
+
         // TODO
         // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_DELETE', $activity);
 
@@ -137,7 +138,7 @@ final class ActivityController extends AbstractController
                             static fn (ActivityReason $ar): int => $ar->getId()
                         )
                         ->toArray(),
-                    'type_id' => $activity->getType()->getId(),
+                    'type_id' => $activity->getActivityType()->getId(),
                     'duration' => $activity->getDurationTime() ? $activity->getDurationTime()->format('U') : null,
                     'date' => $activity->getDate()->format('Y-m-d'),
                     'attendee' => $activity->getAttendee(),
@@ -176,25 +177,25 @@ final class ActivityController extends AbstractController
 
         [$person, $accompanyingPeriod] = $this->getEntity($request);
 
-        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillActivityBundle:Activity:editAccompanyingCourse.html.twig';
-        } elseif ($person instanceof Person) {
-            $view = 'ChillActivityBundle:Activity:editPerson.html.twig';
-        }
-
         $entity = $this->activityRepository->find($id);
 
         if (null === $entity) {
             throw $this->createNotFoundException('Unable to find Activity entity.');
         }
 
+        if ($entity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
+            $view = 'ChillActivityBundle:Activity:editAccompanyingCourse.html.twig';
+            $accompanyingPeriod = $entity->getAccompanyingPeriod();
+        } else {
+            $view = 'ChillActivityBundle:Activity:editPerson.html.twig';
+        }
         // TODO
         // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_UPDATE', $entity);
 
         $form = $this->createForm(ActivityType::class, $entity, [
             'center' => $entity->getCenter(),
             'role' => new Role('CHILL_ACTIVITY_UPDATE'),
-            'activityType' => $entity->getType(),
+            'activityType' => $entity->getActivityType(),
             'accompanyingPeriod' => $accompanyingPeriod,
         ])->handleRequest($request);
 
@@ -327,7 +328,7 @@ final class ActivityController extends AbstractController
             $entity->setAccompanyingPeriod($accompanyingPeriod);
         }
 
-        $entity->setType($activityType);
+        $entity->setActivityType($activityType);
         $entity->setDate(new DateTime('now'));
 
         if ($request->query->has('activityData')) {
@@ -385,7 +386,7 @@ final class ActivityController extends AbstractController
         $form = $this->createForm(ActivityType::class, $entity, [
             'center' => $entity->getCenter(),
             'role' => new Role('CHILL_ACTIVITY_CREATE'),
-            'activityType' => $entity->getType(),
+            'activityType' => $entity->getActivityType(),
             'accompanyingPeriod' => $accompanyingPeriod,
         ])->handleRequest($request);
 
@@ -408,7 +409,7 @@ final class ActivityController extends AbstractController
 
         $activity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
 
-        $defaultLocationId = $this->getUser()->getCurrentLocation()->getId();
+        $defaultLocation = $this->getUser()->getCurrentLocation();
 
         return $this->render($view, [
             'person' => $person,
@@ -416,7 +417,7 @@ final class ActivityController extends AbstractController
             'entity' => $entity,
             'form' => $form->createView(),
             'activity_json' => $activity_array,
-            'default_location_id' => $defaultLocationId,
+            'default_location' => $defaultLocation,
         ]);
     }
 

src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php

@@ -23,6 +23,7 @@ class AdminActivityTypeController extends CRUDController
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
         /** @var \Doctrine\ORM\QueryBuilder $query */
-        return $query->orderBy('e.ordering', 'ASC');
+        return $query->orderBy('e.ordering', 'ASC')
+            ->addOrderBy('e.id', 'ASC');
     }
 }

src/Bundle/ChillActivityBundle/Entity/Activity.php

@@ -9,6 +9,7 @@
 
 namespace Chill\ActivityBundle\Entity;
 
+use Chill\ActivityBundle\Validator\Constraints as ActivityValidator;
 use Chill\DocStoreBundle\Entity\Document;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
@@ -41,6 +42,7 @@ use Symfony\Component\Serializer\Annotation\SerializedName;
  * @DiscriminatorMap(typeProperty="type", mapping={
  *     "activity": Activity::class
  * })
+ * @ActivityValidator\ActivityValidity
  */
 
 /*
@@ -202,7 +204,9 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
     public function addPerson(?Person $person): self
     {
         if (null !== $person) {
-            $this->persons[] = $person;
+            if (!$this->persons->contains($person)) {
+                $this->persons[] = $person;
+            }
         }
 
         return $this;
@@ -236,7 +240,9 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
     public function addThirdParty(?ThirdParty $thirdParty): self
     {
         if (null !== $thirdParty) {
-            $this->thirdParties[] = $thirdParty;
+            if (!$this->thirdParties->contains($thirdParty)) {
+                $this->thirdParties[] = $thirdParty;
+            }
         }
 
         return $this;
@@ -245,7 +251,9 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
     public function addUser(?User $user): self
     {
         if (null !== $user) {
-            $this->users[] = $user;
+            if (!$this->users->contains($user)) {
+                $this->users[] = $user;
+            }
         }
 
         return $this;

src/Bundle/ChillActivityBundle/Entity/ActivityType.php

@@ -12,6 +12,7 @@ namespace Chill\ActivityBundle\Entity;
 use Doctrine\ORM\Mapping as ORM;
 use InvalidArgumentException;
 use Symfony\Component\Serializer\Annotation\Groups;
+use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * Class ActivityType.
@@ -29,11 +30,13 @@ class ActivityType
     public const FIELD_REQUIRED = 2;
 
     /**
+     * @deprecated not in use
      * @ORM\Column(type="string", nullable=false, options={"default": ""})
      */
     private string $accompanyingPeriodLabel = '';
 
     /**
+     * @deprecated not in use
      * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
      */
     private int $accompanyingPeriodVisible = self::FIELD_INVISIBLE;
@@ -195,16 +198,21 @@ class ActivityType
 
     /**
      * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     * @Assert\EqualTo(propertyPath="socialIssuesVisible", message="This parameter must be equal to social issue parameter")
      */
     private int $socialActionsVisible = self::FIELD_INVISIBLE;
 
     /**
      * @ORM\Column(type="string", nullable=false, options={"default": ""})
+     *
+     * @deprecated not in use
      */
     private string $socialDataLabel = '';
 
     /**
      * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     *
+     * @deprecated not in use
      */
     private int $socialDataVisible = self::FIELD_INVISIBLE;
 
@@ -260,16 +268,6 @@ class ActivityType
      */
     private int $userVisible = self::FIELD_REQUIRED;
 
-    public function getAccompanyingPeriodLabel(): string
-    {
-        return $this->accompanyingPeriodLabel;
-    }
-
-    public function getAccompanyingPeriodVisible(): int
-    {
-        return $this->accompanyingPeriodVisible;
-    }
-
     /**
      * Get active
      * return true if the type is active.
@@ -446,16 +444,6 @@ class ActivityType
         return $this->socialActionsVisible;
     }
 
-    public function getSocialDataLabel(): string
-    {
-        return $this->socialDataLabel;
-    }
-
-    public function getSocialDataVisible(): int
-    {
-        return $this->socialDataVisible;
-    }
-
     public function getSocialIssuesLabel(): ?string
     {
         return $this->socialIssuesLabel;
@@ -537,20 +525,6 @@ class ActivityType
         return self::FIELD_INVISIBLE !== $this->{$property};
     }
 
-    public function setAccompanyingPeriodLabel(string $accompanyingPeriodLabel): self
-    {
-        $this->accompanyingPeriodLabel = $accompanyingPeriodLabel;
-
-        return $this;
-    }
-
-    public function setAccompanyingPeriodVisible(int $accompanyingPeriodVisible): self
-    {
-        $this->accompanyingPeriodVisible = $accompanyingPeriodVisible;
-
-        return $this;
-    }
-
     /**
      * Set active
      * set to true if the type is active.
@@ -768,20 +742,6 @@ class ActivityType
         return $this;
     }
 
-    public function setSocialDataLabel(string $socialDataLabel): self
-    {
-        $this->socialDataLabel = $socialDataLabel;
-
-        return $this;
-    }
-
-    public function setSocialDataVisible(int $socialDataVisible): self
-    {
-        $this->socialDataVisible = $socialDataVisible;
-
-        return $this;
-    }
-
     public function setSocialIssuesLabel(string $socialIssuesLabel): self
     {
         $this->socialIssuesLabel = $socialIssuesLabel;

src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php

@@ -56,7 +56,7 @@ class ActivityTypeType extends AbstractType
             'persons', 'user', 'date', 'place', 'persons',
             'thirdParties', 'durationTime', 'travelTime', 'attendee',
             'reasons', 'comment', 'sentReceived', 'documents',
-            'emergency', 'accompanyingPeriod', 'socialData', 'users',
+            'emergency', 'socialIssues', 'socialActions', 'users',
         ];
 
         foreach ($fields as $field) {

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue

@@ -1,7 +1,7 @@
 <template>
-   <concerned-groups></concerned-groups>
-   <social-issues-acc></social-issues-acc>
-   <location></location>
+   <concerned-groups v-if="hasPerson"></concerned-groups>
+   <social-issues-acc v-if="hasSocialIssues"></social-issues-acc>
+   <location v-if="hasLocation"></location>
 </template>
 
 <script>
@@ -11,6 +11,7 @@ import Location from './components/Location.vue';
 
 export default {
    name: "App",
+    props: ['hasSocialIssues', 'hasLocation', 'hasPerson'],
    components: {
       ConcernedGroups,
       SocialIssuesAcc,

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/api.js

@@ -1,4 +1,5 @@
 import { getSocialIssues } from 'ChillPersonAssets/vuejs/AccompanyingCourse/api.js';
+import { fetchResults } from 'ChillMainAssets/lib/api/apiMethods';
 
 /*
 *  Load socialActions by socialIssue (id)
@@ -12,33 +13,20 @@ const getSocialActionByIssue = (id) => {
       });
 };
 
-/*
-*   Load Locations
- */
-const getLocations = () => {
-    const url = `/api/1.0/main/location.json`;
-    return fetch(url)
-        .then(response => {
-            if (response.ok) { return response.json(); }
-            throw Error('Error with request resource response');
-        });
-};
+const getLocations = () => fetchResults('/api/1.0/main/location.json');
+
+const getLocationTypes = () => fetchResults('/api/1.0/main/location-type.json');
 
 /*
-*   Load Location Types
+*   Load Location Type by defaultFor
+*   @param {string} entity - can be "person" or "thirdparty"
  */
-const getLocationTypes = () => {
-    const url = `/api/1.0/main/location-type.json`;
-    return fetch(url)
-        .then(response => {
-            if (response.ok) { return response.json(); }
-            throw Error('Error with request resource response');
-        });
+const getLocationTypeByDefaultFor = (entity) => {
+    return getLocationTypes().then(results =>
+        results.filter(t => t.defaultFor === entity)[0]
+    );
 };
 
-/*
-*   Post a Location
- */
 const postLocation = (body) => {
     const url = `/api/1.0/main/location.json`;
     return fetch(url, {
@@ -59,5 +47,6 @@ export {
    getSocialActionByIssue,
    getLocations,
    getLocationTypes,
+   getLocationTypeByDefaultFor,
    postLocation
 };

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue

@@ -2,10 +2,9 @@
     <teleport to="#location">
         <div class="mb-3 row">
             <label class="col-form-label col-sm-4">
-                {{ $t('activity.location') }}
+                {{ $t("activity.location") }}
             </label>
             <div class="col-sm-8">
-
                 <VueMultiselect
                     name="selectLocation"
                     id="selectLocation"
@@ -17,7 +16,10 @@
                     :placeholder="$t('activity.choose_location')"
                     :custom-label="customLabel"
                     :options="locations"
-                    v-model="location">
+                    group-values="locations"
+                    group-label="locationGroup"
+                    v-model="location"
+                >
                 </VueMultiselect>
 
                 <new-location v-bind:locations="locations"></new-location>
@@ -27,49 +29,146 @@
 </template>
 
 <script>
-import { mapState } from "vuex";
-import VueMultiselect from 'vue-multiselect';
-import NewLocation from './Location/NewLocation.vue';
-import { getLocations } from '../api.js';
+import { mapState, mapGetters } from "vuex";
+import VueMultiselect from "vue-multiselect";
+import NewLocation from "./Location/NewLocation.vue";
+import { getLocations, getLocationTypeByDefaultFor } from "../api.js";
 
 export default {
     name: "Location",
     components: {
         NewLocation,
-        VueMultiselect
+        VueMultiselect,
     },
     data() {
         return {
-            locations: []
-        }
+            locations: [],
+        };
     },
     computed: {
-        ...mapState(['activity']),
+        ...mapState(["activity"]),
+        ...mapGetters(["suggestedEntities"]),
         location: {
             get() {
                 return this.activity.location;
             },
             set(value) {
-                this.$store.dispatch('updateLocation', value);
-            }
-        }
+                this.$store.dispatch("updateLocation", value);
+            },
+        },
     },
     mounted() {
-        getLocations().then(response => new Promise(resolve => {
-            console.log('getLocations', response);
-            this.locations = response.results;
-            if (window.default_location_id) {
-                let location = this.locations.filter(l => l.id === window.default_location_id);
-                this.$store.dispatch('updateLocation', location);
-            }
-            resolve();
-        }))
+        getLocations().then(
+            (results) => {
+                getLocationTypeByDefaultFor('person').then(
+                    (personLocationType) => {
+                        if (personLocationType) {
+                            const personLocation = this.makeAccompanyingPeriodLocation(personLocationType);
+                            const concernedPersonsLocation =
+                                this.makeConcernedPersonsLocation(personLocationType);
+                            getLocationTypeByDefaultFor('thirdparty').then(
+                                thirdpartyLocationType => {
+                                    const concernedThirdPartiesLocation =
+                                        this.makeConcernedThirdPartiesLocation(thirdpartyLocationType);
+                                    this.locations = [
+                                        {
+                                            locationGroup: 'Localisation du parcours',
+                                            locations: [personLocation]
+                                        },
+                                        {
+                                            locationGroup: 'Parties concernées',
+                                            locations: [...concernedPersonsLocation, ...concernedThirdPartiesLocation]
+                                        },
+                                        {
+                                            locationGroup: 'Autres localisations',
+                                            locations: results
+                                        }
+                                    ];
+                                }
+                            )
+                        } else {
+                            this.locations = [
+                                {
+                                    locationGroup: 'Localisations',
+                                    locations: response.results
+                                }
+                            ];
+                        }
+                        if (window.default_location_id) {
+                            let location = this.locations.filter(
+                                (l) => l.id === window.default_location_id
+                            );
+                            this.$store.dispatch("updateLocation", location);
+                        }
+                    }
+                )
+            })
     },
     methods: {
+        labelAccompanyingCourseLocation(value) {
+            return `${value.address.text} (${value.locationType.title.fr})`
+        },
         customLabel(value) {
-            return `${value.locationType.title.fr} ${value.name ? value.name : ''}`;
+            return value.locationType
+                ? value.name
+                    ? value.name === '__AccompanyingCourseLocation__'
+                        ? this.labelAccompanyingCourseLocation(value)
+                        : `${value.name} (${value.locationType.title.fr})`
+                    : value.locationType.title.fr
+                : '';
+        },
+        makeConcernedPersonsLocation(locationType) {
+            let locations = [];
+            this.suggestedEntities.forEach(
+                (e) => {
+                    if (e.type === 'person' && e.current_household_address !== null){
+                        locations.push({
+                            type: 'location',
+                            id: -this.suggestedEntities.indexOf(e)*10,
+                            onthefly: true,
+                            name: e.text,
+                            address: {
+                                id: e.current_household_address.address_id,
+                            },
+                            locationType: locationType
+                        });
+                    }
+                }
+            )
+            return locations;
+        },
+        makeConcernedThirdPartiesLocation(locationType) {
+            let locations = [];
+            this.suggestedEntities.forEach(
+                (e) => {
+                    if (e.type === 'thirdparty' && e.address !== null){
+                        locations.push({
+                            type: 'location',
+                            id: -this.suggestedEntities.indexOf(e)*10,
+                            onthefly: true,
+                            name: e.text,
+                            address: { id: e.address.address_id },
+                            locationType: locationType
+                        });
+                    }
+                }
+            )
+            return locations;
+        },
+        makeAccompanyingPeriodLocation(locationType) {
+            const accPeriodLocation = this.activity.accompanyingPeriod.location;
+            return {
+                type: 'location',
+                id: -1,
+                onthefly: true,
+                name: '__AccompanyingCourseLocation__',
+                address: {
+                    id: accPeriodLocation.address_id,
+                    text: `${accPeriodLocation.text} - ${accPeriodLocation.postcode.code} ${accPeriodLocation.postcode.name}`
+                },
+                locationType: locationType
+            }
         }
-    }
-}
-
+    },
+};
 </script>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue

@@ -214,11 +214,9 @@ export default {
             return cond;
         },
         getLocationTypesList() {
-            getLocationTypes().then(response => new Promise(resolve => {
-                console.log('getLocationTypes', response);
-                this.locationTypes = response.results.filter(t => t.availableForUsers === true);
-                resolve();
-            }))
+            getLocationTypes().then(results => {
+                this.locationTypes = results.filter(t => t.availableForUsers === true);
+            })
         },
         openModal() {
             this.modal.showModal = true;
@@ -247,7 +245,6 @@ export default {
                 postLocation(body)
                     .then(
                         location => new Promise(resolve => {
-                            console.log('postLocation', location);
                             this.locations.push(location);
                             this.$store.dispatch('updateLocation', location);
                             resolve();

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/index.js

@@ -7,8 +7,19 @@ import App from './App.vue';
 
 const i18n = _createI18n(activityMessages);
 
+const hasSocialIssues = document.querySelector('#social-issues-acc') !== null;
+const hasLocation = document.querySelector('#location') !== null;
+const hasPerson = document.querySelector('#add-persons') !== null;
+
 const app = createApp({
-   template: `<app></app>`,
+   template: `<app :hasSocialIssues="hasSocialIssues", :hasLocation="hasLocation", :hasPerson="hasPerson"></app>`,
+    data() {
+       return {
+           hasSocialIssues,
+           hasLocation,
+           hasPerson,
+       };
+    }
 })
 .use(store)
 .use(i18n)

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js

@@ -1,5 +1,6 @@
 import 'es6-promise/auto';
 import { createStore } from 'vuex';
+import { postLocation } from './api';
 
 const debug = process.env.NODE_ENV !== 'production';
 //console.log('window.activity', window.activity);
@@ -27,7 +28,6 @@ const store = createStore({
     },
     getters: {
         suggestedEntities(state) {
-            console.log(state.activity);
             if (typeof state.activity.accompanyingPeriod === "undefined") {
                 return [];
             }
@@ -303,7 +303,33 @@ const store = createStore({
             let hiddenLocation = document.getElementById(
                 "chill_activitybundle_activity_location"
             );
-            hiddenLocation.value = value.id;
+            if (value.onthefly) {
+                const body = {
+                    "type": "location",
+                    "name": value.name === '__AccompanyingCourseLocation__' ? null : value.name,
+                    "locationType": {
+                        "id": value.locationType.id,
+                        "type": "location-type"
+                    }
+                };
+                if (value.address.id) {
+                    Object.assign(body, {
+                        "address": {
+                            "id": value.address.id
+                        },
+                    })
+                }
+                postLocation(body)
+                    .then(
+                        location => hiddenLocation.value = location.id
+                    ).catch(
+                        err => {
+                            console.log(err.message);
+                        }
+                    );
+            } else {
+                hiddenLocation.value = value.id;
+            }
             commit("updateLocation", value);
         },
     },

src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig

@@ -28,7 +28,9 @@
     {{ form_row(edit_form.socialActions) }}
 {% endif %}
 
+{%- if edit_form.socialIssues is defined or edit_form.socialIssues is defined -%}
 <div id="social-issues-acc"></div>
+{% endif %}
 
 {%- if edit_form.reasons is defined -%}
     {{ form_row(edit_form.reasons) }}
@@ -46,9 +48,10 @@
     {%- if edit_form.users is defined -%}
         {{ form_widget(edit_form.users) }}
     {% endif %}
+
+    <div id="add-persons"></div>
 {% endif %}
 
-<div id="add-persons"></div>
 
 <h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
 

src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig

@@ -3,7 +3,6 @@
     {% if activities|length == 0 %}
         <p class="chill-no-data-statement">
             {{ "There isn't any activities."|trans }}
-            <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-sm btn-create"></a>
         </p>
 
     {% else %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig

@@ -36,12 +36,14 @@
 
     {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'person'} %}
 
+    {% if is_granted('CHILL_ACTIVITY_CREATE', person) %}
     <ul class="record_actions sticky-form-buttons">
         <li>
             <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}"
-               class="btn btn-create disabled" tabindex="-1" role="button" aria-disabled="true">{{ 'Add a new activity' | trans }}
+               class="btn btn-create" tabindex="-1" role="button" aria-disabled="true">{{ 'Create'|trans }}
             </a>
         </li>
     </ul>
+    {% endif %}
 
 {% endblock %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig

@@ -29,25 +29,29 @@
     {{ form_row(form.socialActions) }}
 {% endif %}
 
-<div id="social-issues-acc"></div>
+{%- if edit_form.socialIssues is defined or edit_form.socialIssues is defined -%}
+    <div id="social-issues-acc"></div>
+{% endif %}
 
 {%- if form.reasons is defined -%}
     {{ form_row(form.reasons) }}
 {% endif %}
 
-<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
+{%- if edit_form.persons is defined or edit_form.thirdParties is defined or edit_form.users is defined -%}
+    <h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
 
-{%- if form.persons is defined -%}
-    {{ form_widget(form.persons) }}
+    {%- if form.persons is defined -%}
+        {{ form_widget(form.persons) }}
+    {% endif %}
+    {%- if form.thirdParties is defined -%}
+        {{ form_widget(form.thirdParties) }}
+    {% endif %}
+    {%- if form.users is defined -%}
+        {{ form_widget(form.users) }}
+    {% endif %}
+        <div id="add-persons"></div>
+    {% endif %}
 {% endif %}
-{%- if form.thirdParties is defined -%}
-    {{ form_widget(form.thirdParties) }}
-{% endif %}
-{%- if form.users is defined -%}
-    {{ form_widget(form.users) }}
-{% endif %}
-
-<div id="add-persons"></div>
 
 <h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
 

src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig

@@ -22,7 +22,7 @@
             '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
         });
         window.activity = {{ activity_json|json_encode|raw }};
-        window.default_location_id = {{ default_location_id }};
+        {% if default_location is not null %}window.default_location_id = {{ default_location.id }}{% endif %};
     </script>
     {{ encore_entry_script_tags('vue_activity') }}
 {% endblock %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig

@@ -27,7 +27,7 @@
       <dt class="inline">{{ 'Social issues'|trans }}</dt>
       <dd>
         {% if entity.socialIssues|length == 0 %}
-          <p class="chill-no-data-statement">{{ 'Any social issues'|trans }}</p>
+          <p class="chill-no-data-statement">{{ 'No social issues associated'|trans }}</p>
         {% else %}
           {% for si in entity.socialIssues %}{{ si|chill_entity_render_box }}{% endfor %}
         {% endif %}
@@ -38,7 +38,7 @@
       <dt class="inline">{{ 'Social actions'|trans }}</dt>
       <dd>
         {% if entity.socialActions|length == 0 %}
-          <p class="chill-no-data-statement">{{ 'Any social actions'|trans }}</p>
+          <p class="chill-no-data-statement">{{ 'No social actions associated'|trans }}</p>
         {% else %}
           {% for sa in entity.socialActions %}{{ sa|chill_entity_render_box }}{% endfor %}
         {% endif %}
@@ -67,8 +67,8 @@
         <dd>
             {% if entity.location is not null %}
                 <p>
-                    <span>{{ entity.location.locationType.title|localize_translatable_string }}</span>
                     {{ entity.location.name }}
+                    <span> ({{ entity.location.locationType.title|localize_translatable_string }})</span>
                 </p>
                 {{ entity.location.address|chill_entity_render_box }}
             {% else %}

src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidity.php

@@ -0,0 +1,42 @@
+<?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.
+ */
+
+namespace Chill\ActivityBundle\Validator\Constraints;
+
+use Symfony\Component\Validator\Constraint;
+
+/**
+ * @Annotation
+ */
+class ActivityValidity extends Constraint
+{
+    public const IS_REQUIRED_MESSAGE = ' is required';
+
+    public const ROOT_MESSAGE = 'For this type of activity, ';
+
+    public $noPersonsMessage = 'For this type of activity, you must add at least one person';
+
+    public $noThirdPartiesMessage = 'For this type of activity, you must add at least one third party';
+
+    public $noUsersMessage = 'For this type of activity, you must add at least one user';
+
+    public $socialActionsMessage = 'For this type of activity, you must add at least one social action';
+
+    public $socialIssuesMessage = 'For this type of activity, you must add at least one social issue';
+
+    public function getTargets()
+    {
+        return self::CLASS_CONSTRAINT;
+    }
+
+    public function makeIsRequiredMessage(string $property)
+    {
+        return self::ROOT_MESSAGE . $property . self::IS_REQUIRED_MESSAGE;
+    }
+}

src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidityValidator.php

@@ -0,0 +1,126 @@
+<?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.
+ */
+
+namespace Chill\ActivityBundle\Validator\Constraints;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+use Symfony\Component\Validator\Exception\UnexpectedValueException;
+
+class ActivityValidityValidator extends ConstraintValidator
+{
+    public function validate($activity, Constraint $constraint)
+    {
+        if (!$constraint instanceof ActivityValidity) {
+            throw new UnexpectedTypeException($constraint, ActivityValidity::class);
+        }
+
+        if (!$activity instanceof Activity) {
+            throw new UnexpectedValueException($activity, Activity::class);
+        }
+
+        if ($activity->getActivityType()->getPersonsVisible() === 2 && count($activity->getPersons()) === 0) {
+            $this->context
+                ->buildViolation($constraint->noPersonsMessage)
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getUsersVisible() === 2 && count($activity->getUsers()) === 0) {
+            $this->context
+                ->buildViolation($constraint->noUsersMessage)
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getThirdPartiesVisible() === 2 && count($activity->getThirdParties()) === 0) {
+            $this->context
+                ->buildViolation($constraint->noThirdPartiesMessage)
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getUserVisible() === 2 && null === $activity->getUser()) {
+            $this->context
+                ->buildViolation($constraint->makeIsRequiredMessage('user'))
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getDateVisible() === 2 && null === $activity->getDate()) {
+            $this->context
+                ->buildViolation($constraint->makeIsRequiredMessage('date'))
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getLocationVisible() === 2 && null === $activity->getLocation()) {
+            $this->context
+                ->buildViolation($constraint->makeIsRequiredMessage('location'))
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getDurationTimeVisible() === 2 && null === $activity->getDurationTime()) {
+            $this->context
+                ->buildViolation($constraint->makeIsRequiredMessage('duration time'))
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getTravelTimeVisible() === 2 && null === $activity->getTravelTime()) {
+            $this->context
+                ->buildViolation($constraint->makeIsRequiredMessage('travel time'))
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getAttendeeVisible() === 2 && null === $activity->getAttendee()) {
+            $this->context
+                ->buildViolation($constraint->makeIsRequiredMessage('attendee'))
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getReasonsVisible() === 2 && null === $activity->getReasons()) {
+            $this->context
+                ->buildViolation($constraint->makeIsRequiredMessage('reasons'))
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getCommentVisible() === 2 && null === $activity->getComment()) {
+            $this->context
+                ->buildViolation($constraint->makeIsRequiredMessage('comment'))
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getSentReceivedVisible() === 2 && null === $activity->getSentReceived()) {
+            $this->context
+                ->buildViolation($constraint->makeIsRequiredMessage('sent/received'))
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getDocumentsVisible() === 2 && null === $activity->getDocuments()) {
+            $this->context
+                ->buildViolation($constraint->makeIsRequiredMessage('document'))
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getEmergencyVisible() === 2 && null === $activity->getEmergency()) {
+            $this->context
+                ->buildViolation($constraint->makeIsRequiredMessage('emergency'))
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getSocialIssuesVisible() === 2 && $activity->getSocialIssues()->count() === 0) {
+            $this->context
+                ->buildViolation($constraint->socialIssuesMessage)
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getSocialActionsVisible() === 2 && $activity->getSocialActions()->count() === 0) {
+            $this->context
+                ->buildViolation($constraint->socialActionsMessage)
+                ->addViolation();
+        }
+    }
+}

src/Bundle/ChillActivityBundle/config/services.yaml

@@ -27,3 +27,8 @@ services:
 
     Chill\ActivityBundle\Repository\:
         resource: '../Repository/'
+
+    Chill\ActivityBundle\Validator\Constraints\:
+        autowire: true
+        autoconfigure: true
+        resource: '../Validator/Constraints/'

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

@@ -43,6 +43,7 @@ Sent: Envoyer
 Received: Recevoir
 by: 'Par '
 location: Lieu
+Reasons: Sujets
 
 
 #forms
@@ -139,34 +140,40 @@ ActivityReasonCategory is inactive and won't be proposed: La catégorie est inac
 # activity type type admin
 ActivityType list: Types d'activités
 Create a new activity type: Créer un nouveau type d'activité
-Persons visible: Visibilté du champ Personnes
+Persons visible: Visibilité du champ Personnes
 Persons label: Libellé du champ Personnes
-User visible: Visibilté du champ Utilisateur
+User visible: Visibilité du champ Utilisateur
 User label: Libellé du champ Utilisateur
-Date visible: Visibilté du champ Date
+Date visible: Visibilité du champ Date
 Date label: Libellé du champ Date
-Place visible: Visibilté du champ Lieu
+Place visible: Visibilité du champ Lieu
 Place label: Libellé du champ Lieu
-Third parties visible: Visibilté du champ Tiers
+Third parties visible: Visibilité du champ Tiers
 Third parties label: Libellé du champ Tiers
-Duration time visible: Visibilté du champ Durée
+Duration time visible: Visibilité du champ Durée
 Duration time label: Libellé du champ Durée
-Travel time visible: Visibilté du champ Durée de déplacement
+Travel time visible: Visibilité du champ Durée de déplacement
 Travel time label: Libellé du champ Durée de déplacement
-Attendee visible: Visibilté du champ Présence de l'usager
+Attendee visible: Visibilité du champ Présence de l'usager
 Attendee label: Libellé du champ Présence de l'usager
-Reasons visible: Visibilté du champ Sujet
+Reasons visible: Visibilité du champ Sujet
 Reasons label: Libellé du champ Sujet
-Comment visible: Visibilté du champ Commentaire
+Comment visible: Visibilité du champ Commentaire
 Comment label: Libellé du champ Commentaire
-Emergency visible: Visibilté du champ Urgent
+Emergency visible: Visibilité du champ Urgent
 Emergency label: Libellé du champ Urgent
-Accompanying period visible: Visibilté du champ Période d'accompagnement
+Accompanying period visible: Visibilité du champ Période d'accompagnement
 Accompanying period label: Libellé du champ Période d'accompagnement
-Social data visible: Visibilté du champ Données sociales
-Social data label: Libellé du champ Données sociales
-Users visible: Visibilté du champ Utilisateurs
+Social issues visible: Visibilité du champ Problématiques sociales
+Social issues label: Libellé du champ Problématiques sociales
+Social actions visible: Visibilité du champ Action sociale
+Social actions label: Libellé du champ Action sociale
+Users visible: Visibilité du champ Utilisateurs
 Users label: Libellé du champ Utilisateurs
+Sent received visible: Visibilité du champ Entrant / Sortant
+Sent received label: Libellé du champ Entrant / Sortant
+Documents visible: Visibilité du champ Documents
+Documents label: Libellé du champ Documents
 
 # activity type category admin
 ActivityTypeCategory list: Liste des catégories des types d'activité

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

@@ -1,2 +1,22 @@
 The reasons's level should not be empty: Le niveau du sujet ne peut pas être vide
 At least one reason must be choosen: Au moins un sujet doit être choisi
+For this type of activity, you must add at least one person: Pour ce type d'activité, vous devez ajouter au moins un usager
+For this type of activity, you must add at least one user: Pour ce type d'activité, vous devez ajouter au moins un utilisateur
+For this type of activity, you must add at least one third party: Pour ce type d'activité, vous devez ajouter au moins un tiers
+For this type of activity, user is required: Pour ce type d'activité, l'utilisateur est requis
+For this type of activity, date is required: Pour ce type d'activité, la date est requise
+For this type of activity, location is required: Pour ce type d'activité, la localisation est requise
+For this type of activity, attendee is required: Pour ce type d'activité, le champ "Présence de la personne" est requis
+For this type of activity, duration time is required: Pour ce type d'activité, la durée est requise
+For this type of activity, travel time is required: Pour ce type d'activité, la durée du trajet est requise
+For this type of activity, reasons is required: Pour ce type d'activité, le champ "sujet" est requis
+For this type of activity, comment is required: Pour ce type d'activité, un commentaire est requis
+For this type of activity, sent/received is required: Pour ce type d'activité, le champ Entrant/Sortant est requis
+For this type of activity, document is required: Pour ce type d'activité, un document est requis
+For this type of activity, emergency is required: Pour ce type d'activité, le champ "Urgent" est requis
+For this type of activity, accompanying period is required: Pour ce type d'activité, le parcours d'accompagnement est requis
+For this type of activity, you must add at least one social issue: Pour ce type d'activité, vous devez ajouter au moins une problématique sociale
+For this type of activity, you must add at least one social action: Pour ce type d'activité, vous devez indiquez au moins une action sociale
+
+# admin
+This parameter must be equal to social issue parameter: Ce paramètre doit être égal au paramètre "Visibilité du champs Problématiques sociales"

src/Bundle/ChillCalendarBundle/Controller/CalendarController.php

@@ -332,12 +332,12 @@ class CalendarController extends AbstractController
 
         $personsId = array_map(
             static fn (Person $p): int => $p->getId(),
-            $entity->getPersons()
+            $entity->getPersons()->toArray()
         );
 
         $professionalsId = array_map(
             static fn (ThirdParty $thirdParty): ?int => $thirdParty->getId(),
-            $entity->getProfessionals()
+            $entity->getProfessionals()->toArray()
         );
 
         $durationTime = $entity->getEndDate()->diff($entity->getStartDate());

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store.js

@@ -1,5 +1,6 @@
 import 'es6-promise/auto';
 import { createStore } from 'vuex';
+import { postLocation } from 'ChillActivityAssets/vuejs/Activity/api';
 
 const debug = process.env.NODE_ENV !== 'production';
 
@@ -33,7 +34,6 @@ const store = createStore({
    },
    getters: {
       suggestedEntities(state) {
-         console.log(state.activity)
          if (typeof(state.activity.accompanyingPeriod) === 'undefined') {
            return [];
          }
@@ -189,8 +189,35 @@ const store = createStore({
       updateLocation({ commit }, value) {
          console.log('### action: updateLocation', value);
          let hiddenLocation = document.getElementById("chill_calendarbundle_calendar_location");
-         hiddenLocation.value = value.id;
-         commit('updateLocation', value);
+         if (value.onthefly) {
+             const body = {
+                 "type": "location",
+                 "name": value.name === '__AccompanyingCourseLocation__' ? null : value.name,
+                 "locationType": {
+                     "id": value.locationType.id,
+                     "type": "location-type"
+                 }
+             };
+             if (value.address.id) {
+                 Object.assign(body, {
+                     "address": {
+                         "id": value.address.id
+                     },
+                 })
+             }
+             postLocation(body)
+                 .then(
+                     location => hiddenLocation.value = location.id
+                 ).catch(
+                     err => {
+                         console.log(err.message);
+                     }
+                 );
+         } else {
+             hiddenLocation.value = value.id;
+         }
+         commit("updateLocation", value);
+
       }
 
   }

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig

@@ -41,8 +41,8 @@
     <dd>
         {% if entity.location is not null %}
             <p>
-                <span>{{ entity.location.locationType.title|localize_translatable_string }}</span>
                 {{ entity.location.name }}
+                <span> ({{ entity.location.locationType.title|localize_translatable_string }})</span>
             </p>
             {{ entity.location.address|chill_entity_render_box }}
         {% else %}

src/Bundle/ChillMainBundle/Controller/LocationApiController.php

@@ -10,8 +10,6 @@
 namespace Chill\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
-use DateInterval;
-use DateTime;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -21,22 +19,11 @@ class LocationApiController extends ApiController
 {
     public function customizeQuery(string $action, Request $request, $query): void
     {
-        $query->andWhere($query->expr()->orX(
-            $query->expr()->andX(
-                $query->expr()->eq('e.createdBy', ':user'),
-                $query->expr()->gte('e.createdAt', ':dateBefore')
-            ),
+        $query->andWhere(
             $query->expr()->andX(
                 $query->expr()->eq('e.availableForUsers', "'TRUE'"),
                 $query->expr()->eq('e.active', "'TRUE'"),
-                $query->expr()->isNotNull('e.name'),
-                $query->expr()->neq('e.name', ':emptyString'),
             )
-        ))
-            ->setParameters([
-                'user' => $this->getUser(),
-                'dateBefore' => (new DateTime())->sub(new DateInterval('P6M')),
-                'emptyString' => '',
-            ]);
+        );
     }
 }

src/Bundle/ChillMainBundle/Controller/PermissionApiController.php

@@ -0,0 +1,80 @@
+<?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.
+ */
+
+namespace Chill\MainBundle\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use function array_key_exists;
+use function json_decode;
+
+class PermissionApiController extends AbstractController
+{
+    private DenormalizerInterface $denormalizer;
+
+    private Security $security;
+
+    public function __construct(
+        DenormalizerInterface $denormalizer,
+        Security $security
+    ) {
+        $this->denormalizer = $denormalizer;
+        $this->security = $security;
+    }
+
+    /**
+     * @Route("/api/1.0/main/permissions/info.json", methods={"POST"})
+     *
+     * @throws \Symfony\Component\Serializer\Exception\ExceptionInterface
+     */
+    public function getPermissions(Request $request): JsonResponse
+    {
+        $this->denyAccessUnlessGranted('ROLE_USER');
+
+        $data = json_decode($request->getContent(), true);
+
+        if (null === $data) {
+            throw new BadRequestHttpException(sprintf(
+                'Could not decode json received, or data invalid: %s, %s',
+                json_last_error(),
+                json_last_error_msg()
+            ));
+        }
+
+        if (!array_key_exists('object', $data)) {
+            throw new BadRequestHttpException('the object key is not present');
+        }
+
+        if (!array_key_exists('class', $data)) {
+            throw new BadRequestHttpException('the class key is not present');
+        }
+
+        if (null !== $data['object']) {
+            $object = $this->denormalizer->denormalize($data['object'], $data['class'], 'json');
+        } else {
+            $object = null;
+        }
+        $roles = [];
+
+        foreach (($data['roles'] ?? []) as $role) {
+            $roles[$role] = $this->security->isGranted($role, $object);
+        }
+
+        return $this->json(
+            ['roles' => $roles],
+            200,
+            [],
+        );
+    }
+}

src/Bundle/ChillMainBundle/Entity/LocationType.php

@@ -11,6 +11,7 @@ namespace Chill\MainBundle\Entity;
 
 use Chill\MainBundle\Repository\LocationTypeRepository;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 
@@ -20,9 +21,14 @@ use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
  * @DiscriminatorMap(typeProperty="type", mapping={
  *     "location-type": LocationType::class
  * })
+ * @UniqueEntity({"defaultFor"})
  */
 class LocationType
 {
+    public const DEFAULT_FOR_3PARTY = 'thirdparty';
+
+    public const DEFAULT_FOR_PERSON = 'person';
+
     public const STATUS_NEVER = 'never';
 
     public const STATUS_OPTIONAL = 'optional';
@@ -53,6 +59,12 @@ class LocationType
      */
     private string $contactData = self::STATUS_OPTIONAL;
 
+    /**
+     * @ORM\Column(type="string", nullable=true, length=32, unique=true)
+     * @Serializer\Groups({"read"})
+     */
+    private ?string $defaultFor = null;
+
     /**
      * @ORM\Id
      * @ORM\GeneratedValue
@@ -87,6 +99,11 @@ class LocationType
         return $this->contactData;
     }
 
+    public function getDefaultFor(): ?string
+    {
+        return $this->defaultFor;
+    }
+
     public function getId(): ?int
     {
         return $this->id;
@@ -125,6 +142,13 @@ class LocationType
         return $this;
     }
 
+    public function setDefaultFor(?string $defaultFor): self
+    {
+        $this->defaultFor = $defaultFor;
+
+        return $this;
+    }
+
     public function setTitle(array $title): self
     {
         $this->title = $title;

src/Bundle/ChillMainBundle/Form/LocationTypeType.php

@@ -71,6 +71,18 @@ final class LocationTypeType extends AbstractType
                     ],
                     'expanded' => true,
                 ]
+            )
+            ->add(
+                'defaultFor',
+                ChoiceType::class,
+                [
+                    'choices' => [
+                        'none' => null,
+                        'person' => LocationType::DEFAULT_FOR_PERSON,
+                        'thirdparty' => LocationType::DEFAULT_FOR_3PARTY,
+                    ],
+                    'expanded' => true,
+                ]
             );
     }
 }

src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.js

@@ -0,0 +1,105 @@
+/**
+ * Generic api method that can be adapted to any fetch request
+ */
+ const makeFetch = (method, url, body) => {
+    return fetch(url, {
+        method: method,
+        headers: {
+            'Content-Type': 'application/json;charset=utf-8'
+        },
+        body: (body !== null) ? JSON.stringify(body) : null
+    })
+    .then(response => {
+        if (response.ok) {
+            return response.json();
+        }
+
+        if (response.status === 422) {
+            return response.json().then(response => {
+                throw ValidationException(response)
+            });
+        }
+
+        if (response.status === 403) {
+            return response.json().then(() => {
+                throw AccessException();
+            });
+        }
+
+        throw {
+            name: 'Exception',
+            sta: response.status,
+            txt: response.statusText,
+            err: new Error(),
+            violations: response.body
+        };
+    });
+}
+
+/**
+ * Fetch results with certain parameters
+ */
+const _fetchAction = (page, uri, params) => {
+    const item_per_page = 50;
+    if (params === undefined) {
+        params = {};
+    }
+    let url = uri + '?' + new URLSearchParams({ item_per_page, page, ...params });
+
+    return fetch(url, {
+        method: 'GET',
+        headers: {
+            'Content-Type': 'application/json;charset=utf-8'
+        },
+    }).then(response => {
+        if (response.ok) { return response.json(); }
+        throw Error({ m: response.statusText });
+    });
+};
+
+const fetchResults = async (uri, params) => {
+    let promises = [],
+        page = 1;
+    let firstData = await _fetchAction(page, uri, params);
+
+    promises.push(Promise.resolve(firstData.results));
+
+    if (firstData.pagination.more) {
+        do {
+            page = ++page;
+            promises.push(_fetchAction(page, uri, params).then(r => Promise.resolve(r.results)));
+        } while (page * firstData.pagination.items_per_page < firstData.count)
+    }
+
+    return Promise.all(promises).then(values => values.flat());
+};
+
+const fetchScopes = () => {
+    return fetchResults('/api/1.0/main/scope.json');
+};
+
+
+/**
+ * Error objects to be thrown
+ */
+const ValidationException = (response) => {
+    const error = {};
+    error.name = 'ValidationException';
+    error.violations = response.violations.map((violation) => `${violation.title}`);
+
+    return error;
+}
+
+const AccessException = () => {
+    const error = {};
+    error.name = 'AccessException';
+    error.violations = ['You are no longer permitted to perform this action'];
+
+    return error;
+}
+
+export {
+    makeFetch,
+    fetchResults,
+    fetchScopes
+}

src/Bundle/ChillMainBundle/Resources/public/lib/api/download.js

@@ -1,39 +1,39 @@
 
-const _fetchAction = (page, uri, params) => {
-    const item_per_page = 50;
-    if (params === undefined) {
-        params = {};
-    }
-    let url = uri + '?' + new URLSearchParams({ item_per_page, page, ...params });
+// const _fetchAction = (page, uri, params) => {
+//     const item_per_page = 50;
+//     if (params === undefined) {
+//         params = {};
+//     }
+//     let url = uri + '?' + new URLSearchParams({ item_per_page, page, ...params });
 
-    return fetch(url, {
-        method: 'GET',
-        headers: {
-            'Content-Type': 'application/json;charset=utf-8'
-        },
-    }).then(response => {
-        if (response.ok) { return response.json(); }
-        throw Error({ m: response.statusText });
-    });
-};
+//     return fetch(url, {
+//         method: 'GET',
+//         headers: {
+//             'Content-Type': 'application/json;charset=utf-8'
+//         },
+//     }).then(response => {
+//         if (response.ok) { return response.json(); }
+//         throw Error({ m: response.statusText });
+//     });
+// };
 
-const fetchResults = async (uri, params) => {
-    let promises = [],
-        page = 1;
-    let firstData = await _fetchAction(page, uri, params);
+// const fetchResults = async (uri, params) => {
+//     let promises = [],
+//         page = 1;
+//     let firstData = await _fetchAction(page, uri, params);
 
-    promises.push(Promise.resolve(firstData.results));
+//     promises.push(Promise.resolve(firstData.results));
 
-    if (firstData.pagination.more) {
-        do {
-            page = ++page;
-            promises.push(_fetchAction(page, uri, params).then(r => Promise.resolve(r.results)));
-        } while (page * firstData.pagination.items_per_page < firstData.count)
-    }
+//     if (firstData.pagination.more) {
+//         do {
+//             page = ++page;
+//             promises.push(_fetchAction(page, uri, params).then(r => Promise.resolve(r.results)));
+//         } while (page * firstData.pagination.items_per_page < firstData.count)
+//     }
 
-    return Promise.all(promises).then(values => values.flat());
-};
+//     return Promise.all(promises).then(values => values.flat());
+// };
 
-export {
-    fetchResults
-};
+// export {
+//     fetchResults
+// };

src/Bundle/ChillMainBundle/Resources/public/lib/api/scope.js

@@ -1,9 +1,9 @@
-import { fetchResults } from 'ChillMainAssets/lib/api/download.js';
+// import { fetchResults } from 'ChillMainAssets/lib/api/download.js';
 
-const fetchScopes = () => {
-  return fetchResults('/api/1.0/main/scope.json');
-};
+// const fetchScopes = () => {
+//   return fetchResults('/api/1.0/main/scope.json');
+// };
 
-export {
-  fetchScopes
-};
+// export {
+//   fetchScopes
+// };

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue

@@ -588,6 +588,12 @@ export default {
             newAddress = Object.assign(newAddress, {
                'point': this.entity.selected.address.point.coordinates
             });
+         } else {
+            if (this.entity.selected.postcode.coordinates) {
+               newAddress = Object.assign(newAddress, {
+                  'point': this.entity.selected.postcode.coordinates
+               });
+            }
          }
 
          // add the address reference, if any

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue

@@ -4,6 +4,10 @@
       <VueMultiselect
          id="addressSelector"
          v-model="value"
+         :placeholder="$t('select_address')"
+         :tag-placeholder="$t('create_address')"
+         :select-label="$t('press_enter_to_select')"
+         :deselect-label="$t('create_address')"
          @search-change="listenInputSearch"
          ref="addressSelector"
          @select="selectAddress"
@@ -14,8 +18,6 @@
          :taggable="true"
          :multiple="false"
          @tag="addAddress"
-         :placeholder="$t('select_address')"
-         :tagPlaceholder="$t('create_address')"
          :options="addresses">
       </VueMultiselect>
    </div>
@@ -141,7 +143,6 @@ export default {
          }
       },
       addAddress() {
-         console.log('addAddress: pass here ?? never, it seems');
          this.entity.selected.writeNew.address = true;
       }
    }

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue

@@ -12,6 +12,8 @@
          label="value"
          :custom-label="transName"
          :placeholder="$t('select_city')"
+         :select-label="$t('press_enter_to_select')"
+         :deselect-label="$t('create_postal_code')"
          :taggable="true"
          :multiple="false"
          @tag="addPostcode"
@@ -101,6 +103,7 @@ export default {
          this.entity.selected.city = value;
          this.entity.selected.postcode.name = value.name;
          this.entity.selected.postcode.code = value.code;
+         this.entity.selected.postcode.coordinates = value.center.coordinates;
          this.entity.selected.writeNew.postcode = false;
          console.log('writeNew.postcode false, in selectCity');
          this.$emit('getReferenceAddresses', value);

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue

@@ -9,6 +9,8 @@
          v-bind:placeholder="$t('select_country')"
          v-bind:options="sortedCountries"
          v-model="value"
+         :select-label="$t('press_enter_to_select')"
+         :deselect-label="$t('press_enter_to_remove')"
          @select="selectCountry">
       </VueMultiselect>
    </div>

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

@@ -1,5 +1,7 @@
 const addressMessages = {
     fr: {
+        press_enter_to_select: 'Appuyer sur Entrée pour sélectionner',
+        press_enter_to_remove: 'Appuyer sur Entrée pour désélectionner',
         add_an_address_title: 'Créer une adresse',
         edit_an_address_title: 'Modifier une adresse',
         create_a_new_address: 'Créer une nouvelle adresse',

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue

@@ -13,7 +13,6 @@ export default {
     methods : {
         toggleBlur: function(e){
             if(e.target.matches('.toggle')){
-                console.log(e);
                 e.target.previousElementSibling.classList.toggle("blur");
                 e.target.classList.toggle("fa-eye");
                 e.target.classList.toggle("fa-eye-slash");

src/Bundle/ChillMainBundle/Resources/views/LocationType/index.html.twig

@@ -11,6 +11,7 @@
 				<th>{{ 'Address required'|trans }}</th>
 				<th>{{ 'Contact data'|trans }}</th>
 				<th>{{ 'Active'|trans }}</th>
+				<th>{{ 'Default for'|trans }}</th>
 			</tr>
 		</thead>
 		<tbody>
@@ -33,6 +34,7 @@
 							<i class="fa fa-square-o"></i>
 						{%- endif -%}
 					</td>
+					<td>{{ entity.defaultFor|trans }}</td>
 					<td>
 						<ul class="record_actions">
 							<li>

src/Bundle/ChillMainBundle/Tests/Controller/PermissionApiControllerTest.php

@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Controller;
+
+use Chill\MainBundle\Test\PrepareClientTrait;
+use DateTime;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+class PermissionApiControllerTest extends WebTestCase
+{
+    use PrepareClientTrait;
+
+    public function testDenormalizingObject()
+    {
+        $client = $this->getClientAuthenticated();
+
+        $client->request(
+            'POST',
+            '/api/1.0/main/permissions/info.json',
+            [], // parameters
+            [], // files
+            [], // server
+            json_encode([
+                'object' => [
+                    'datetime' => '1969-07-09T00:00:00+0100',
+                ],
+                'class' => DateTime::class,
+                'roles' => ['FOO_ROLE'],
+            ])
+        );
+
+        $this->assertResponseIsSuccessful();
+
+        $data = json_decode($client->getResponse()->getContent(), true);
+        $this->assertFalse($data['roles']['FOO_ROLE']);
+    }
+
+    public function testNullObject()
+    {
+        $client = $this->getClientAuthenticated();
+
+        $client->request(
+            'POST',
+            '/api/1.0/main/permissions/info.json',
+            [], // parameters
+            [], // files
+            [], // server
+            json_encode([
+                'object' => null,
+                'class' => null,
+                'roles' => ['ROLE_USER', 'ROLE_ADMIN'],
+            ])
+        );
+
+        $this->assertResponseIsSuccessful();
+
+        $data = json_decode($client->getResponse()->getContent(), true);
+        $this->assertTrue($data['roles']['ROLE_USER']);
+        $this->assertFalse($data['roles']['ROLE_ADMIN']);
+    }
+}

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

@@ -624,3 +624,40 @@ paths:
                 401:
                     description: "Unauthorized"
 
+    /1.0/main/permissions/info.json:
+        post:
+            tags:
+                - permissions
+            summary: Return info about permissions on entity
+            responses:
+                200:
+                    description: "ok"
+                401:
+                    description: "Unauthorized"
+                400:
+                    description: "Bad request"
+            requestBody:
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            type: object
+                            properties:
+                                object:
+                                    type: object
+                                class:
+                                    type: string
+                                roles:
+                                    type: array
+                                    items:
+                                        type: string
+                        examples:
+                            an-accompanying-period:
+                                value:
+                                    object:
+                                        type: accompanying_period
+                                        id: 1
+                                    class: 'Chill\PersonBundle\Entity\AccompanyingPeriod'
+                                    roles:
+                                        - 'CHILL_PERSON_ACCOMPANYING_PERIOD_SEE'
+

src/Bundle/ChillMainBundle/migrations/Version20211123093355.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\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Add defaultFor to LocationType.
+ */
+final class Version20211123093355 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP INDEX UNIQ_A459B5CADD3E4105');
+        $this->addSql('ALTER TABLE chill_main_location_type DROP defaultFor');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Add defaultFor to LocationType';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_location_type ADD defaultFor VARCHAR(32) DEFAULT NULL');
+        $this->addSql('CREATE UNIQUE INDEX UNIQ_A459B5CADD3E4105 ON chill_main_location_type (defaultFor)');
+    }
+}

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

@@ -212,6 +212,10 @@ Location type: Type de localisation
 Phonenumber1: Numéro de téléphone
 Phonenumber2: Autre numéro de téléphone
 Configure location and location type: Configuration des localisations
+Default for: Type de localisation par défaut pour
+none: aucun
+person: usager
+thirdparty: tiers
 
 # circles / scopes
 Choose the circle: Choisir le cercle

src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php

@@ -249,6 +249,22 @@ 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"})
+     */
+    public function toggleConfidentialApi(AccompanyingPeriod $accompanyingCourse, Request $request)
+    {
+        if ($request->getMethod() === 'POST') {
+            $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::CONFIDENTIAL, $accompanyingCourse);
+
+            $accompanyingCourse->setConfidential(!$accompanyingCourse->isConfidential());
+            $this->getDoctrine()->getManager()->flush();
+        }
+
+        return $this->json($accompanyingCourse->isConfidential(), Response::HTTP_OK, [], ['groups' => ['read']]);
+    }
+
     public function workApi($id, Request $request, string $_format): Response
     {
         return $this->addRemoveSomething(

src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php

@@ -213,9 +213,14 @@ class AccompanyingPeriodController extends AbstractController
         ]);
         $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
 
-        $accompanyingPeriods = $this->accompanyingPeriodACLAwareRepository
+        $accompanyingPeriodsRaw = $this->accompanyingPeriodACLAwareRepository
             ->findByPerson($person, AccompanyingPeriodVoter::SEE);
 
+        // filter visible or not visible
+        $accompanyingPeriods = array_filter($accompanyingPeriodsRaw, function (AccompanyingPeriod $ap) {
+            return $this->isGranted(AccompanyingPeriodVoter::SEE, $ap);
+        });
+
         return $this->render('@ChillPerson/AccompanyingPeriod/list.html.twig', [
             'accompanying_periods' => $accompanyingPeriods,
             'person' => $person,

src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php

@@ -378,7 +378,6 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                                 Request::METHOD_DELETE => 'ALWAYS_FAILS',
                             ],
                         ],
-
                         'confirm' => [
                             'methods' => [
                                 Request::METHOD_POST => true,
@@ -389,6 +388,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,
+                            ],
+                        ],
                         'findAccompanyingPeriodsByPerson' => [
                             'path' => '/by-person/{person_id}.{_format}',
                             'controller_action' => 'getAccompanyingPeriodsByPerson',

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php

@@ -49,6 +49,10 @@ use UnexpectedValueException;
  *     "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."
+ * )
  */
 class AccompanyingPeriod implements
     TrackCreationInterface,
@@ -277,7 +281,7 @@ class AccompanyingPeriod implements
      *     inverseJoinColumns={@ORM\JoinColumn(name="scope_id", referencedColumnName="id")}
      * )
      * @Groups({"read"})
-     * @Assert\Count(min=1, groups={AccompanyingPeriod::STEP_CONFIRMED})
+     * @Assert\Count(min=1, groups={AccompanyingPeriod::STEP_CONFIRMED}, minMessage="A course must be associated to at least one scope")
      */
     private $scopes;
 
@@ -289,7 +293,7 @@ class AccompanyingPeriod implements
      *     name="chill_person_accompanying_period_social_issues"
      * )
      * @Groups({"read"})
-     * @Assert\Count(min=1, groups={AccompanyingPeriod::STEP_CONFIRMED})
+     * @Assert\Count(min=1, groups={AccompanyingPeriod::STEP_CONFIRMED}, minMessage="A course must contains at least one social issue")
      */
     private Collection $socialIssues;
 

src/Bundle/ChillPersonBundle/Resources/public/lib/household.js

@@ -1,4 +1,4 @@
-import { fetchResults } from 'ChillMainAssets/lib/api/download.js';
+import { fetchResults } from 'ChillMainAssets/lib/api/apiMethods.js';
 
 const fetchHouseholdByAddressReference = async (reference) => {
   const url = `/api/1.0/person/household/by-address-reference/${reference.id}.json`

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

@@ -59,7 +59,7 @@ export default {
          'accompanyingCourse',
          'addressContext'
       ]),
-   },
+   }
 };
 </script>
 

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

@@ -1,4 +1,4 @@
-import { fetchResults } from 'ChillMainAssets/lib/api/download.js';
+import { fetchResults } from 'ChillMainAssets/lib/api/apiMethods.js';
 
 /*
 * Endpoint v.2 chill_api_single_accompanying_course__entity
@@ -15,44 +15,17 @@ const getAccompanyingCourse = (id) => {
       });
 };
 
-/*
-* Endpoint v.2 chill_api_single_accompanying_course__entity
-* method PATCH, patch AccompanyingCourse Instance
-*
-*  @id     integer - id of accompanyingCourse
-*  @body   Object - dictionary with changes to post
-*/
-const patchAccompanyingCourse = (id, body) => {
-   //console.log('body', body);
-   const url = `/api/1.0/person/accompanying-course/${id}.json`;
-   return fetch(url, {
-         method: 'PATCH',
-         headers: {
-           'Content-Type': 'application/json;charset=utf-8'
-         },
-         body: JSON.stringify(body)
-      })
-      .then(response => {
-         if (response.ok) { return response.json(); }
-          console.log(response);
-         throw { msg: 'Error while updating AccompanyingPeriod Course.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
-      });
+const getUsers = () => {
+   const url = `/api/1.0/main/user.json`;
+
+   return fetchResults(url);
 };
 
-/*
-* Endpoint to change 'DRAFT' step to 'CONFIRMED'
-*/
-const confirmAccompanyingCourse = (id) => {
-   const url = `/api/1.0/person/accompanying-course/${id}/confirm.json`
-   return fetch(url, {
-         method: 'POST',
-         headers: {'Content-Type': 'application/json;charset=utf-8'}
-      })
-      .then(response => {
-         if (response.ok) { return response.json(); }
-         throw { msg: 'Error while confirming AccompanyingPeriod Course.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
-      });
-};
+const getReferrersSuggested = (course) => {
+  const url = `/api/1.0/person/accompanying-course/${course.id}/referrers-suggested.json`;
+
+  return fetchResults(url);
+}
 
 /*
 * Endpoint
@@ -66,115 +39,6 @@ const getSocialIssues = () => {
       });
 };
 
-/*
-* Endpoint v.2 chill_api_single_accompanying_course_participation,
-* method POST/DELETE, add/close a participation to the accompanyingCourse
-*
-*  @id               integer - id of accompanyingCourse
-*  @payload          integer - id of person
-*  @method           string - POST or DELETE
-*/
-const postParticipation = (id, payload, method) => {
-   const body = { type: payload.type, id: payload.id };
-   const url = `/api/1.0/person/accompanying-course/${id}/participation.json`;
-   return fetch(url, {
-         method: method,
-         headers: {
-           'Content-Type': 'application/json;charset=utf-8'
-         },
-         body: JSON.stringify(body)
-      })
-      .then(response => {
-         if (response.ok) { return response.json(); }
-         // TODO: adjust message according to status code? Or how to access the message from the violation array?
-         throw { msg: 'Error while sending AccompanyingPeriod Course participation', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
-      });
-};
-
-/*
-* Endpoint v.2 chill_api_single_accompanying_course_requestor,
-* method POST/DELETE, add/close a requestor to the accompanyingCourse
-*
-*  @id               integer - id of accompanyingCourse
-*  @payload          object of type person|thirdparty
-*  @method           string - POST or DELETE
-*/
-const postRequestor = (id, payload, method) => {
-   //console.log('payload', payload);
-   const body = (payload)? { type: payload.type, id: payload.id } : {};
-   //console.log('body', body);
-   const url = `/api/1.0/person/accompanying-course/${id}/requestor.json`;
-   return fetch(url, {
-         method: method,
-         headers: {
-           'Content-Type': 'application/json;charset=utf-8'
-         },
-         body: JSON.stringify(body)
-      })
-      .then(response => {
-         if (response.ok) { return response.json(); }
-         throw { msg: 'Error while sending AccompanyingPeriod Course requestor', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
-      });
-};
-
-/*
-* Endpoint v.2 chill_api_single_accompanying_course_resource,
-* method POST/DELETE, add/remove a resource to the accompanyingCourse
-*
-*  @id               integer - id of accompanyingCourse
-*  @payload          object of type person|thirdparty
-*  @method           string - POST or DELETE
-*/
-const postResource = (id, payload, method) => {
-   //console.log('payload', payload);
-   const body = { type: "accompanying_period_resource" };
-   switch (method) {
-      case 'DELETE':
-         body['id'] = payload.id;
-         break;
-      default:
-         body['resource'] = { type: payload.type, id: payload.id };
-   }
-   //console.log('body', body);
-   const url = `/api/1.0/person/accompanying-course/${id}/resource.json`;
-   return fetch(url, {
-         method: method,
-         headers: {
-           'Content-Type': 'application/json;charset=utf-8'
-         },
-         body: JSON.stringify(body)
-      })
-      .then(response => {
-         if (response.ok) { return response.json(); }
-         throw { msg: 'Error while sending AccompanyingPeriod Course resource.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
-      });
-};
-
-/*
-* Endpoint to Add/remove SocialIssue
-*/
-const postSocialIssue = (id, body, method) => {
-   //console.log('api body and method', body, method);
-   const url = `/api/1.0/person/accompanying-course/${id}/socialissue.json`;
-   return fetch(url, {
-         method: method,
-         headers: {
-           'Content-Type': 'application/json;charset=utf-8'
-         },
-         body: JSON.stringify(body)
-      })
-      .then(response => {
-         if (response.ok) { return response.json(); }
-         throw { msg: 'Error while updating SocialIssue.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
-      });
-};
-
-const getUsers = () => {
-   const url = `/api/1.0/main/user.json`;
-
-   return fetchResults(url);
-};
-
 const whoami = () => {
    const url = `/api/1.0/main/whoami.json`;
    return fetch(url)
@@ -184,74 +48,10 @@ const whoami = () => {
       });
 };
 
-const getListOrigins = () => {
-   const url = `/api/1.0/person/accompanying-period/origin.json`;
-   return fetch(url)
-      .then(response => {
-         if (response.ok) { return response.json(); }
-         throw { msg: 'Error while retriving origin\'s list.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
-      });
-};
-
-const addScope = (id, scope) => {
-  const url = `/api/1.0/person/accompanying-course/${id}/scope.json`;
-  console.log(url);
-  console.log(scope);
-
-  return fetch(url, {
-    method: 'POST',
-    body: JSON.stringify({
-      id: scope.id,
-      type: scope.type,
-    }),
-    headers: {
-      'Content-Type': 'application/json;charset=utf-8'
-    },
-  })
-    .then(response => {
-      if (response.ok) { return response.json(); }
-      throw { msg: 'Error while adding scope', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
-    });
-};
-
-const removeScope = (id, scope) => {
-  const url = `/api/1.0/person/accompanying-course/${id}/scope.json`;
-
-  return fetch(url, {
-    method: 'DELETE',
-    body: JSON.stringify({
-      id: scope.id,
-      type: scope.type,
-    }),
-    headers: {
-      'Content-Type': 'application/json;charset=utf-8'
-    },
-  })
-    .then(response => {
-      if (response.ok) { return response.json(); }
-      throw { msg: 'Error while adding scope', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
-    });
-};
-
-const getReferrersSuggested = (course) => {
-  const url = `/api/1.0/person/accompanying-course/${course.id}/referrers-suggested.json`;
-
-  return fetchResults(url);
-}
-
 export {
-   getAccompanyingCourse,
-   patchAccompanyingCourse,
-   confirmAccompanyingCourse,
-   getSocialIssues,
-   postParticipation,
-   postRequestor,
-   postResource,
-   getUsers,
    whoami,
-   getListOrigins,
-   postSocialIssue,
-   addScope,
-   removeScope,
+   getSocialIssues,
+   getAccompanyingCourse,
+   getUsers,
    getReferrersSuggested,
 };

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

@@ -21,6 +21,7 @@
 
 <script>
 import { mapState } from 'vuex';
+
 export default {
    name: "ToggleFlags",
    computed: {
@@ -28,6 +29,7 @@ export default {
          intensity: state => state.accompanyingCourse.intensity,
          emergency: state => state.accompanyingCourse.emergency,
          confidential: state => state.accompanyingCourse.confidential,
+         permissions: state => state.permissions,
       }),
       isRegular() {
          return (this.intensity === 'regular') ? true : false;
@@ -37,7 +39,7 @@ export default {
       },
       isConfidential() {
          return (this.confidential) ? true : false;
-      }
+      },
    },
    methods: {
       toggleIntensity() {
@@ -53,15 +55,42 @@ export default {
                //temporaire (modif backend)
                value = "occasional";
          }
-         this.$store.dispatch('toggleIntensity', value);
+         this.$store.dispatch('toggleIntensity', value)
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       },
       toggleEmergency() {
-         this.$store.dispatch('toggleEmergency', (!this.isEmergency));
+         this.$store.dispatch('toggleEmergency', (!this.isEmergency))
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       },
       toggleConfidential() {
-         this.$store.dispatch('toggleConfidential', (!this.isConfidential));
-      }
-   }
+         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'})
+             }
+          });
+      },
+   },
 }
 </script>
 

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

@@ -59,7 +59,15 @@ export default {
             locationStatusTo: 'person',
             personId: this.person.id
          };
-         this.$store.dispatch('updateLocation', payload);
+         this.$store.dispatch('updateLocation', payload)
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
+            
          window.location.assign('#section-20');
          this.modal.showModal = false;
       }

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

@@ -83,12 +83,24 @@ export default {
    },
    methods: {
       submitform() {
-        //console.log('submit');
-         this.$store.dispatch('postFirstComment', this.formdata);
+         this.$store.dispatch('postFirstComment', this.formdata)
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       },
       removeComment() {
-        //console.log('remove');
-         this.$store.dispatch('postFirstComment', {});
+         this.$store.dispatch('postFirstComment', {})
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       }
    }
 }

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

@@ -115,9 +115,14 @@ export default {
    },
    methods: {
       confirmCourse() {
-        //console.log('@@ CLICK confirmCourse');
-         this.$store.dispatch('confirmAccompanyingCourse');
-        //console.log('confirm last');
+         this.$store.dispatch('confirmAccompanyingCourse')
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       }
    }
 }

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

@@ -187,7 +187,14 @@ export default {
             locationStatusTo: 'none'
          };
          //console.log('remove address');
-         this.$store.dispatch('updateLocation', payload);
+         this.$store.dispatch('updateLocation', payload)
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       },
       displayErrors() {
          return this.$refs.addAddress.errorMsg;
@@ -195,7 +202,15 @@ export default {
       submitTemporaryAddress(payload) {
          //console.log('@@@ click on Submit Temporary Address Button', payload);
          payload['locationStatusTo'] = 'address'; // <== temporary, not none, not person
-         this.$store.dispatch('updateLocation', payload);
+         this.$store.dispatch('updateLocation', payload)
+            .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.commit('setEditContextTrue', payload);
       }
    },

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

@@ -29,7 +29,7 @@
 
 <script>
 import VueMultiselect from 'vue-multiselect';
-import { getListOrigins } from '../api';
+import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
 import { mapState, mapGetters } from 'vuex';
 
 export default {
@@ -53,14 +53,26 @@ export default {
    },
    methods: {
       getOptions() {
-         getListOrigins().then(response => new Promise((resolve, reject) => {
-            this.options = response.results;
-            resolve();
-         }));
+         const url = `/api/1.0/person/accompanying-period/origin.json`;
+         makeFetch('GET', url)
+            .then(response => {
+               this.options = response.results;
+               return response;
+            })
+            .catch((error) => {
+               commit('catchError', error);
+               this.$toast.open({message: error.txt})
+            })
       },
       updateOrigin(value) {
-         console.log('value', value);
-         this.$store.dispatch('updateOrigin', value);
+         this.$store.dispatch('updateOrigin', value)
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       },
       transText ({ text }) {
          const parsedText = JSON.parse(text);

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

@@ -17,7 +17,7 @@
                <button class="btn btn-update" type="submit">{{ $t('persons_associated.update_household') }}</button>
             </div>
             <p class="mb-3">{{ $t('persons_associated.person_without_household_warning') }}</p>
-            <div class="form-check" v-for="p in participationWithoutHousehold">
+            <div class="form-check" v-for="p in participationWithoutHousehold" :key="p.id">
                <input type="checkbox"
                   class="form-check-input"
                   v-model="hasNoHousehold"
@@ -47,6 +47,14 @@
       </participation-item>
    </div>
 
+   <div v-if="suggestedPersons.length > 0">
+      <ul class="list-suggest add-items">
+         <li v-for="p in suggestedPersons" :key="p.id" @click="addSuggestedPerson(p)">
+             <span>{{ p.text }}</span>
+          </li>
+        </ul>
+   </div>
+
    <div>
       <add-persons
          buttonTitle="persons_associated.add_persons"
@@ -66,8 +74,8 @@
 
 <script>
 import {mapGetters, mapState} from 'vuex';
-import ParticipationItem from "./PersonsAssociated/ParticipationItem.vue"
-import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue'
+import ParticipationItem from "./PersonsAssociated/ParticipationItem.vue";
+import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
 
 export default {
    name: 'PersonsAssociated',
@@ -90,7 +98,28 @@ export default {
    computed: {
       ...mapState({
          courseId: state => state.accompanyingCourse.id,
-         participations: state => state.accompanyingCourse.participations
+         participations: state => state.accompanyingCourse.participations,
+         suggestedPersons: state => [
+            state.accompanyingCourse.requestor,
+            ...state.accompanyingCourse.resources.map(r => r.resource)
+         ]
+         .filter((e) => e !== null)
+         .filter((e) => e.type === 'person')
+         .filter(
+            (p) => !state.accompanyingCourse.participations.filter(pa => pa.endDate === null).map((pa) => pa.person.id).includes(p.id)
+         )
+         // filter persons appearing twice in requestor and resources
+         .filter(
+             (e, index, suggested) => {
+               for (let i = 0; i < suggested.length; i = i+1) {
+                 if (i < index && e.id === suggested[i].id) {
+                   return false
+                 }
+               }
+
+               return true;
+             }
+         )
       }),
       ...mapGetters([
          'isParticipationValid'
@@ -106,26 +135,54 @@ export default {
       },
       getReturnPath() {
          return window.location.pathname + window.location.search + window.location.hash;
-      }
+      },
    },
    methods: {
       removeParticipation(item) {
-        //console.log('@@ CLICK remove participation: item', item);
-         this.$store.dispatch('removeParticipation', item);
+         this.$store.dispatch('removeParticipation', item)
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       },
       closeParticipation(item) {
-        //console.log('@@ CLICK close participation: item', item);
-         this.$store.dispatch('closeParticipation', item);
+         this.$store.dispatch('closeParticipation', item)
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       },
       addNewPersons({ selected, modal }) {
-        //console.log('@@@ CLICK button addNewPersons', selected);
          selected.forEach(function(item) {
-               this.$store.dispatch('addParticipation', item);
+               this.$store.dispatch('addParticipation', item)
+               .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
          );
          this.$refs.addPersons.resetSearch(); // to cast child method
          modal.showModal = false;
-      }
+      },
+      addSuggestedPerson(person) {
+         this.$store.dispatch('addParticipation', { result: person, type: 'person' })
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            })
+      },
    }
 }
 </script>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue

@@ -110,7 +110,14 @@ export default {
       saveFormOnTheFly(payload) {
          console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data);
          payload.target = 'participation';
-         this.$store.dispatch('patchOnTheFly', payload);
+         this.$store.dispatch('patchOnTheFly', payload)
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       }
    }
 }

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

@@ -49,7 +49,7 @@
 
 <script>
 import VueMultiselect from 'vue-multiselect';
-import { getUsers, whoami } from '../api';
+import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
 import { mapState } from 'vuex';
 import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge";
 
@@ -76,14 +76,26 @@ export default {
    methods: {
       updateReferrer(value) {
          //console.log('value', value);
-         this.$store.dispatch('updateReferrer', value);
+         this.$store.dispatch('updateReferrer', value)
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       },
       assignMe() {
-         //console.log('assign me');
-         whoami().then(me => new Promise((resolve, reject) => {
-            this.$store.dispatch('updateReferrer', me);
-            resolve();
-         }));
+         const url = `/api/1.0/main/whoami.json`;
+         makeFetch('GET', url)
+            .then(response => {
+               this.$store.dispatch('updateReferrer', response);
+               return response;
+            })
+            .catch((error) => {
+               commit('catchError', error);
+               this.$toast.open({message: error.body})
+            })
       }
    }
 }

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

@@ -117,12 +117,30 @@
             </ul>
          </template>
       </person-render-box>
+
+      <ul class="record_actions">
+         <li>
+            <button class="btn btn-remove"
+               :title="$t('action.remove')"
+               @click="removeRequestor">
+               {{ $t('action.remove') }}
+            </button>
+         </li>
+      </ul>
    </div>
 
    <div v-else>
       <label class="chill-no-data-statement">{{ $t('requestor.counter') }}</label>
    </div>
 
+   <div v-if="accompanyingCourse.requestor === null && suggestedEntities.length > 0">
+      <ul class="list-suggest add-items">
+         <li v-for="p in suggestedEntities" :key="uniqueId(p)" @click="addSuggestedEntity(p)">
+             <span>{{ p.text }}</span>
+          </li>
+        </ul>
+   </div>
+
    <div>
       <add-persons v-if="accompanyingCourse.requestor === null"
          buttonTitle="requestor.add_requestor"
@@ -143,6 +161,7 @@ import OnTheFly from 'ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue';
 import PersonRenderBox from '../../_components/Entity/PersonRenderBox.vue';
 import ThirdPartyRenderBox from 'ChillThirdPartyAssets/vuejs/_components/Entity/ThirdPartyRenderBox.vue';
 import Confidential from 'ChillMainAssets/vuejs/_components/Confidential.vue';
+import { mapState } from 'vuex';
 
 export default {
    name: 'Requestor',
@@ -167,12 +186,30 @@ export default {
       }
    },
    computed: {
+      ...mapState({
+         suggestedEntities: state => {
+           return [
+               ...state.accompanyingCourse.participations.map(p => p.person),
+               ...state.accompanyingCourse.resources.map(r => r.resource)
+             ]
+               .filter((e) => e !== null)
+               // filter for same entity appearing twice
+               .filter((e, index, suggested) => {
+                 for (let i = 0; i < suggested.length; i = i+1) {
+                   if (i < index && e.id === suggested[i].id && e.type === suggested[i].type) {
+                     return false
+                   }
+                 }
+
+                 return true;
+           })
+         }
+      }),
       accompanyingCourse() {
          return this.$store.state.accompanyingCourse
       },
       isAnonymous: {
          set(value) {
-            //console.log('requestorIsAnonymous value',value);
             this.$store.dispatch('requestorIsAnonymous', value);
          },
          get() {
@@ -183,18 +220,53 @@ export default {
    methods: {
       removeRequestor() {
          //console.log('@@ CLICK remove requestor: item');
-         this.$store.dispatch('removeRequestor');
+         this.$store.dispatch('removeRequestor')
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       },
       addNewPersons({ selected, modal }) {
          //console.log('@@@ CLICK button addNewPersons', selected);
-         this.$store.dispatch('addRequestor', selected.shift());
+         this.$store.dispatch('addRequestor', selected.shift())
+            .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.$refs.addPersons.resetSearch(); // to cast child method
          modal.showModal = false;
       },
       saveFormOnTheFly(payload) {
          console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data);
          payload.target = 'requestor';
-         this.$store.dispatch('patchOnTheFly', payload);
+         this.$store.dispatch('patchOnTheFly', payload)
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
+      },
+      addSuggestedEntity(e) {
+         this.$store.dispatch('addRequestor', { result: e, type: e.type })
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            })
+      },
+      uniqueId(e) {
+         return `${e.type}-${e.id}`;
       }
    }
 }

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

@@ -18,6 +18,15 @@
          @remove="removeResource">
       </resource-item>
    </div>
+
+   <div v-if="suggestedEntities.length > 0">
+      <ul class="list-suggest add-items">
+         <li v-for="p in suggestedEntities" :key="uniqueId(p)" @click="addSuggestedEntity(p)">
+             <span>{{ p.text }}</span>
+          </li>
+        </ul>
+   </div>
+
    <div>
       <add-persons
         buttonTitle="resources.add_resources"
@@ -57,21 +66,79 @@ export default {
    },
    computed: mapState({
       resources: state => state.accompanyingCourse.resources,
-      counter: state => state.accompanyingCourse.resources.length
+      counter: state => state.accompanyingCourse.resources.length,
+      suggestedEntities: state => [
+            state.accompanyingCourse.requestor,
+            ...state.accompanyingCourse.participations.map(p => p.person),
+         ]
+         .filter((e) => e !== null)
+         .filter(
+            (e) => {
+               if (e.type === 'person') {
+                  return !state.accompanyingCourse.resources
+                     .filter((r) => r.resource.type === 'person')
+                     .map((r) => r.resource.id).includes(e.id)
+               }
+               if (e.type === 'thirdparty') {
+                  return !state.accompanyingCourse.resources
+                     .filter((r) => r.resource.type === 'thirdparty')
+                     .map((r) => r.resource.id).includes(e.id)
+               }
+            }
+         )
+          // filter persons appearing twice in requestor and resources
+          .filter(
+              (e, index, suggested) => {
+                for (let i = 0; i < suggested.length; i = i+1) {
+                  if (i < index && e.id === suggested[i].id) {
+                    return false
+                  }
+                }
+
+                return true;
+              }
+          )
    }),
    methods: {
       removeResource(item) {
         //console.log('@@ CLICK remove resource: item', item);
-         this.$store.dispatch('removeResource', item);
+         this.$store.dispatch('removeResource', item)
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       },
       addNewPersons({ selected, modal }) {
         //console.log('@@@ CLICK button addNewPersons', selected);
          selected.forEach(function(item) {
-               this.$store.dispatch('addResource', item);
+               this.$store.dispatch('addResource', item)
+                  .catch(({name, violations}) => {
+                     if (name === 'ValidationException' || name === 'AccessException') {
+                        violations.forEach((violation) => this.$toast.open({message: violation}));
+                     } else {
+                        this.$toast.open({message: violations})
+                     }
+                  });
             }, this
          );
          this.$refs.addPersons.resetSearch(); // to cast child method
          modal.showModal = false;
+      },
+      addSuggestedEntity(e) {
+         this.$store.dispatch('addResource', { result: e, type: e.type})
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            })
+      },
+      uniqueId(e) {
+         return `${e.type}-${e.id}`;
       }
    }
 }

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

@@ -60,7 +60,14 @@ export default {
       saveFormOnTheFly(payload) {
          console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data);
          payload.target = 'resource';
-         this.$store.dispatch('patchOnTheFly', payload);
+         this.$store.dispatch('patchOnTheFly', payload)
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       }
    }
 }

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

@@ -3,8 +3,8 @@
      <h2><a id="section-60"></a>{{ $t('scopes.title') }}</h2>
 
      <div class="mb-4">
-        <div class="form-check" v-for="s in scopes">
-          <input class="form-check-input" type="checkbox" v-model="checkedScopes" :value="s" />
+        <div class="form-check" v-for="s in scopes" :key="s.id">
+          <input class="form-check-input" type="checkbox" v-model="checkedScopes" :value="s"/>
           <label class="form-check-label">
              {{ s.name.fr }}
           </label>
@@ -37,10 +37,22 @@ export default {
         return this.$store.state.accompanyingCourse.scopes;
       },
       set: function(v) {
-        this.$store.dispatch('setScopes', v);
+        this.$store.dispatch('setScopes', v)
+          .catch(({name, violations}) => {
+              if (name === 'ValidationException' || name === 'AccessException') {
+                violations.forEach((violation) => this.$toast.open({message: violation}));
+              } else {
+                this.$toast.open({message: 'An error occurred'})
+              }
+          });
       }
     }
-  }
+  },
+  methods: {
+    restore() {
+      console.log('restore');
+    }
+  },
 }
 </script>
 

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

@@ -30,7 +30,7 @@
 
 <script>
 import VueMultiselect from 'vue-multiselect';
-import { getSocialIssues } from '../api';
+import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
 import {mapGetters, mapState} from 'vuex';
 
 export default {
@@ -54,14 +54,26 @@ export default {
    },
    methods: {
       getOptions() {
-         getSocialIssues().then(response => new Promise((resolve, reject) => {
-            //console.log('get socialIssues', response.results);
-            this.options = response.results;
-            resolve();
-         })).catch(error => this.$store.commit('catchError', error));
+         const url = `/api/1.0/person/social-work/social-issue.json`;
+         makeFetch('GET', url)
+            .then(response => {
+               this.options = response.results;
+               return response;
+            })
+            .catch((error) => {
+               commit('catchError', error);
+               this.$toast.open({message: error.txt})
+            })
       },
       updateSocialIssues(value) {
-         this.$store.dispatch('updateSocialIssues', this.transformValue(value));
+         this.$store.dispatch('updateSocialIssues', this.transformValue(value))
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       },
       transformValue(updated) {
          let stored = this.value;
@@ -70,8 +82,6 @@ export default {
          let method = (typeof removed === 'undefined') ? 'POST' : 'DELETE';
          let changed = (typeof removed === 'undefined') ? added : removed;
          let body = { type: "social_issue", id: changed.id };
-         //console.log('body', body);
-         //console.log('@@@', method, changed.text);
          let payload = updated;
          return { payload, body, method };
       }

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

@@ -2,7 +2,8 @@ import { createApp } from 'vue'
 import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
 import { appMessages } from './js/i18n'
 import { initPromise } from './store'
-
+import VueToast from 'vue-toast-notification';
+import 'vue-toast-notification/dist/theme-sugar.css';
 import App from './App.vue';
 import Banner from './components/Banner.vue';
 
@@ -21,8 +22,14 @@ if (root === 'app') {
       })
       .use(store)
       .use(i18n)
+      .use(VueToast, {
+         position: "top",
+         type: "error",
+         duration: 5000,
+         dismissible: true
+      })
       .component('app', App)
-      .mount('#accompanying-course');
+      .mount('#accompanying-course')
    });
 }
 

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

@@ -1,20 +1,13 @@
 import 'es6-promise/auto';
 import { createStore } from 'vuex';
-import { fetchScopes } from 'ChillMainAssets/lib/api/scope.js';
+import { fetchScopes } from 'ChillMainAssets/lib/api/apiMethods.js';
 import { getAccompanyingCourse,
-   patchAccompanyingCourse,
-   confirmAccompanyingCourse,
-   postParticipation,
-   postRequestor,
-   postResource,
-   postSocialIssue,
-   addScope,
-   removeScope,
    getReferrersSuggested,
    getUsers,
 } from '../api';
 import { patchPerson } from "ChillPersonAssets/vuejs/_api/OnTheFly";
 import { patchThirdparty } from "ChillThirdPartyAssets/vuejs/_api/OnTheFly";
+import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
 
 
 const debug = process.env.NODE_ENV !== 'production';
@@ -44,6 +37,7 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
             referrersSuggested: [],
             // all the users available
             users: [],
+            permissions: {}
          },
          getters: {
             isParticipationValid(state) {
@@ -77,7 +71,14 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
                   return true;
                }
                return false;
-            }
+            },
+            canTogglePermission(state) {
+               if (state.permissions.roles) {
+                  return state.permissions.roles['CHILL_PERSON_ACCOMPANYING_PERIOD_TOGGLE_CONFIDENTIAL'];
+               }
+
+               return false;
+            },
          },
          mutations: {
             catchError(state, error) {
@@ -88,11 +89,11 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
                //console.log('### mutation: remove participation', participation.id);
                state.accompanyingCourse.participations = state.accompanyingCourse.participations.filter(element => element !== participation);
             },
-            closeParticipation(state, { participation, payload }) {
+            closeParticipation(state, { response, payload }) {
                //console.log('### mutation: close item', { participation, payload });
                // find row position and replace by closed participation
                state.accompanyingCourse.participations.splice(
-                  state.accompanyingCourse.participations.findIndex(element => element === payload), 1, participation
+                  state.accompanyingCourse.participations.findIndex(element => element === payload), 1, response
                );
             },
             addParticipation(state, participation) {
@@ -208,6 +209,10 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
                   return u;
                });
             },
+            setPermissions(state, permissions) {
+               state.permissions = permissions;
+               // console.log('permissions', state.permissions);
+            },
             updateLocation(state, r) {
                //console.log('### mutation: set location attributes', r);
                state.accompanyingCourse.locationStatus = r.locationStatus;
@@ -240,67 +245,117 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
             }
          },
          actions: {
+            //QUESTION: does this serve a purpose? Participations can be closed...
             removeParticipation({ commit }, payload) {
                commit('removeParticipation', payload);
                // fetch DELETE request...
             },
+            /**
+             * Add/close participation
+             */
             closeParticipation({ commit }, payload) {
-               //console.log('## action: fetch delete participation: payload', payload);
-               postParticipation(id, payload.person, 'DELETE')
-               .then(participation => new Promise((resolve, reject) => {
-                  commit('closeParticipation', { participation, payload });
-                  resolve();
-               })).catch((error) => { commit('catchError', error) });
+               const body = { type: payload.person.type, id: payload.person.id };
+               const url = `/api/1.0/person/accompanying-course/${id}/participation.json`;
+
+               return makeFetch('DELETE', url, body)
+                  .then((response) => {
+                     commit('closeParticipation', { response, payload });
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
             addParticipation({ commit }, payload) {
-               //console.log('## action: fetch post participation (select item): payload', payload);
-               postParticipation(id, payload.result, 'POST')
-               .then(participation => new Promise((resolve, reject) => {
-                  commit('addParticipation', participation);
-                  resolve();
-               })).catch((error) => { commit('catchError', error) });
+               const body = { type: payload.result.type, id: payload.result.id };
+               const url = `/api/1.0/person/accompanying-course/${id}/participation.json`;
+
+               return makeFetch('POST', url, body)
+                  .then((response) => {
+                        commit('addParticipation', response);
+                     })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
+            /**
+             * Add/remove/display anonymous requestor
+             */
             removeRequestor({ commit, dispatch }) {
-               //console.log('## action: fetch delete requestor');
-               postRequestor(id, null, 'DELETE')
-               .then(requestor => new Promise((resolve, reject) => {
-                  commit('removeRequestor');
-                  dispatch('requestorIsAnonymous', false);
-                  resolve();
-               })).catch((error) => { commit('catchError', error) });
+               const body = {};
+               const url = `/api/1.0/person/accompanying-course/${id}/requestor.json`;
+
+               return makeFetch('DELETE', url, body)
+                  .then((response) => {
+                        commit('removeRequestor');
+                        dispatch('requestorIsAnonymous', false);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
             addRequestor({ commit }, payload) {
-               //console.log('## action: fetch post requestor: payload', payload);
-               postRequestor(id, payload.result, 'POST')
-               .then(requestor => new Promise((resolve, reject) => {
-                  commit('addRequestor', requestor);
-                  resolve();
-               })).catch((error) => { commit('catchError', error) });
+               const body = payload ? { type: payload.result.type, id: payload.result.id } : {};
+               const url = `/api/1.0/person/accompanying-course/${id}/requestor.json`;
+
+               return makeFetch('POST', url, body)
+                  .then((response) => {
+                     commit('addRequestor', response);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
             requestorIsAnonymous({ commit }, payload) {
-               //console.log('## action: fetch patch AccompanyingCourse: payload', payload);
-               patchAccompanyingCourse(id, { type: "accompanying_period", requestorAnonymous: payload })
-               .then(course => new Promise((resolve, reject) => {
-                  commit('requestorIsAnonymous', course.requestorAnonymous)
-                  resolve();
-               })).catch((error) => { commit('catchError', error) });
+               const url = `/api/1.0/person/accompanying-course/${id}.json`
+               const body = { type: "accompanying_period", requestorAnonymous: payload }
+
+               return makeFetch('PATCH', url, body)
+                  .then((response) => {
+                     commit('requestorIsAnonymous', response.requestorAnonymous);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
+            /**
+             * Add/remove resource
+             */
             removeResource({ commit }, payload) {
-               //console.log('## action: fetch postResource: payload', payload);
-               postResource(id, payload, 'DELETE')
-               .then(resource => new Promise((resolve, reject) => {
-                  commit('removeResource', payload) // mieux un retour de l'objet !
-                  resolve();
-               })).catch((error) => { commit('catchError', error) });
+               const body = { type: "accompanying_period_resource" };
+               body['id'] = payload.id;
+               const url = `/api/1.0/person/accompanying-course/${id}/resource.json`;
+
+               return makeFetch('DELETE', url, body)
+                  .then((response) => {
+                     commit('removeResource', payload)
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
             addResource({ commit }, payload) {
-               //console.log('## action: fetch postResource: payload', payload);
-               postResource(id, payload.result, 'POST')
-               .then(resource => new Promise((resolve, reject) => {
-                  commit('addResource', resource)
-                  resolve();
-               })).catch((error) => { commit('catchError', error) });
+               const body = { type: "accompanying_period_resource" };
+               body['resource'] = { type: payload.result.type, id: payload.result.id };
+               const url = `/api/1.0/person/accompanying-course/${id}/resource.json`;
+
+               return makeFetch('POST', url, body)
+                  .then((response) => {
+                     commit('addResource', response);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
+            /**
+             * On The Fly
+             */
             patchOnTheFly({ commit }, payload) {
                // TODO should be into the dedicated component, no ? JF
                console.log('## action: patch OnTheFly', payload);
@@ -334,29 +389,48 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
                   }));
                }
             },
+            /**
+             * Update accompanying course intensity/emergency/confidentiality
+             */
             toggleIntensity({ commit }, payload) {
-               //console.log(payload);
-               patchAccompanyingCourse(id, { type: "accompanying_period", intensity: payload })
-               .then(course => new Promise((resolve, reject) => {
-                  commit('toggleIntensity', course.intensity);
-                  resolve();
-               })).catch((error) => { commit('catchError', error) });
+               const url = `/api/1.0/person/accompanying-course/${id}.json`
+               const body = { type: "accompanying_period", 'intensity': payload }
+
+               return makeFetch('PATCH', url, body)
+                  .then((response) => {
+                     commit('toggleIntensity', response.intensity);
+
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
             toggleEmergency({ commit }, payload) {
-               patchAccompanyingCourse(id, { type: "accompanying_period", emergency: payload })
-                  .then(course => new Promise((resolve, reject) => {
-                     commit('toggleEmergency', course.emergency);
-                     return dispatch('setRefererresAvailable');
-                  }))
-                 .then(() => Promise.resolve())
-                 .catch((error) => { commit('catchError', error) });
+               const url = `/api/1.0/person/accompanying-course/${id}.json`
+               const body = { type: "accompanying_period", emergency: payload }
+
+               return makeFetch('PATCH', url, body)
+                  .then((response) => {
+                     commit('toggleEmergency', response.emergency);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
             toggleConfidential({ commit }, payload) {
-               patchAccompanyingCourse(id, { type: "accompanying_period", confidential: payload })
-               .then(course => new Promise((resolve, reject) => {
-                  commit('toggleConfidential', course.confidential);
-                  resolve();
-               })).catch((error) => { commit('catchError', error) });
+               const url = `/api/1.0/person/accompanying-course/${id}.json`
+               const body = { type: "accompanying_period", confidential: payload }
+
+               return makeFetch('PATCH', url, body)
+                  .then((response) => {
+                     commit('toggleConfidential', response.confidential);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
             /**
              * Handle the checked/unchecked scopes
@@ -411,19 +485,24 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
                let lengthAfterOperation = currentServerScopesIds.length + addedScopesIds.length
                  - removedScopesIds.length;
 
-               if (lengthAfterOperation > 0 || (lengthAfterOperation === 0 && state.scopesAtStart.length === 0) ) {
-                  return dispatch('updateScopes', {
-                     addedScopesIds, removedScopesIds
-                  }).then(() => {
-                     // warning: when the operation of dispatch are too slow, the user may check / uncheck before
-                     // the end of the synchronisation with the server (done by dispatch operation). Then, it leads to
-                     // check/uncheck in the UI. I do not know of to avoid it.
-                     commit('setScopes', scopes);
-                     return Promise.resolve();
-                  }).then(() => {
-                     return dispatch('fetchReferrersSuggested');
-                  });
-               } else {
+               return dispatch('updateScopes', {
+                  addedScopesIds, removedScopesIds
+               })
+                 .catch(error => {
+                  throw error;
+               })
+                 .then(() => {
+                  // warning: when the operation of dispatch are too slow, the user may check / uncheck before
+                  // the end of the synchronisation with the server (done by dispatch operation). Then, it leads to
+                  // check/uncheck in the UI. I do not know of to avoid it.
+                  commit('setScopes', scopes);
+                  return Promise.resolve();
+               })
+                 .then(() => {
+                  return dispatch('fetchReferrersSuggested');
+               });
+               /*
+               else {
                   return dispatch('setScopes', state.scopesAtStart).then(() => {
                      commit('setScopes', scopes);
                      return Promise.resolve();
@@ -431,6 +510,7 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
                      return dispatch('fetchReferrersSuggested');
                   });
                }
+                */
             },
             /**
              * Internal function for the store to effectively update scopes.
@@ -446,59 +526,99 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
              */
             updateScopes({ state, commit }, { addedScopesIds, removedScopesIds }) {
                let promises = [];
+               const url = `/api/1.0/person/accompanying-course/${state.accompanyingCourse.id}/scope.json`;
                state.scopes.forEach(scope => {
+                  const body = {
+                     id: scope.id,
+                     type: scope.type
+                  };
+
                   if (addedScopesIds.includes(scope.id)) {
-                     promises.push(addScope(state.accompanyingCourse.id, scope).then(() => {
-                        commit('addScopeAtBackend', scope);
-                        return Promise.resolve();
-                     }));
+                     promises.push(
+                        makeFetch('POST', url, body)
+                           .then((response) => {
+                              commit('addScopeAtBackend', scope);
+                              return response;
+                           })
+                           .catch((error) => {
+                              commit('catchError', error);
+                              throw error;
+                           })
+                     )
                   }
                   if (removedScopesIds.includes(scope.id)) {
-                     promises.push(removeScope(state.accompanyingCourse.id, scope).then(() => {
-                        commit('removeScopeAtBackend', scope);
-                        return Promise.resolve();
-                     }));
+                     promises.push(
+                        makeFetch('DELETE', url, body)
+                        .then((response) => {
+                           commit('removeScopeAtBackend', scope);
+                           return response;
+                        })
+                        .catch((error) => {
+                           commit('catchError', error);
+                           throw error;
+                        })
+                     );
                   }
                });
 
                return Promise.all(promises);
             },
             postFirstComment({ commit }, payload) {
-               //console.log('## action: postFirstComment: payload', payload);
-               patchAccompanyingCourse(id, { type: "accompanying_period", initialComment: payload })
-               .then(course => new Promise((resolve, reject) => {
-                  commit('postFirstComment', course.initialComment);
-                  resolve();
-               })).catch((error) => { commit('catchError', error) });
+               const url = `/api/1.0/person/accompanying-course/${id}.json`
+               const body = { type: "accompanying_period", initialComment: payload }
+
+               return makeFetch('PATCH', url, body)
+                  .then((response) => {
+                     commit('postFirstComment', response.initialComment);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
             updateSocialIssues({ state, commit, dispatch }, { payload, body, method }) {
-               //console.log('## action: payload', { payload, body, method });
-               postSocialIssue(id, body, method)
-               .then(response => new Promise((resolve, reject) => {
-                  //console.log('response', response);
-                  commit('updateSocialIssues', payload);
-                  resolve();
-               })).then(() => {
-                  return getAccompanyingCourse(state.accompanyingCourse.id);
-               }).then(accompanying_course => {
+               const url = `/api/1.0/person/accompanying-course/${id}/socialissue.json`;
+               return makeFetch(method, url, body)
+                  .then((response) => {
+                     commit('updateSocialIssues', payload);
+                  })
+                  .then(() => {
+                     return getAccompanyingCourse(state.accompanyingCourse.id)
+                  })
+                  .then(accompanying_course => {
                   commit('refreshSocialIssues', accompanying_course.socialIssues);
                   dispatch('fetchReferrersSuggested');
-               })
-                   .catch((error) => { commit('catchError', error) });
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
             updateOrigin({ commit }, payload) {
-               patchAccompanyingCourse(id, { type: "accompanying_period", origin: { id: payload.id, type: payload.type } })
-               .then(course => new Promise((resolve, reject) => {
-                  commit('updateOrigin', course.origin);
-                  resolve();
-               })).catch((error) => { commit('catchError', error) });
+               const url = `/api/1.0/person/accompanying-course/${id}.json`
+               const body = { type: "accompanying_period", origin: { id: payload.id, type: payload.type }}
+
+               return makeFetch('PATCH', url, body)
+                  .then((response) => {
+                     commit('updateOrigin', response.origin);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
             updateReferrer({ commit }, payload) {
-               patchAccompanyingCourse(id, { type: "accompanying_period", user: { id: payload.id, type: payload.type } })
-               .then(course => new Promise((resolve, reject) => {
-                  commit('updateReferrer', course.user);
-                  resolve();
-               })).catch((error) => { commit('catchError', error) });
+               const url = `/api/1.0/person/accompanying-course/${id}.json`
+               const body = { type: "accompanying_period", user: { id: payload.id, type: payload.type }}
+
+               return makeFetch('PATCH', url, body)
+                  .then((response) => {
+                     commit('updateReferrer', response.user);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
             async fetchReferrersSuggested({ state, commit}) {
                let users = await getReferrersSuggested(state.accompanyingCourse);
@@ -517,8 +637,36 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
                let users = await getUsers();
                commit('setUsers', users);
             },
+            /**
+             * By adding more roles to body['roles'], more permissions can be checked.
+             */
+            fetchPermissions({commit}) {
+               const url = '/api/1.0/main/permissions/info.json';
+               const body = {
+                  "object": {
+                     "type": "accompanying_period",
+                     "id": id
+                   },
+                   "class": "Chill\\PersonBundle\\Entity\\AccompanyingPeriod",
+                   "roles": [
+                      "CHILL_PERSON_ACCOMPANYING_PERIOD_TOGGLE_CONFIDENTIAL"
+                     ]
+               }
+
+               return makeFetch('POST', url, body)
+                  .then((response) => {
+                     commit('setPermissions', response);
+
+                     return Promise.resolve();
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
+            },
             updateLocation({ commit, dispatch }, payload) {
                //console.log('## action: updateLocation', payload.locationStatusTo);
+               const url = `/api/1.0/person/accompanying-course/${payload.targetId}.json`;
                let body = { 'type': payload.target, 'id': payload.targetId };
                let location = {};
                if (payload.locationStatusTo === 'person') { // patch for person address (don't remove addressLocation)
@@ -531,26 +679,31 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
                   location = { 'personLocation': null };
                }
                Object.assign(body, location);
-               patchAccompanyingCourse(payload.targetId, body)
-                  .then(accompanyingCourse => new Promise((resolve, reject) => {
+               makeFetch('PATCH', url, body)
+                  .then((response) => {
                      commit('updateLocation', {
-                        location: accompanyingCourse.location,
-                        locationStatus: accompanyingCourse.locationStatus,
-                        personLocation: accompanyingCourse.personLocation
+                        location: response.location,
+                        locationStatus: response.locationStatus,
+                        personLocation: response.personLocation
                      });
-                     resolve();
                      dispatch('fetchReferrersSuggested');
-                  })).catch((error) => { commit('catchError', error) });
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
             confirmAccompanyingCourse({ commit }) {
-               //console.log('## action: confirmAccompanyingCourse');
-               confirmAccompanyingCourse(id)
-               .then(response => new Promise((resolve, reject) => {
-                  window.location.replace(`/fr/parcours/${id}`);
-                  //console.log('fetch resolve');
-                  commit('confirmAccompanyingCourse', response);
-                  resolve();
-               })).catch((error) => { commit('catchError', error) });
+               const url = `/api/1.0/person/accompanying-course/${id}/confirm.json`
+               makeFetch('POST', url)
+                  .then((response) => {
+                     window.location.replace(`/fr/parcours/${id}`);
+                     commit('confirmAccompanyingCourse', response);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             }
          }
       });

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

@@ -31,6 +31,7 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
         self::EDIT,
         self::DELETE,
         self::FULL,
+        self::TOGGLE_CONFIDENTIAL_ALL,
     ];
 
     public const CREATE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_CREATE';
@@ -53,6 +54,13 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
      */
     public const SEE_DETAILS = 'CHILL_PERSON_ACCOMPANYING_PERIOD_SEE_DETAILS';
 
+    public const TOGGLE_CONFIDENTIAL = 'CHILL_PERSON_ACCOMPANYING_PERIOD_TOGGLE_CONFIDENTIAL';
+
+    /**
+     * Right to toggle confidentiality.
+     */
+    public const TOGGLE_CONFIDENTIAL_ALL = 'CHILL_PERSON_ACCOMPANYING_PERIOD_TOGGLE_CONFIDENTIAL_ALL';
+
     private Security $security;
 
     private VoterHelperInterface $voterHelper;
@@ -65,7 +73,7 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
         $this->voterHelper = $voterHelperFactory
             ->generate(self::class)
             ->addCheckFor(null, [self::CREATE])
-            ->addCheckFor(AccompanyingPeriod::class, self::ALL)
+            ->addCheckFor(AccompanyingPeriod::class, [self::TOGGLE_CONFIDENTIAL, ...self::ALL])
             ->addCheckFor(Person::class, [self::SEE])
             ->build();
     }
@@ -113,6 +121,14 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
                 return false;
             }
 
+            if (self::TOGGLE_CONFIDENTIAL === $attribute) {
+                if ($subject->getUser() === $token->getUser()) {
+                    return true;
+                }
+
+                return $this->voterHelper->voteOnAttribute(self::TOGGLE_CONFIDENTIAL_ALL, $subject, $token);
+            }
+
             // if confidential, only the referent can see it
             if ($subject->isConfidential()) {
                 return $token->getUser() === $subject->getUser();

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

@@ -0,0 +1,133 @@
+<?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.
+ */
+
+namespace Chill\PersonBundle\Tests\AccompanyingPeriod;
+
+use Chill\MainBundle\Entity\Center;
+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
+ * @coversNothing
+ */
+class AccompanyingPeriodConfidentialTest extends WebTestCase
+{
+    /**
+     * Setup before the first test of this class (see phpunit doc).
+     */
+    public static function setUpBeforeClass()
+    {
+        static::bootKernel();
+    }
+
+    /**
+     * Setup before each test method (see phpunit doc).
+     */
+    public function setUp()
+    {
+        $this->client = static::createClient([], [
+            'PHP_AUTH_USER' => 'fred',
+            'PHP_AUTH_PW' => 'password',
+        ]);
+    }
+
+    public function dataGenerateRandomAccompanyingCourse()
+    {
+        $maxGenerated = 3;
+        $maxResults = $maxGenerated * 8;
+
+        static::bootKernel();
+        $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+        $center = $em->getRepository(Center::class)
+            ->findOneBy(['name' => 'Center A']);
+
+        $qb = $em->createQueryBuilder();
+        $personIds = $qb
+            ->select('p.id')
+            ->distinct(true)
+            ->from(Person::class, 'p')
+            ->join('p.accompanyingPeriodParticipations', 'participation')
+            ->join('participation.accompanyingPeriod', 'ap')
+            ->andWhere(
+                $qb->expr()->eq('ap.step', ':step')
+            )
+            ->andWhere(
+                $qb->expr()->eq('ap.confidential', ':confidential')
+            )
+            ->setParameter('step', AccompanyingPeriod::STEP_CONFIRMED)
+            ->setParameter('confidential', true)
+            ->setMaxResults($maxResults)
+            ->getQuery()
+            ->getScalarResult();
+
+        // create a random order
+        shuffle($personIds);
+
+        $nbGenerated = 0;
+
+        while ($nbGenerated < $maxGenerated) {
+            $id = array_pop($personIds)['id'];
+
+            $person = $em->getRepository(Person::class)
+                ->find($id);
+            $periods = $person->getAccompanyingPeriods();
+
+            yield [array_pop($personIds)['id'], $periods[array_rand($periods)]->getId()];
+
+            ++$nbGenerated;
+        }
+    }
+
+    /**
+     * @dataProvider dataGenerateRandomAccompanyingCourse
+     */
+    public function testRemoveUserWhenConfidential(int $periodId)
+    {
+        $period = self::$container->get(AccompanyingPeriodRepository::class)
+            ->find($periodId);
+        $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+
+        $isConfidential = $period->isConfidential();
+        $step = $period->getStep();
+
+        $initialUser = $period->getUser();
+
+        $user = new stdClass();
+        $user->id = 0;
+        $user->type = 'user';
+        dump($user);
+
+        $this->client->request(
+            Request::METHOD_PATCH,
+            sprintf('/api/1.0/person/accompanying-course/%d.json', $periodId),
+            [], // parameters
+            [], // files
+            [], // server parameters
+            json_encode(['type' => 'accompanying_period', 'user' => $user])
+        );
+        $response = $this->client->getResponse();
+
+        // if ($isConfidential === true && $step === 'CONFIRMED') {
+        $this->assertEquals(422, $response->getStatusCode());
+        // }
+
+        $this->assertEquals(200, $response->getStatusCode());
+        $period = $em->getRepository(AccompanyingPeriod::class)
+            ->find($periodId);
+        $this->assertEquals($user, $period->getUser());
+
+        // assign initial user again
+        $period->setUser($initialUser);
+        $em->flush();
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php

@@ -12,10 +12,11 @@ declare(strict_types=1);
 namespace Validator\Person;
 
 use Chill\MainBundle\Entity\Center;
-use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
+use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Validator\Constraints\Person\PersonHasCenter;
 use Chill\PersonBundle\Validator\Constraints\Person\PersonHasCenterValidator;
+use Prophecy\Argument;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
@@ -52,9 +53,19 @@ class PersonHasCenterValidatorTest extends ConstraintValidatorTestCase
                 ],
             ]);
 
-        $centerResolverDispatcher = $this->createMock(CenterResolverDispatcherInterface::class);
+        $prophecy = $this->prophesize(CenterResolverManagerInterface::class);
 
-        return new PersonHasCenterValidator($parameterBag, $centerResolverDispatcher);
+        $prophecy->resolveCenters(Argument::type(Person::class), Argument::any())->will(function ($args) {
+            $center = $args[0]->getCenter();
+
+            if ($center instanceof Center) {
+                return [$center];
+            }
+
+            return [];
+        });
+
+        return new PersonHasCenterValidator($parameterBag, $prophecy->reveal());
     }
 
     protected function getConstraint()

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

@@ -32,7 +32,7 @@ class LocationValidityValidator extends ConstraintValidator
         }
 
         if (!$period instanceof AccompanyingPeriod) {
-            throw new UnexpectedValueException($value, AccompanyingPeriod::class);
+            throw new UnexpectedValueException($period, AccompanyingPeriod::class);
         }
 
         if ($period->getLocationStatus() === 'person') {

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

@@ -18,5 +18,5 @@ use Symfony\Component\Validator\Constraint;
  */
 class ParticipationOverlap extends Constraint
 {
-    public $message = 'This participation already exists.';
+    public $message = '{{ name }} is already associated to this accompanying course.';
 }

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

@@ -13,6 +13,8 @@ namespace Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod;
 
 use Chill\MainBundle\Util\DateRangeCovering;
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Templating\Entity\PersonRender;
+use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
 use Doctrine\Common\Collections\Collection;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
@@ -22,6 +24,16 @@ class ParticipationOverlapValidator extends ConstraintValidator
 {
     private const MAX_PARTICIPATION = 1;
 
+    private PersonRender $personRender;
+
+    private ThirdPartyRender $thirdpartyRender;
+
+    public function __construct(PersonRender $personRender, ThirdPartyRender $thirdPartyRender)
+    {
+        $this->personRender = $personRender;
+        $this->thirdpartyRender = $thirdPartyRender;
+    }
+
     public function validate($participations, Constraint $constraint)
     {
         if (!$constraint instanceof ParticipationOverlap) {
@@ -36,7 +48,10 @@ class ParticipationOverlapValidator extends ConstraintValidator
             return;
         }
 
-        $overlaps = new DateRangeCovering(self::MAX_PARTICIPATION, $participations[0]->getStartDate()->getTimezone());
+        if (0 === count($participations)) {
+            return;
+        }
+
         $participationList = [];
 
         foreach ($participations as $participation) {
@@ -51,26 +66,29 @@ class ParticipationOverlapValidator extends ConstraintValidator
 
         foreach ($participationList as $group) {
             if (count($group) > 1) {
+                $overlaps = new DateRangeCovering(self::MAX_PARTICIPATION, $participations[0]->getStartDate()->getTimezone());
+
                 foreach ($group as $p) {
                     $overlaps->add($p->getStartDate(), $p->getEndDate(), $p->getId());
                 }
-            }
-        }
 
-        $overlaps->compute();
+                $overlaps->compute();
 
-        if ($overlaps->hasIntersections()) {
-            foreach ($overlaps->getIntersections() as [$start, $end, $ids]) {
-                $msg = null === $end ? $constraint->message :
-                    $constraint->message;
+                if ($overlaps->hasIntersections()) {
+                    foreach ($overlaps->getIntersections() as [$start, $end, $ids]) {
+                        $msg = null === $end ? $constraint->message :
+                            $constraint->message;
 
-                $this->context->buildViolation($msg)
-                    ->setParameters([
-                        '{{ start }}' => $start->format('d-m-Y'),
-                        '{{ end }}' => null === $end ? null : $end->format('d-m-Y'),
-                        '{{ ids }}' => $ids,
-                    ])
-                    ->addViolation();
+                        $this->context->buildViolation($msg)
+                            ->setParameters([
+                                '{{ start }}' => $start->format('d-m-Y'),
+                                '{{ end }}' => null === $end ? null : $end->format('d-m-Y'),
+                                '{{ ids }}' => $ids,
+                                '{{ name }}' => $this->personRender->renderString($participation->getPerson(), []),
+                            ])
+                            ->addViolation();
+                    }
+                }
             }
         }
     }

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

@@ -42,6 +42,10 @@ class ResourceDuplicateCheckValidator extends ConstraintValidator
             throw new UnexpectedTypeException($resources, Collection::class);
         }
 
+        if (0 === count($resources)) {
+            return;
+        }
+
         $resourceList = [];
 
         foreach ($resources as $resource) {

src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenterValidator.php

@@ -11,7 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Validator\Constraints\Person;
 
-use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
+use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\PersonBundle\Entity\Person;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Validator\Constraint;
@@ -22,12 +22,12 @@ class PersonHasCenterValidator extends ConstraintValidator
 {
     private bool $centerRequired;
 
-    private CenterResolverDispatcherInterface $centerResolverDispatcher;
+    private CenterResolverManagerInterface $centerResolverManager;
 
-    public function __construct(ParameterBagInterface $parameterBag, CenterResolverDispatcherInterface $centerResolverDispatcher)
+    public function __construct(ParameterBagInterface $parameterBag, CenterResolverManagerInterface $centerResolverManager)
     {
         $this->centerRequired = $parameterBag->get('chill_person')['validation']['center_required'];
-        $this->centerResolverDispatcher = $centerResolverDispatcher;
+        $this->centerResolverManager = $centerResolverManager;
     }
 
     public function validate($person, Constraint $constraint)
@@ -40,7 +40,7 @@ class PersonHasCenterValidator extends ConstraintValidator
             return;
         }
 
-        if (null === $this->centerResolverDispatcher->resolveCenter($person)) {
+        if ([] === $this->centerResolverManager->resolveCenters($person)) {
             $this
                 ->context
                 ->buildViolation($constraint->message)

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

@@ -1114,6 +1114,44 @@ paths:
         400:
           description: "transition cannot be applyed"
   
+  /1.0/person/accompanying-course/{id}/confidential.json:
+    post:
+      tags:
+        - person
+      summary: "Toggle confidentiality 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: "Confidentiality toggle"
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                type:
+                  type: string
+                  enum:
+                    - "accompanying_period"
+                confidential:
+                  type: boolean
+      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/translations/validators.fr.yml

@@ -43,4 +43,6 @@ household_membership:
     Person with membership covering: Une personne ne peut pas appartenir à deux ménages simultanément. Or, avec cette modification, %person_name% appartiendrait à %nbHousehold% ménages à partir du %from%.
 
 # Accompanying period
-'{{ name }} is already associated to this accompanying course.': '{{ name }} est déjà associé avec ce parcours.' 
+'{{ name }} is already associated to this accompanying course.': '{{ name }} est déjà associé à ce parcours.'
+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'