Merge remote-tracking branch 'origin/master'

CHANGELOG.md

@@ -11,9 +11,14 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
-* [Activity form] invert 'incoming' and 'receiving' in Activity form
+* [Datepickers] datepickers fixed when using keyboard to enter date (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/545)
-* [Activity form] keep the same order for 'attendee' field in new and edit form
+* [social_action] Display 'agents traitants' in parcours resumé and social action list (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/568)
-* [list with period] use "sameas" test operator to introduce requestor in list
+* [Person_search] Closed parcours shown within an accordeon that can be opened/closed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/574)
+
+## Test releases
+
+### 2021-04-24
+
 * [notification email on course designation] allow raw string in email content generation
 * [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older
 * [Documents] Change wording 'créer' to 'enregistrer' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/634)
@@ -25,10 +30,15 @@ and this project adheres to
 * [Course comment] add validationConstraint NotNull and NotBlank on comment content, to avoid sql error
 * [Notifications] delay the sending of notificaiton to kernel.terminate
 * [Notifications / Period user change] fix the sending of notification when user changes 
+* [Activity form] invert 'incoming' and 'receiving' in Activity form
+* [Activity form] keep the same order for 'attendee' field in new and edit form
+* [list with period] use "sameas" test operator to introduce requestor in list
+* [notification email on course designation] allow raw string in email content generation
+* [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older
 
-## Test releases
 
 ### 2021-04-13
+
 * [person] household address: add a form for editing the validFrom date (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/541)
 * [person] householdmemberseditor: fix composition type bug in select form (vuejs) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/543)
 * [docgen] add more persons choices in docgen for course: amongst requestor (if person), resources of course (if person), and PersonResource (if person);

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

@@ -111,7 +111,7 @@ export default {
          return this.$store.state.socialIssuesOther;
       },
       socialActionsList() {
-         return this.$store.state.socialActionsList;
+         return this.$store.getters.socialActionsListSorted;
       },
       socialActionsSelected() {
          return this.$store.state.activity.socialActions;

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

@@ -101,6 +101,9 @@ const store = createStore({
                             state.activity.activityType.thirdPartiesVisible !== 0)
                 );
         },
+        socialActionsListSorted(state) {
+            return [ ...state.socialActionsList].sort((a, b) => a.ordering - b.ordering);
+        },
     },
     mutations: {
         // SocialIssueAcc
@@ -131,7 +134,6 @@ const store = createStore({
             state.socialActionsList = [];
         },
         addActionInList(state, action) {
-            //console.log('add action list', action.id);
             state.socialActionsList.push(action);
         },
         updateActionsSelected(state, actions) {

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

@@ -16,6 +16,9 @@
 // Chill forms
 @import './scss/forms';
 
+// Extend bootstrap accordion
+@import './scss/accordion';
+
 // Chill record_actions
 @import './scss/record_actions';
 

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

@@ -0,0 +1,11 @@
+.accordion {
+    // show a folded / label on accordion
+    button[aria-expanded="true"] > span.folded,
+    button[aria-expanded="false"] > span.unfolded { display: none; }
+    button[aria-expanded="false"] > span.folded,
+    button[aria-expanded="true"] > span.unfolded { display: inline; }
+
+    .accordion-item {
+        margin-bottom: 1rem;
+    }
+}

src/Bundle/ChillPersonBundle/Resources/public/chill/scss/flex_table.scss

@@ -30,6 +30,7 @@ div.list-with-period {
 
     // override wrap-list
     div.wrap-list.periods-list {
+        padding-right: 1rem;
         div.wl-row {
             flex-wrap: nowrap;
             div.wl-col {
@@ -63,6 +64,7 @@ div.list-with-period {
     }
 
     div.periods-list {
+        padding-right: 1rem;
         div.title {
             text-align: right;
             div.date {}

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

@@ -5,9 +5,8 @@
     </h2>
     <div>
         <div class="mb-3 row">
-            <label class="col-form-label col-sm-4">{{ $t('startdate.date') }}</label>
+            <div class="col-sm-12 date-update">
-            <div class="col-sm-8">
+                <input class="form-control" type="date" id="startDate" v-model="startDateInput">
-                <input class="form-control" type="date" v-model="startDate" @change="updateStartDate" />
             </div>
         </div>
     </div>
@@ -17,30 +16,54 @@
 
 <script>
 
-import { datetimeToISO, dateToISO, ISOToDate, ISOToDatetime} from 'ChillMainAssets/chill/js/date.js';
+import { dateToISO, ISOToDatetime} from 'ChillMainAssets/chill/js/date.js';
-import { mapState, mapGetters } from 'vuex';
+import { mapState } from 'vuex';
 
 export default {
     name: 'startDate',
-    methods: {
+    data() {
-        updateStartDate(event) {
+        return {
-            const date = event.target.value;
+            lastRecordedDate: null
-            // console.log(date)
+        }
-            this.$store.dispatch('updateStartDate', date)
+    },
+    computed: {
+        ...mapState({
+            startDate: state => dateToISO(ISOToDatetime(state.accompanyingCourse.openingDate.datetime))
+        }),
+        startDateInput: {
+            get() {
+                return this.startDate;
+            },
+            set(value) {
+                this.lastRecordedDate = value;
+
+                setTimeout(() => {
+                    console.log('timeout finished')
+                    if (this.lastRecordedDate === value) {
+                        console.log('last recorded', this.lastRecordedDate, 'value', value)
+                        this.$store.dispatch('updateStartDate', 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'})
                                 }
-            });
-        },
-    },
-    computed: {
-        ...mapState({
-            startDate: state => dateToISO(ISOToDatetime(state.accompanyingCourse.openingDate.datetime))
                         })
                     }
+                }, 3000)
+            }
+        }
+    }
 }
 
 </script>
+
+<style lang="scss" scoped>
+.date-update {
+    display: flex;
+    justify-content: space-between;
+    &-btn {
+        margin-left: 1rem;
+    }
+}
+</style>

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

@@ -153,7 +153,7 @@ const appMessages = {
       },
       startdate: {
          change: "Date d'ouverture",
-         date: "Date d'ouverture",
+         // update: "La nouvelle date d'ouverture a été enregistrée"
       },
       // 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

@@ -322,7 +322,6 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                }
             },
             updateStartDate(state, date) {
-               console.log('new state date', date)
                state.accompanyingCourse.openingDate = date;
             }
          },
@@ -814,11 +813,9 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                   })
             },
             updateStartDate({commit}, payload) {
-               console.log('payload', payload)
-               const date = ISOToDate(payload);
                const url = `/api/1.0/person/accompanying-course/${id}.json`;
-               const body = { type: "accompanying_period", openingDate: { datetime: datetimeToISO(date) }};
+               const date = payload === null || payload === '' ? null : { datetime: datetimeToISO(ISOToDate(payload)) }
-               console.log('body', body)
+               const body = { type: "accompanying_period", openingDate: date};
                return makeFetch('PATCH', url, body)
                   .then((response) => {
                      commit('updateStartDate', response.openingDate);

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

@@ -227,19 +227,18 @@ export default {
     },
     startDate: {
       get() {
-        let d = this.$store.state.startDate;
+        return this.$store.state.startDate;
-        return dateToISO(d);
       },
       set(value) {
-        this.$store.commit('setStartDate', ISOToDate(value));
+        this.$store.commit('setStartDate', value);
       }
     },
     endDate: {
       get() {
-        return dateToISO(this.$store.state.endDate);
+        return this.$store.state.endDate;
       },
       set(value) {
-        this.$store.commit('setEndDate', ISOToDate(value));
+        this.$store.commit('setEndDate', value);
       }
     },
     setSocialIssue: {

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

@@ -1,6 +1,6 @@
 
 import { createStore } from 'vuex';
-import { datetimeToISO } from 'ChillMainAssets/chill/js/date.js';
+import { datetimeToISO, dateToISO, ISOToDate, ISOToDatetime } from 'ChillMainAssets/chill/js/date.js';
 import { findSocialActionsBySocialIssue } from 'ChillPersonAssets/vuejs/_api/SocialWorkSocialAction.js';
 // import { create } from 'ChillPersonAssets/vuejs/_api/AccompanyingCourseWork.js';
 import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
@@ -20,7 +20,7 @@ const store = createStore({
       .map(p => p.person),
     personsReachables: window.accompanyingCourse.participations.filter(p => p.endDate == null)
       .map(p => p.person),
-    startDate: new Date(),
+    startDate: dateToISO(new Date()),
     endDate: null,
     isLoadingSocialActions: false,
     isPostingWork: false,
@@ -47,7 +47,7 @@ const store = createStore({
           id: state.socialActionPicked.id
         },
         startDate: {
-          datetime: datetimeToISO(state.startDate)
+          datetime: datetimeToISO(ISOToDate(state.startDate))
         },
         persons: []
       };
@@ -61,7 +61,7 @@ const store = createStore({
 
       if (null !== state.endDate) {
         payload.endDate = {
-          datetime: datetimeToISO(state.endDate)
+          datetime: datetimeToISO(ISOToDate(state.endDate))
         };
       }
 
@@ -111,6 +111,7 @@ const store = createStore({
       state.startDate = date;
     },
     setEndDate(state, date) {
+      console.log(date)
       state.endDate = date;
     },
     setPersonsPickedIds(state, ids) {

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

@@ -439,18 +439,18 @@ export default {
       ]),
       startDate: {
          get() {
-            return dateToISO(this.$store.state.startDate);
+            return this.$store.state.startDate;
          },
          set(v) {
-            this.$store.commit('setStartDate', ISOToDate(v));
+            this.$store.commit('setStartDate', v);
          }
       },
       endDate: {
          get() {
-            return dateToISO(this.$store.state.endDate);
+            return this.$store.state.endDate;
          },
          set(v) {
-            this.$store.commit('setEndDate', ISOToDate(v));
+            this.$store.commit('setEndDate', v);
          }
       },
       note: {
@@ -521,7 +521,7 @@ export default {
          this.$store.commit('removeReferrer', u);
       },
       goToGenerateWorkflow({link}) {
-        console.log('save before leave to generate workflow')
+         // console.log('save before leave to generate workflow')
          const callback = (data) => {
             window.location.assign(link);
          };

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

@@ -309,26 +309,27 @@ export default {
       },
       startDate: {
          get() {
-          return dateToISO(this.evaluation.startDate);
+            console.log('evaluation', this.evaluation);
+            return this.evaluation.startDate;
          },
          set(v) {
-          this.$store.commit('setEvaluationStartDate', { key: this.evaluation.key, date: ISOToDate(v) });
+            this.$store.commit('setEvaluationStartDate', { key: this.evaluation.key, date: v });
          }
       },
       endDate: {
          get() {
-          return dateToISO(this.evaluation.endDate);
+            return this.evaluation.endDate;
          },
          set(v) {
-          this.$store.commit('setEvaluationEndDate', { key: this.evaluation.key, date: ISOToDate(v) });
+            this.$store.commit('setEvaluationEndDate', { key: this.evaluation.key, date: v });
          }
       },
       maxDate: {
          get() {
-          return dateToISO(this.evaluation.maxDate);
+            return this.evaluation.maxDate;
          },
          set(v) {
-          this.$store.commit('setEvaluationMaxDate', { key: this.evaluation.key, date: ISOToDate(v) });
+            this.$store.commit('setEvaluationMaxDate', { key: this.evaluation.key, date: v });
          }
       },
       warningInterval: {

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

@@ -1,5 +1,5 @@
 import { createStore } from 'vuex';
-import { datetimeToISO, ISOToDatetime, intervalDaysToISO, intervalISOToDays } from 'ChillMainAssets/chill/js/date.js';
+import { dateToISO, ISOToDate, datetimeToISO, ISOToDatetime, intervalDaysToISO, intervalISOToDays } from 'ChillMainAssets/chill/js/date.js';
 import { findSocialActionsBySocialIssue } from 'ChillPersonAssets/vuejs/_api/SocialWorkSocialAction.js';
 import { create } from 'ChillPersonAssets/vuejs/_api/AccompanyingCourseWork.js';
 import { fetchResults, makeFetch } from 'ChillMainAssets/lib/api/apiMethods.js';
@@ -13,9 +13,9 @@ const store = createStore({
   state: {
     work: window.accompanyingCourseWork,
     startDate: window.accompanyingCourseWork.startDate !== null ?
-        ISOToDatetime(window.accompanyingCourseWork.startDate.datetime) : null,
+        dateToISO(new Date(window.accompanyingCourseWork.startDate.datetime)) : null,
     endDate: window.accompanyingCourseWork.endDate !== null ?
-        ISOToDatetime(window.accompanyingCourseWork.endDate.datetime) : null,
+        dateToISO(new Date(window.accompanyingCourseWork.endDate.datetime)) : null,
     note: window.accompanyingCourseWork.note,
     goalsPicked: window.accompanyingCourseWork.goals,
     goalsForAction: [],
@@ -69,14 +69,15 @@ const store = createStore({
       return [];
     },
     buildPayload(state) {
+      console.log('end date', state.endDate);
       return {
         type: 'accompanying_period_work',
         id: state.work.id,
-        startDate: state.startDate === null ? null : {
+        startDate: state.startDate === null || state.startDate === '' ? null : {
-          datetime: datetimeToISO(state.startDate)
+          datetime: datetimeToISO(ISOToDate(state.startDate))
         },
-        endDate: state.endDate === null ? null : {
+        endDate: state.endDate === null || state.endDate === '' ? null : {
-          datetime: datetimeToISO(state.endDate)
+          datetime: datetimeToISO(ISOToDate(state.endDate))
         },
         note: state.note,
         persons: state.personsPicked.map(p => ({id: p.id, type: p.type})),
@@ -110,9 +111,9 @@ const store = createStore({
               id: e.evaluation.id,
               type: e.evaluation.type
             },
-            startDate: e.startDate !== null ? { datetime: datetimeToISO(e.startDate) } : null,
+            startDate: e.startDate === null || e.startDate === '' ? null : { datetime: datetimeToISO(ISOToDate(e.startDate)) },
-            endDate: e.endDate !== null ? { datetime: datetimeToISO(e.endDate) } : null,
+            endDate: e.endDate === null || e.endDate === '' ? null : { datetime: datetimeToISO(ISOToDate(e.endDate)) },
-            maxDate: e.maxDate !== null ? { datetime: datetimeToISO(e.maxDate) } : null,
+            maxDate: e.maxDate === null || e.maxDate === '' ? null : { datetime: datetimeToISO(ISOToDate(e.maxDate)) },
             warningInterval: intervalDaysToISO(e.warningInterval),
             comment: e.comment,
             documents: e.documents
@@ -132,9 +133,9 @@ const store = createStore({
         var k = Object.assign(e, {
           key: index,
           editEvaluation: false,
-          startDate: e.startDate !== null ? ISOToDatetime(e.startDate.datetime) : null,
+          startDate: e.startDate !== null ? dateToISO(new Date(e.startDate.datetime)) : null,
-          endDate: e.endDate !== null ? ISOToDatetime(e.endDate.datetime) : null,
+          endDate: e.endDate !== null ? dateToISO(new Date(e.endDate.datetime)) : null,
-          maxDate: e.maxDate !== null ? ISOToDatetime(e.maxDate.datetime) : null,
+          maxDate: e.maxDate !== null ? dateToISO(new Date(e.maxDate.datetime)) : null,
           warningInterval: e.warningInterval !== null ? intervalISOToDays(e.warningInterval) : null,
           documents: e.documents.map((d, docIndex) => {
             return Object.assign(d, {
@@ -264,6 +265,7 @@ const store = createStore({
           .startDate = date;
     },
     setEvaluationEndDate(state, {key, date}) {
+      console.log('commit date', date)
       state.evaluationsPicked.find(e => e.key === key)
           .endDate = date;
     },

src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Dates.vue

@@ -66,18 +66,19 @@ export default {
     },
     startDate: {
       get() {
-        return [
+        return this.$store.state.startDate;
-          this.$store.state.startDate.getFullYear(),
+        // return [
-          (this.$store.state.startDate.getMonth() + 1).toString().padStart(2, '0'),
+        //   this.$store.state.startDate.getFullYear(),
-          this.$store.state.startDate.getDate().toString().padStart(2, '0')
+        //   (this.$store.state.startDate.getMonth() + 1).toString().padStart(2, '0'),
-        ].join('-');
+        //   this.$store.state.startDate.getDate().toString().padStart(2, '0')
+        // ].join('-');
       },
       set(value) {
-        let
+        // let
-          [year, month, day] = value.split('-'),
+        //   [year, month, day] = value.split('-'),
-            dValue = new Date(year, month-1, day);
+        //     dValue = new Date(year, month-1, day);
 
-        this.$store.dispatch('setStartDate', dValue);
+        this.$store.dispatch('setStartDate', value);
       }
     }
   }

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

@@ -2,7 +2,7 @@ import { createStore } from 'vuex';
 import { householdMove, fetchHouseholdSuggestionByAccompanyingPeriod, fetchAddressSuggestionByPerson} from './../api.js';
 import { fetchResults } from 'ChillMainAssets/lib/api/apiMethods.js'
 import { fetchHouseholdByAddressReference } from 'ChillPersonAssets/lib/household.js';
-import { datetimeToISO } from 'ChillMainAssets/chill/js/date.js';
+import { datetimeToISO, dateToISO, ISOToDate } from 'ChillMainAssets/chill/js/date.js';
 
 const debug = process.env.NODE_ENV !== 'production';
 
@@ -30,7 +30,7 @@ const store = createStore({
         }
         return 0;
       }),
-    startDate: new Date(),
+    startDate: dateToISO(new Date()),
     /**
      * Indicates if the destination is:
      *
@@ -278,7 +278,7 @@ const store = createStore({
             type: conc.person.type
           },
           start_date: {
-            datetime: datetimeToISO(state.startDate)
+            datetime: state.startDate === null || state.startDate === '' ? null : datetimeToISO(ISOToDate(state.startDate))
           }
         };
 
@@ -302,7 +302,7 @@ const store = createStore({
           },
           number_of_children: state.numberOfChildren,
           start_date: {
-            datetime: datetimeToISO(state.startDate),
+            datetime: datetimeToISO(ISOToDate(state.startDate)),
           },
         };
       }

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

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

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

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

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

@@ -20,7 +20,7 @@
                     {% elseif period.step == 'CONFIRMED' %}
                         <span class="badge bg-primary">{{- 'Confirmed'|trans|upper -}}</span>
                     {% else %}
-                        <span class="badge bg-primary">{{- 'Closed'|trans|upper -}}</span>
+                        <span class="badge bg-danger">{{- 'Closed'|trans|upper -}}</span>
                     {% endif %}
                 </div>
             </div>

src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig

@@ -10,12 +10,6 @@
     {% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' %}
 
     {% if accompanying_periods_old|length > 0 %}
-        <style>
-                button[aria-expanded="true"] > span.folded,
-                button[aria-expanded="false"] > span.unfolded { display: none; }
-                button[aria-expanded="false"] > span.folded,
-                button[aria-expanded="true"] > span.unfolded { display: inline; }
-            </style>
             <div class="accordion" id="nonCurrent">
                 <div class="accordion-item">
                     <h2 class="accordion-header" id="heading_{{ household.id }}">

src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig

@@ -191,12 +191,6 @@
               {% endif %}
 
               {% if old_members|length > 0 %}
-                <style>
-                    button[aria-expanded="true"] > span.folded,
-                    button[aria-expanded="false"] > span.unfolded { display: none; }
-                    button[aria-expanded="false"] > span.folded,
-                    button[aria-expanded="true"] > span.unfolded { display: inline; }
-                </style>
                 <div class="accordion" id="nonCurrent">
                     <div class="accordion-item">
                         <h2 class="accordion-header" id="heading_{{ p == '_none' ? '_none' : p.id }}">

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

@@ -10,71 +10,7 @@
     </li>
 {% endmacro %}
 
-<div class="list-with-period">
+{% macro accompanying_period(acp, person) %}
-
-    <h2>{{ title|default('Person search results')|trans }}</h2>
-
-    <p>
-        {{ '%total% persons matching the search pattern:'|transchoice( total, { '%total%' : total}) }}
-        <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-sm">
-            <i class="fa fa-fw fa-search" aria-hidden="true"></i> {{ pattern }}
-        </a>
-    </p>
-
-    <p>{{ 'Results %start%-%end% of %total%'|trans({ '%start%' : start, '%end%': start + persons|length, '%total%' : total } ) }}</p>
-
-    <ul class="record_actions">
-        {% if is_granted('CHILL_PERSON_CREATE') %}
-            <li>
-                <a href="{{ path('chill_person_new', { "_fragment": pattern }) }}" class="btn btn-create">
-                    {{ 'Add a person'|trans }}
-                </a>
-            </li>
-        {% endif %}
-        {% if search_name != "person_similarity" %}
-            <li>
-                <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-action">
-                    <i class="fa fa-fw fa-search" aria-hidden="true"></i>
-                    {{ 'Advanced search'|trans }}
-                </a>
-            </li>
-        {% endif %}
-        {% if preview == true and persons | length < total %}
-            <li>
-                <a href="{{ path('chill_main_search', { "name": search_name|default('abcd'), "q" : pattern }) }}" class="btn btn-misc">
-                    {{ 'See all results'|trans }}
-                </a>
-            </li>
-        {% endif %}
-    </ul>
-
-    {% if persons|length > 0 %}
-        <div class="flex-table">
-            {% for person in persons %}
-                <div class="item-bloc">
-
-                    {{ person|chill_entity_render_box({
-                        'render': 'bloc',
-                        'addLink': true,
-                        'addInfo': true,
-                        'addAge': true,
-                        'addAltNames': true,
-                        'addCenter': true,
-                        'address_multiline': false,
-                        'customButtons': { 'after': _self.button_person_after(person) }
-                    }) }}
-
-                    {#- 'acps' is for AcCompanyingPeriodS #}
-                    {%- set acps = [] %}
-                    {%- for acp in person.accompanyingPeriodInvolved %}
-                        {%- if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE', acp) %}
-                            {%- set acps = acps|merge([acp]) %}
-                        {%- endif %}
-                    {%- endfor %}
-                    {# add as requestor #}
-
-                    {% if acps|length > 0 %}
-                        {% for acp in acps %}
     {% set app = person.findParticipationForPeriod(acp) %}
         <div class="item-row separator">
             <div class="wrap-list periods-list">
@@ -118,7 +54,7 @@
                             {% endif %}
 
                             {% if acp.step == 'CLOSED' %}
-                                                    <span class="badge bg-secondary" style="font-size: 85%;" title="{{ 'course.closed'|trans }}">{{ 'course.closed'|trans }}</span>
+                                <span class="badge bg-danger" style="font-size: 85%;" title="{{ 'course.closed'|trans }}">{{ 'course.closed'|trans }}</span>
                             {% endif %}
                         </div>
                     </div>
@@ -221,12 +157,113 @@
                         </a>
                     </li>
                 </ul>
+            </div>
+        </div>
+{% endmacro %}
 
-                                </div>
+<div class="list-with-period">
-                            </div>
+
+    <h2>{{ title|default('Person search results')|trans }}</h2>
+
+    <p>
+        {{ '%total% persons matching the search pattern:'|transchoice( total, { '%total%' : total}) }}
+        <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-sm">
+            <i class="fa fa-fw fa-search" aria-hidden="true"></i> {{ pattern }}
+        </a>
+    </p>
+
+    <p>{{ 'Results %start%-%end% of %total%'|trans({ '%start%' : start, '%end%': start + persons|length, '%total%' : total } ) }}</p>
+
+    <ul class="record_actions">
+        {% if is_granted('CHILL_PERSON_CREATE') %}
+            <li>
+                <a href="{{ path('chill_person_new', { "_fragment": pattern }) }}" class="btn btn-create">
+                    {{ 'Add a person'|trans }}
+                </a>
+            </li>
+        {% endif %}
+        {% if search_name != "person_similarity" %}
+            <li>
+                <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-action">
+                    <i class="fa fa-fw fa-search" aria-hidden="true"></i>
+                    {{ 'Advanced search'|trans }}
+                </a>
+            </li>
+        {% endif %}
+        {% if preview == true and persons | length < total %}
+            <li>
+                <a href="{{ path('chill_main_search', { "name": search_name|default('abcd'), "q" : pattern }) }}" class="btn btn-misc">
+                    {{ 'See all results'|trans }}
+                </a>
+            </li>
+        {% endif %}
+    </ul>
+
+    {% if persons|length > 0 %}
+        <div class="flex-table">
+            {% for person in persons %}
+                <div class="item-bloc">
+
+                    {{ person|chill_entity_render_box({
+                        'render': 'bloc',
+                        'addLink': true,
+                        'addInfo': true,
+                        'addAge': true,
+                        'addAltNames': true,
+                        'addCenter': true,
+                        'address_multiline': false,
+                        'customButtons': { 'after': _self.button_person_after(person) }
+                    }) }}
+
+                    {#- 'acps' is for AcCompanyingPeriodS #}
+                    {%- set acps = [] %}
+                    {%- set acpsClosed = [] %}
+                    {%- for acp in person.accompanyingPeriodInvolved %}
+                        {%- if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE', acp) %}
+                            {% if acp.step == 'CLOSED' %}
+                                {%- set acpsClosed = acpsClosed|merge([acp]) %}
+                            {% else %}
+                                {%- set acps = acps|merge([acp]) %}
+                            {% endif %}
+                        {%- endif %}
+                    {%- endfor %}
+                    {# add as requestor #}
+
+                    {% if acps|length > 0 %}
+                        {% for acp in acps %}
+                            {{ _self.accompanying_period(acp, person) }}
                         {% endfor %}
                     {% endif %}
 
+                    {% if acpsClosed|length > 0 %}
+                        <div class="accordion" id="member_{{ person.id }}">
+                            <div class="accordion-item">
+                                <h2 class="accordion-header" id="heading_{{ person.id }}">
+                                    <button
+                                        class="accordion-button collapsed"
+                                        type="button"
+                                        data-bs-toggle="collapse"
+                                        data-bs-target="#collapse_{{ person.id }}"
+                                        aria-expanded="false"
+                                        aria-controls="collapse_{{ person.id }}">
+                                        <span class="folded">{{ 'periods.show closed periods'|trans({ 'nb_items': acpsClosed|length }) }}</span>
+                                        <span class="unfolded text-secondary">{{ 'periods.hide closed periods'|trans({ 'nb_items': acpsClosed|length }) }}</span>
+                                    </button>
+                                </h2>
+
+                                <div id="collapse_{{ person.id }}"
+                                    class="accordion-collapse collapse"
+                                    aria-labelledby="heading_{{ person.id }}"
+                                    data-bs-parent="#nonCurrent">
+                                    {% for acp in acpsClosed %}
+                                            {{ _self.accompanying_period(acp, person) }}
+                                    {% endfor %}
+                                </div>
+                            </div>
+                        </div>
+                    {% endif %}
+
+
                 </div>
             {% endfor %}
         </div>

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

@@ -40,6 +40,7 @@ class SocialActionNormalizer implements NormalizerAwareInterface, NormalizerInte
                     'desactivationDate' => $this->normalizer->normalize($socialAction->getDesactivationDate(), $format, $context),
                     'title' => $socialAction->getTitle(),
                     'issue' => $this->normalizer->normalize($socialAction->getIssue(), $format, $context),
+                    'ordering' => $socialAction->getOrdering(),
                 ];
 
             case 'docgen':

src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml

@@ -114,3 +114,19 @@ household_composition:
             few {# enfants dans le ménage}
             other {# enfants dans le ménage}
         }
+
+periods:
+    show closed periods: >-
+        {nb_items, plural,
+            =0 {Aucun parcours clôturé}
+            one {Montrer un parcours clôturé}
+            many {Montrer # parcours clôturés}
+            other {Montrer # parcours clôturés}
+        }
+    hide closed periods: >-
+        {nb_items, plural,
+            =0 {Aucun parcours clôturé}
+            one {Masquer un parcours clôturé}
+            many {Masquer # parcours clôturés}
+            other {Masquer # parcours clôturés}
+        }

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

@@ -214,7 +214,7 @@ No requestor: Pas de demandeur
 No resources: "Pas d'interlocuteurs privilégiés"
 Persons associated: Usagers concernés
 Referrer: Référent
-Referrers: Référents
+Referrers: Agents traitants
 Some peoples does not belong to any household currently. Add them to an household soon: Certaines personnes n'appartiennent à aucun ménage actuellement. Renseignez leur ménage dès que possible.
 Add to household now: Ajouter à un ménage
 Any resource for this accompanying course: Aucun interlocuteur privilégié pour ce parcours
@@ -465,6 +465,9 @@ fix it: Compléter
 accompanying_course:
     administrative_location: Localisation administrative
     comment is pinned: Le commentaire est épinglé
+show: Montrer
+hide: Masquer
+closed periods: parcours clôturer
 
 # Accompanying Course comments
 Accompanying Course Comment: Commentaire