Merge branch 'issue342_location_in_acc_period' into 'master'

accompanying period: add location to accompanying period + add delete button

See merge request Chill-Projet/chill-bundles!272

CHANGELOG.md

@@ -20,6 +20,10 @@ and this project adheres to
 * [household] household member editor: remove markNoAddress button (champs-libres/departement-de-la-vendee/accent-suivi-developpement#109)
 * [person]: ordering fields in add person (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/61)
 * [person]: Add email and alt names in add person (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/61)
+* [accompanyingCourse] Add a delete action and delete buttons to delete a accompanying course when step = DRAFT (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/64)
+* [accompanyingCourse] Add a administrative location in the accompanying course, set the user current location as default, allow to select a location in a select field and do not allow to confirm the accompanying course if location is empty.
+* [accompanyingCourse] Add the administrative location in the available variables for document generation
+
 * AddAddress: optimize loading: wait for the user finish typing;
 * UserPicker: fix bug with deprecated role
 * docgen: add base context + tests

src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php

@@ -19,6 +19,7 @@ use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepos
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -110,6 +111,60 @@ class AccompanyingCourseController extends Controller
         ]);
     }
 
+    /**
+     * Delete page of Accompanying Course section.
+     *
+     * @Route("/{_locale}/parcours/{accompanying_period_id}/delete", name="chill_person_accompanying_course_delete")
+     * @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"})
+     */
+    public function deleteAction(Request $request, AccompanyingPeriod $accompanyingCourse)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $person_id = $request->query->get('person_id');
+
+        $form = $this->createFormBuilder()
+            ->setAction($this->generateUrl('chill_person_accompanying_course_delete', [
+                'accompanying_period_id' => $accompanyingCourse->getId(),
+                'person_id' => $person_id,
+            ]))
+            ->setMethod('DELETE')
+            ->add('submit', SubmitType::class, ['label' => 'Delete'])
+            ->getForm();
+
+        if ($request->getMethod() === Request::METHOD_DELETE) {
+            $form->handleRequest($request);
+
+            if ($form->isValid()) {
+                $em->remove($accompanyingCourse);
+                $em->flush();
+
+                $this->addFlash('success', $this->get('translator')
+                    ->trans('The accompanying course has been successfully removed.'));
+
+                if (null !== $person_id) {
+                    return $this->redirectToRoute('chill_person_accompanying_period_list', [
+                        'person_id' => $person_id,
+                    ]);
+                }
+
+                return $this->redirectToRoute('chill_main_homepage');
+            }
+        }
+
+        if (null !== $person_id) {
+            $view = '@ChillPerson/AccompanyingCourse/confirm_delete_person.html.twig';
+        } else {
+            $view = '@ChillPerson/AccompanyingCourse/confirm_delete_accompanying_course.html.twig';
+        }
+
+        return $this->render($view, [
+            'accompanyingCourse' => $accompanyingCourse,
+            'person_id' => $person_id,
+            'delete_form' => $form->createView(),
+        ]);
+    }
+
     /**
      * Edit page of Accompanying Course section.
      *
@@ -208,6 +263,9 @@ class AccompanyingCourseController extends Controller
             }
         }
 
+        $userLocation = $this->getUser()->getCurrentLocation();
+        $period->setAdministrativeLocation($userLocation);
+
         $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::CREATE, $period);
 
         $em->persist($period);

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php

@@ -17,6 +17,7 @@ use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\HasCentersInterface;
 use Chill\MainBundle\Entity\HasScopesInterface;
+use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
@@ -118,6 +119,13 @@ class AccompanyingPeriod implements
      */
     private ?Address $addressLocation = null;
 
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Location")
+     * @Groups({"read", "write"})
+     * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_CONFIRMED})
+     */
+    private ?Location $administrativeLocation = null;
+
     /**
      * @var DateTime
      *
@@ -507,6 +515,11 @@ class AccompanyingPeriod implements
         return $this->addressLocation;
     }
 
+    public function getAdministrativeLocation(): ?Location
+    {
+        return $this->administrativeLocation;
+    }
+
     /**
      * Get a list of person which have an adresse available for a valid location.
      *
@@ -980,6 +993,13 @@ class AccompanyingPeriod implements
         return $this;
     }
 
+    public function setAdministrativeLocation(?Location $administrativeLocation): AccompanyingPeriod
+    {
+        $this->administrativeLocation = $administrativeLocation;
+
+        return $this;
+    }
+
     /**
      * Set closingDate.
      *

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

@@ -8,6 +8,7 @@
    <persons-associated></persons-associated>
    <course-location></course-location>
    <origin-demand></origin-demand>
+   <admin-location></admin-location>
    <requestor v-bind:isAnonymous="accompanyingCourse.requestorAnonymous"></requestor>
    <social-issue></social-issue>
    <scopes></scopes>
@@ -28,6 +29,7 @@ import { mapGetters, mapState } from 'vuex'
 import Banner from './components/Banner.vue';
 import StickyNav from './components/StickyNav.vue';
 import OriginDemand from './components/OriginDemand.vue';
+import AdminLocation from './components/AdminLocation.vue';
 import PersonsAssociated from './components/PersonsAssociated.vue';
 import Requestor from './components/Requestor.vue';
 import SocialIssue from './components/SocialIssue.vue';
@@ -44,6 +46,7 @@ export default {
       Banner,
       StickyNav,
       OriginDemand,
+      AdminLocation,
       PersonsAssociated,
       Requestor,
       SocialIssue,

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

@@ -0,0 +1,103 @@
+<template>
+   <div class="vue-component">
+      <h2><a id="section-40"></a>{{ $t('admin_location.title') }}</h2>
+
+      <div class="mb-4">
+         <label for="selectAdminLocation">
+            {{ $t('admin_location.title') }}
+         </label>
+
+         <VueMultiselect
+            name="selectAdminLocation"
+            label="text"
+            :custom-label="customLabel"
+            track-by="id"
+            :multiple="false"
+            :searchable="true"
+            :placeholder="$t('admin_location.placeholder')"
+            v-model="value"
+            :options="options"
+            group-values="locations"
+            group-label="locationCategories"
+            @select="updateAdminLocation">
+         </VueMultiselect>
+      </div>
+
+      <div v-if="!isAdminLocationValid" class="alert alert-warning to-confirm">
+        {{ $t('admin_location.not_valid') }}
+     </div>
+   </div>
+</template>
+
+<script>
+import VueMultiselect from 'vue-multiselect';
+import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
+import { mapState, mapGetters } from 'vuex';
+
+export default {
+   name: 'AdminLocation',
+   components: { VueMultiselect },
+   data() {
+      return {
+         options: []
+      }
+   },
+   computed: {
+      ...mapState({
+         value: state => state.accompanyingCourse.administrativeLocation,
+      }),
+      ...mapGetters([
+         'isAdminLocationValid'
+      ])
+   },
+   mounted() {
+      this.getOptions();
+   },
+   methods: {
+      getOptions() {
+         const url = `/api/1.0/main/location.json`;
+         makeFetch('GET', url)
+            .then(response => {
+               let options = response.results;
+               let uniqueLocationTypeId = [...new Set(options.map(o => o.locationType.id))];
+               let results = [];
+               for (let id of uniqueLocationTypeId) {
+                  results.push({
+                    locationCategories: options.filter(o => o.locationType.id === id)[0].locationType.title.fr,
+                    locations: options.filter(o => o.locationType.id === id)
+                  })
+               }
+               this.options = results;
+               return response;
+            })
+            .catch((error) => {
+               this.$toast.open({message: error.txt})
+            })
+      },
+      updateAdminLocation(value) {
+         this.$store.dispatch('updateAdminLocation', 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'})
+               }
+            });
+      },
+      customLabel(value) {
+         return value.locationType
+            ? value.name
+               ? `${value.name} (${value.locationType.title.fr})`
+               : value.locationType.title.fr
+            : '';
+      },
+   }
+}
+</script>
+
+<style src="vue-multiselect/dist/vue-multiselect.css"></style>
+<style lang="css" scoped>
+   label {
+      display: none;
+   }
+</style>

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

@@ -1,6 +1,6 @@
 <template>
    <div class="vue-component">
-      <h2><a id="section-90"></a>{{ $t('comment.title') }}</h2>
+      <h2><a id="section-100"></a>{{ $t('comment.title') }}</h2>
 
       <!--div class="error flash_message" v-if="errors.length > 0">
          {{ errors[0] }}

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

@@ -1,6 +1,6 @@
 <template>
 <div class="vue-component">
-   <h2><a id="section-100"></a>
+   <h2><a id="section-110"></a>
       {{ $t('confirm.title') }}
    </h2>
    <div>
@@ -24,6 +24,11 @@
                   {{ $t('confirm.ok') }}
                </button>
             </li>
+            <li>
+               <a class="btn btn-delete" :href="deleteLink">
+                  {{ $t('confirm.delete') }}
+               </a>
+            </li>
          </ul>
       </div>
 
@@ -37,6 +42,11 @@
                   {{ $t('confirm.ok') }}
                </button>
             </li>
+            <li>
+               <a class="btn btn-delete" :href="deleteLink">
+                  {{ $t('confirm.delete') }}
+               </a>
+            </li>
          </ul>
       </div>
 
@@ -89,13 +99,17 @@ export default {
                msg: 'confirm.origin_not_valid',
                anchor: '#section-30'
             },
+            adminLocation: {
+               msg: 'confirm.adminLocation_not_valid',
+               anchor: '#section-40'
+            },
             socialIssue: {
                msg: 'confirm.socialIssue_not_valid',
-               anchor: '#section-50'
+               anchor: '#section-60'
             },
             scopes: {
               msg: 'confirm.set_a_scope',
-              anchor: '#section-60'
+              anchor: '#section-70'
             }
          }
       }
@@ -108,10 +122,14 @@ export default {
          'isParticipationValid',
          'isSocialIssueValid',
          'isOriginValid',
+         'isAdminLocationValid',
          'isLocationValid',
          'validationKeys',
          'isValidToBeConfirmed'
-      ])
+      ]),
+      deleteLink() {
+         return `/fr/parcours/${this.accompanyingCourse.id}/delete`; //TODO locale
+      },
    },
    methods: {
       confirmCourse() {

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

@@ -4,7 +4,7 @@
 
       <div class="mb-4">
          <label for="selectOrigin">
-            {{ $t('origin.label.fr') }}
+            {{ $t('origin.title') }}
          </label>
 
          <VueMultiselect

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

@@ -1,6 +1,6 @@
 <template>
 <div class="vue-component">
-   <h2><a id="section-70"></a>{{ $t('referrer.title') }}</h2>
+   <h2><a id="section-80"></a>{{ $t('referrer.title') }}</h2>
 
    <div>
       <label class="col-form-label" for="selectReferrer">

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

@@ -1,7 +1,7 @@
 <template>
 <div class="vue-component">
 
-   <h2><a id="section-40"></a>{{ $t('requestor.title') }}</h2>
+   <h2><a id="section-50"></a>{{ $t('requestor.title') }}</h2>
 
    <div v-if="accompanyingCourse.requestor && isAnonymous" class="flex-table">
 

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

@@ -1,7 +1,7 @@
 <template>
 <div class="vue-component">
 
-   <h2><a id="section-80"></a>{{ $t('resources.title')}}</h2>
+   <h2><a id="section-90"></a>{{ $t('resources.title')}}</h2>
 
    <div v-if="resources.length > 0">
       <label class="col-form-label">{{ $tc('resources.counter', counter) }}</label>

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

@@ -1,6 +1,6 @@
 <template>
   <div class="vue-component">
-     <h2><a id="section-60"></a>{{ $t('scopes.title') }}</h2>
+     <h2><a id="section-70"></a>{{ $t('scopes.title') }}</h2>
 
      <div class="mb-4">
         <div class="form-check" v-for="s in scopes" :key="s.id">

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

@@ -1,6 +1,6 @@
 <template>
   <div class="vue-component">
-     <h2><a id="section-50"></a>{{ $t('social_issue.title') }}</h2>
+     <h2><a id="section-60"></a>{{ $t('social_issue.title') }}</h2>
 
      <div class="my-4">
         <!--label for="field">{{ $t('social_issue.label') }}</label

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

@@ -37,6 +37,12 @@ const appMessages = {
          placeholder: "Renseignez l'origine de la demande",
          not_valid: "Indiquez une origine à la demande",
       },
+      admin_location: {
+         title: "Localisation administrative",
+         label: "Localisation administrative",
+         placeholder: "Renseignez la localisation administrative",
+         not_valid: "Indiquez une localisation administrative",
+      },
       persons_associated: {
          title: "Usagers concernés",
          counter: "Il n'y a pas encore d'usagers | 1 usager | {count} usagers",
@@ -127,10 +133,12 @@ const appMessages = {
          socialIssue_not_valid: "sélectionnez au minimum une problématique sociale",
          location_not_valid: "indiquez au minimum une localisation temporaire du parcours",
          origin_not_valid: "Indiquez une origine à la demande",
+         adminLocation_not_valid: "Indiquez une localisation administrative à la demande",
          set_a_scope: "indiquez au moins un service",
          sure: "Êtes-vous sûr ?",
          sure_description: "Une fois le changement confirmé, il ne sera plus possible de le remettre à l'état de brouillon !",
-         ok: "Confirmer le parcours"
+         ok: "Confirmer le parcours",
+         delete: "Supprimer le parcours"
       },
       // catch errors
       'Error while updating AccompanyingPeriod Course.': "Erreur du serveur lors de la mise à jour du parcours d'accompagnement.",

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

@@ -49,6 +49,9 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
             isOriginValid(state) {
                return state.accompanyingCourse.origin !== null;
             },
+            isAdminLocationValid(state) {
+               return state.accompanyingCourse.administrativeLocation !== null;
+            },
             isLocationValid(state) {
                return state.accompanyingCourse.location !== null;
             },
@@ -62,6 +65,7 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
                if (!getters.isLocationValid) { keys.push('location'); }
                if (!getters.isSocialIssueValid) { keys.push('socialIssue'); }
                if (!getters.isOriginValid) { keys.push('origin'); }
+               if (!getters.isAdminLocationValid) { keys.push('adminLocation'); }
                if (!getters.isScopeValid) { keys.push('scopes'); }
                //console.log('getter keys', keys);
                return keys;
@@ -177,6 +181,9 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
                //console.log('value', value);
                state.accompanyingCourse.origin = value;
             },
+            updateAdminLocation(state, value) {
+               state.accompanyingCourse.administrativeLocation = value;
+            },
             updateReferrer(state, value) {
                //console.log('value', value);
                state.accompanyingCourse.user = value;
@@ -607,6 +614,19 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
                      throw error;
                   })
             },
+            updateAdminLocation({ commit }, payload) {
+               const url = `/api/1.0/person/accompanying-course/${id}.json`
+               const body = { type: "accompanying_period", administrativeLocation: { id: payload.id, type: payload.type }}
+
+               return makeFetch('PATCH', url, body)
+                  .then((response) => {
+                     commit('updateAdminLocation', response.administrativeLocation);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
+            },
             updateReferrer({ commit }, payload) {
                const url = `/api/1.0/person/accompanying-course/${id}.json`
                const body = { type: "accompanying_period", user: { id: payload.id, type: payload.type }}

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

@@ -0,0 +1,31 @@
+
+{% macro insert_onthefly(type, entity) %}
+    {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+        action: 'show', displayBadge: true,
+        targetEntity: { name: type, id: entity.id },
+        buttonText: entity|chill_entity_render_string
+    } %}
+{% endmacro %}
+
+<div>
+    {% if accompanyingCourse.participations is not empty %}
+        <div class="col mb-4">
+            <h4 class="item-key">{{ 'Persons associated'|trans }}</h4>
+            {% for r in accompanyingCourse.participations %}
+                {{ _self.insert_onthefly('person', r.person) }}
+            {% endfor %}
+        </div>
+    {% endif %}
+
+    {% if accompanyingCourse.socialIssues is not empty %}
+        <div class="col mb-4">
+            <h4 class="item-key">{{ 'Social issues'|trans }}</h4>
+            {% for s in accompanyingCourse.socialIssues %}
+                {{ s|chill_entity_render_box }}
+            {% endfor %}
+        </div>
+    {% endif %}
+
+</div>
+
+

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

@@ -0,0 +1,18 @@
+{% extends '@ChillPerson/AccompanyingCourse/layout.html.twig' %}
+
+{% block title %}{{ 'Delete accompanying period'|trans }}{% endblock %}
+
+
+{% block content %}
+
+    {% include '@ChillPerson/AccompanyingCourse/_confirm_delete.html.twig' %}
+
+    {{ include('@ChillMain/Util/confirmation_template.html.twig',
+        {
+            'title'             : 'Delete accompanying period'|trans,
+            'confirm_question'  : 'Are you sure you want to remove the accompanying period "%id%" ?'|trans({ '%id%' : accompanyingCourse.id } ),
+            'cancel_route'      : 'chill_person_accompanying_course_edit',
+            'cancel_parameters' : {'accompanying_period_id' : accompanyingCourse.id},
+            'form'              : delete_form
+        } ) }}
+{% endblock %}

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

@@ -0,0 +1,18 @@
+{% extends '@ChillPerson/AccompanyingCourse/layout.html.twig' %}
+
+{% block title %}{{ 'Delete accompanying period'|trans }}{% endblock %}
+
+
+{% block content %}
+
+    {% include '@ChillPerson/AccompanyingCourse/_confirm_delete.html.twig' %}
+
+    {{ include('@ChillMain/Util/confirmation_template.html.twig',
+        {
+            'title'             : 'Delete accompanying period'|trans,
+            'confirm_question'  : 'Are you sure you want to remove the accompanying period "%id%" ?'|trans({ '%id%' : accompanyingCourse.id } ),
+            'cancel_route'      : 'chill_person_accompanying_period_list',
+            'cancel_parameters' : {'person_id' : person_id},
+            'form'              : delete_form
+        } ) }}
+{% endblock %}

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

@@ -149,6 +149,15 @@
             </div>
         {% endif %}
 
+        {% if accompanyingCourse.administrativeLocation is not null %}
+            <div class="mbloc col col-sm-6 col-lg-4">
+                <div class="administrative-location">
+                    <h4 class="item-key">{{ 'accompanying_course.administrative_location'|trans }}</h4>
+                    {{ accompanyingCourse.administrativeLocation.name }} ({{ accompanyingCourse.administrativeLocation.locationType.title|localize_translatable_string }})
+                </div>
+            </div>
+        {% endif %}
+
     </div>
 
     <div class="social-actions my-4">

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

@@ -3,7 +3,6 @@
         {% for accompanying_period in accompanying_periods %}
             <div class="item-bloc">
                 <div class="item-row">
-
                     <div class="wrap-header">
                         <div class="wh-row">
                             <div class="wh-col">
@@ -127,6 +126,12 @@
                             <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': accompanying_period.id }) }}"
                                class="btn btn-show" title="{{ 'See accompanying period'|trans }}">{# {{ 'See this period'|trans }} #}</a>
                         </li>
+                        {% if accompanying_period.step == 'DRAFT' %}
+                        <li>
+                            <a href="{{ path('chill_person_accompanying_course_delete', { 'accompanying_period_id': accompanying_period.id, 'person_id' : person.id }) }}"
+                               class="btn btn-delete" title="{{ 'Delete accompanying period'|trans }}">{# {{ 'Delete this period'|trans }} #}</a>
+                        </li>
+                        {% endif %}
 
                         <!-- if new accompanying course, this is not necessary
                         {% if person is defined %}

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

@@ -13,6 +13,7 @@ namespace Chill\PersonBundle\Serializer\Normalizer;
 
 use Chill\DocGeneratorBundle\Serializer\Helper\NormalizeNullValueHelper;
 use Chill\MainBundle\Entity\Address;
+use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher;
@@ -68,6 +69,7 @@ class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterf
         'resources' => Collection::class,
         'location' => Address::class,
         'locationPerson' => Person::class,
+        'administrativeLocation' => Location::class,
     ];
 
     private ClosingMotiveRender $closingMotiveRender;
@@ -111,6 +113,7 @@ class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterf
             $dateContext = array_merge($context, ['docgen:expects' => DateTime::class, 'groups' => 'docgen:read']);
             $userContext = array_merge($context, ['docgen:expects' => User::class, 'groups' => 'docgen:read']);
             $participationContext = array_merge($context, ['docgen:expects' => AccompanyingPeriodParticipation::class, 'groups' => 'docgen:read']);
+            $administrativeLocationContext = array_merge($context, ['docgen:expects' => Location::class, 'groups' => 'docgen:read']);
 
             return [
                 'id' => $period->getId(),
@@ -153,8 +156,10 @@ class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterf
                 'requestorKind' => $period->getRequestorKind(),
                 'hasLocation' => $period->getLocation() !== null,
                 'hasLocationPerson' => $period->getPersonLocation() !== null,
+                'hasAdministrativeLocation' => $period->getAdministrativeLocation() !== null,
                 'locationPerson' => $this->normalizer->normalize($period->getPersonLocation(), $format, array_merge($context, ['docgen:expects' => Person::class])),
                 'location' => $this->normalizer->normalize($period->getLocation(), $format, $addressContext),
+                'administrativeLocation' => $this->normalizer->normalize($period->getAdministrativeLocation(), $format, $administrativeLocationContext),
             ];
         }
 
@@ -172,6 +177,7 @@ class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterf
                     'confidential' => false,
                     'hasLocation' => false,
                     'hasLocationPerson' => false,
+                    'hasAdministrativeLocation' => false,
                 ]
             );
         }

src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizerTest.php

@@ -94,10 +94,15 @@ final class AccompanyingPeriodDocGenNormalizerTest extends KernelTestCase
             'hasRequestorThirdParty' => false,
             'requestorPerson' => '@ignored',
             'requestorThirdParty' => '@ignored',
+            'administrativeLocation' => '@ignored',
+            'hasAdministrativeLocation' => false,
+            'hasLocation' => false,
+            'hasLocationPerson' => false,
+            'location' => '@ignored',
+            'locationPerson' => '@ignored',
         ];
 
         $this->assertIsArray($data);
-        $this->markTestSkipped('still in specification');
         $this->assertEqualsCanonicalizing(array_keys($expected), array_keys($data));
 
         foreach ($expected as $key => $item) {
@@ -149,10 +154,15 @@ final class AccompanyingPeriodDocGenNormalizerTest extends KernelTestCase
             'requestorPerson' => '@ignored',
             'requestorThirdParty' => '@ignored',
             'isNull' => true,
+            'administrativeLocation' => '@ignored',
+            'hasAdministrativeLocation' => false,
+            'hasLocation' => false,
+            'hasLocationPerson' => false,
+            'location' => '@ignored',
+            'locationPerson' => '@ignored',
         ];
 
         $this->assertIsArray($data);
-        $this->markTestSkipped('still in specification');
         $this->assertEqualsCanonicalizing(array_keys($expected), array_keys($data));
 
         foreach ($expected as $key => $item) {

src/Bundle/ChillPersonBundle/migrations/Version20211223150721.php

@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Add location to AccompanyingPeriod.
+ */
+final class Version20211223150721 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP CONSTRAINT FK_E260A86830F20868');
+        $this->addSql('DROP INDEX IDX_E260A86830F20868');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP administrativeLocation_id');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Add location to AccompanyingPeriod';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD administrativeLocation_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD CONSTRAINT FK_E260A86830F20868 FOREIGN KEY (administrativeLocation_id) REFERENCES chill_main_location (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_E260A86830F20868 ON chill_person_accompanying_period (administrativeLocation_id)');
+    }
+}

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

@@ -216,6 +216,9 @@ Add to household now: Ajouter à un ménage
 Any resource for this accompanying course: Aucun interlocuteur privilégié pour ce parcours
 course.draft: Brouillon
 Origin: Origine de la demande
+Delete accompanying period: Supprimer la période d'accompagnement
+Are you sure you want to remove the accompanying period "%id%" ?:  Êtes-vous sûr de vouloir supprimer la période d'accompagnement %id% ?
+The accompanying course has been successfully removed.: La période d'accompagnement a été supprimée.
 
 # pickAPersonType
 Pick a person: Choisir une personne
@@ -408,6 +411,8 @@ Choose a person to locate by: Localiser auprès d'un usager concerné
 Associate at least one member with an household, and set an address to this household: Associez au moins un membre du parcours à un ménage, et indiquez une adresse à ce ménage.
 Locate by: Localiser auprès de
 fix it: Compléter
+accompanying_course:
+    administrative_location: Localisation administrative
 
 # Accompanying Course comments
 Accompanying Course Comment: Commentaire