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

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

@@ -1,5 +1,5 @@
 <template>
-   <teleport to="#add-persons">
+   <teleport to="#add-persons" v-if="isComponentVisible">
 
       <div class="flex-bloc concerned-groups" :class="getContext">
          <persons-bloc
@@ -9,11 +9,13 @@
             v-bind:setPersonsInBloc="setPersonsInBloc">
          </persons-bloc>
       </div>
-
-     <div v-if="getContext === 'accompanyingCourse' && filterSuggestedPersons.length > 0">
-        <ul>
-          <li v-for="p in filterSuggestedPersons" @click="addNewPerson(p)">
-             {{ p.text }}
+     <div v-if="getContext === 'accompanyingCourse' && suggestedEntities.length > 0">
+         <ul class="list-unstyled">
+          <li v-for="p in suggestedEntities" @click="addSuggestedEntity(p)">
+             <span class="badge bg-primary" style="cursor: pointer;">
+                 <i class="fa fa-plus fa-fw text-success"></i>
+                 {{ p.text }}
+             </span>
           </li>
         </ul>
      </div>
@@ -22,7 +24,7 @@
          buttonTitle="activity.add_persons"
          modalTitle="activity.add_persons"
          v-bind:key="addPersons.key"
-         v-bind:options="addPersons.options"
+         v-bind:options="addPersonsOptions"
          @addNewPersons="addNewPersons"
          ref="addPersons">
       </add-persons>
@@ -52,38 +54,35 @@ export default {
             {  key: 'personsAssociated',
                title: 'activity.bloc_persons_associated',
                persons: [],
-               included: false
+               included: window.activity ? window.activity.activityType.personsVisible !== 0 : true
             },
             {  key: 'personsNotAssociated',
                title: 'activity.bloc_persons_not_associated',
                persons: [],
-               included: false
+               included: window.activity ? window.activity.activityType.personsVisible !== 0 : true
             },
             {  key: 'thirdparty',
                title: 'activity.bloc_thirdparty',
                persons: [],
-               included: true
+               included: window.activity ? window.activity.activityType.thirdPartiesVisible !== 0 : true
             },
             {  key: 'users',
                title: 'activity.bloc_users',
                persons: [],
-               included: true
+               included: window.activity ? window.activity.activityType.usersVisible !== 0 : true
             },
          ],
          addPersons: {
-            key: 'activity',
-            options: {
-               type: ['person', 'thirdparty', 'user'],
-               priority: null,
-               uniq: false,
-               button: {
-                   size: 'btn-sm'
-               }
-            }
+            key: 'activity'
          }
       }
    },
    computed: {
+      isComponentVisible() {
+         return window.activity
+             ? (window.activity.activityType.personsVisible !== 0 || window.activity.activityType.thirdPartiesVisible !== 0 || window.activity.activityType.usersVisible !== 0)
+             : true
+      },
       ...mapState({
          persons: state => state.activity.persons,
          thirdParties: state => state.activity.thirdParties,
@@ -91,14 +90,38 @@ export default {
          accompanyingCourse: state => state.activity.accompanyingPeriod
       }),
       ...mapGetters([
-          'filterSuggestedPersons'
+          'suggestedEntities'
       ]),
       getContext() {
          return (this.accompanyingCourse) ? "accompanyingCourse" : "person";
       },
       contextPersonsBlocs() {
          return this.personsBlocs.filter(bloc => bloc.included !== false);
-      }
+      },
+      addPersonsOptions() {
+         let optionsType = [];
+         if (window.activity) {
+            if (window.activity.activityType.personsVisible !== 0) {
+               optionsType.push('person')
+            }
+            if (window.activity.activityType.thirdPartiesVisible !== 0) {
+               optionsType.push('thirdparty')
+            }
+            if (window.activity.activityType.usersVisible !== 0) {
+               optionsType.push('user')
+            }
+         } else {
+            optionsType = ['person', 'thirdparty', 'user'];
+         }
+         return {
+            type: optionsType,
+            priority: null,
+            uniq: false,
+            button: {
+                  size: 'btn-sm'
+            }
+         }
+      },
    },
    mounted() {
       this.setPersonsInBloc();
@@ -168,7 +191,7 @@ export default {
       },
       addNewPersons({ selected, modal }) {
          console.log('@@@ CLICK button addNewPersons', selected);
-         selected.forEach(function(item) {
+         selected.forEach((item) => {
                this.$store.dispatch('addPersonsInvolved', item);
             }, this
          );
@@ -176,7 +199,7 @@ export default {
          modal.showModal = false;
          this.setPersonsInBloc();
       },
-      addNewPerson(person) {
+      addSuggestedEntity(person) {
         this.$store.dispatch('addPersonsInvolved', { result: person, type: 'person' });
         this.setPersonsInBloc();
       },

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue

@@ -4,7 +4,7 @@
          <span class="chill_denomination">
             {{ textCutted }}
          </span>
-         <a class="fa fa-fw fa-times"
+         <a class="fa fa-fw fa-times text-danger text-decoration-none"
             @click.prevent="$emit('remove', person)">
          </a>
       </span>

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

@@ -55,16 +55,17 @@ export default {
         }
     },
     mounted() {
-        this.getLocationsList();
+        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();
+        }))
     },
     methods: {
-        getLocationsList() {
-            getLocations().then(response => new Promise(resolve => {
-                console.log('getLocations', response);
-                this.locations = response.results;
-                resolve();
-            }))
-        },
         customLabel(value) {
             return `${value.locationType.title.fr} ${value.name ? value.name : ''}`;
         }

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

@@ -19,172 +19,294 @@ const removeIdFromValue = (string, id) => {
 };
 
 const store = createStore({
-  strict: debug,
-  state: {
-    activity: window.activity,
-    socialIssuesOther: [],
-    socialActionsList: [],
-  },
-  getters: {
-    filterSuggestedPersons(state) {
-      if (typeof(state.activity.accompanyingPeriod) === 'undefined') {
-        return [];
-      }
-      let existingPersonIds = state.activity.persons.map(p => p.id);
-      return state.activity.accompanyingPeriod.participations.filter(p => p.endDate === null)
-        .map(p => p.person)
-        .filter(p => !existingPersonIds.includes(p.id))
-    }
-  },
-  mutations: {
-    // SocialIssueAcc
-    addIssueInList(state, issue) {
-      //console.log('add issue list', issue.id);
-      state.activity.accompanyingPeriod.socialIssues.push(issue);
-    },
-    addIssueSelected(state, issue) {
-      //console.log('add issue selected', issue.id);
-      state.activity.socialIssues.push(issue);
-    },
-    updateIssuesSelected(state, issues) {
-      //console.log('update issues selected', issues);
-      state.activity.socialIssues = issues;
-    },
-    updateIssuesOther(state, payload) {
-      //console.log('update issues other');
-      state.socialIssuesOther = payload;
-    },
-    removeIssueInOther(state, issue) {
-      //console.log('remove issue other', issue.id);
-      state.socialIssuesOther = state.socialIssuesOther.filter(i => i.id !== issue.id);
-    },
-    resetActionsList(state) {
-      //console.log('reset list actions');
-      state.socialActionsList = [];
-    },
-    addActionInList(state, action) {
-      //console.log('add action list', action.id);
-      state.socialActionsList.push(action);
-    },
-    updateActionsSelected(state, actions) {
-      //console.log('update actions selected', actions);
-      state.activity.socialActions = actions;
-    },
-    filterList(state, list) {
-      const filterList = (list) => {
-        // remove duplicates entries
-        list = list.filter((value, index) => list.findIndex(array => array.id === value.id) === index);
-        // alpha sort
-        list.sort((a,b) => (a.text > b.text) ? 1 : ((b.text > a.text) ? -1 : 0));
-        return list;
-      };
-      if (list === 'issues') {
-        state.activity.accompanyingPeriod.socialIssues = filterList(state.activity.accompanyingPeriod.socialIssues);
-      }
-      if (list === 'actions') {
-        state.socialActionsList = filterList(state.socialActionsList);
-      }
+    strict: debug,
+    state: {
+        activity: window.activity,
+        socialIssuesOther: [],
+        socialActionsList: [],
     },
+    getters: {
+        suggestedEntities(state) {
+            console.log(state.activity);
+            if (typeof state.activity.accompanyingPeriod === "undefined") {
+                return [];
+            }
+            const allEntities = [
+                ...store.getters.suggestedPersons,
+                ...store.getters.suggestedRequestor,
+                ...store.getters.suggestedUser,
+                ...store.getters.suggestedResources,
+            ];
+            const uniqueIds = [
+                ...new Set(allEntities.map((i) => `${i.type}-${i.id}`)),
+            ];
+            return Array.from(
+                uniqueIds,
+                (id) => allEntities.filter((r) => `${r.type}-${r.id}` === id)[0]
+            );
+        },
+        suggestedPersons(state) {
+            const existingPersonIds = state.activity.persons.map((p) => p.id);
+            return state.activity.activityType.personsVisible === 0
+                ? []
+                : state.activity.accompanyingPeriod.participations
+                      .filter((p) => p.endDate === null)
+                      .map((p) => p.person)
+                      .filter((p) => !existingPersonIds.includes(p.id));
+        },
+        suggestedRequestor(state) {
+            if (state.activity.accompanyingPeriod.requestor === null) {
+                return [];
+            }
+            const existingPersonIds = state.activity.persons.map((p) => p.id);
+            const existingThirdPartyIds = state.activity.thirdParties.map(
+                (p) => p.id
+            );
 
-    // ConcernedGroups
-    addPersonsInvolved(state, payload) {
-      //console.log('### mutation addPersonsInvolved', payload.result.type);
-      switch (payload.result.type) {
-        case 'person':
-          state.activity.persons.push(payload.result);
-          break;
-        case 'thirdparty':
-          state.activity.thirdParties.push(payload.result);
-          break;
-        case 'user':
-          state.activity.users.push(payload.result);
-          break;
-      };
+            return [state.activity.accompanyingPeriod.requestor].filter(
+                (r) =>
+                    (r.type === "person" &&
+                        !existingPersonIds.includes(r.id) &&
+                        state.activity.activityType.personsVisible !== 0) ||
+                    (r.type === "thirdparty" &&
+                        !existingThirdPartyIds.includes(r.id) &&
+                        state.activity.activityType.thirdPartiesVisible !== 0)
+            );
+        },
+        suggestedUser(state) {
+            const existingUserIds = state.activity.users.map((p) => p.id);
+            return state.activity.activityType.usersVisible === 0
+                ? []
+                : [state.activity.accompanyingPeriod.user].filter(
+                      (u) => u !== null && !existingUserIds.includes(u.id)
+                  );
+        },
+        suggestedResources(state) {
+            const resources = state.activity.accompanyingPeriod.resources;
+            const existingPersonIds = state.activity.persons.map((p) => p.id);
+            const existingThirdPartyIds = state.activity.thirdParties.map(
+                (p) => p.id
+            );
+            return state.activity.accompanyingPeriod.resources
+                .map((r) => r.resource)
+                .filter(
+                    (r) =>
+                        (r.type === "person" &&
+                            !existingPersonIds.includes(r.id) &&
+                            state.activity.activityType.personsVisible !== 0) ||
+                        (r.type === "thirdparty" &&
+                            !existingThirdPartyIds.includes(r.id) &&
+                            state.activity.activityType.thirdPartiesVisible !== 0)
+                );
+        },
     },
-    removePersonInvolved(state, payload) {
-      //console.log('### mutation removePersonInvolved', payload.type);
-      switch (payload.type) {
-        case 'person':
-          state.activity.persons = state.activity.persons.filter(person => person !== payload);
-          break;
-        case 'thirdparty':
-          state.activity.thirdParties = state.activity.thirdParties.filter(thirdparty => thirdparty !== payload);
-          break;
-        case 'user':
-          state.activity.users = state.activity.users.filter(user => user !== payload);
-          break;
-      };
+    mutations: {
+        // SocialIssueAcc
+        addIssueInList(state, issue) {
+            //console.log('add issue list', issue.id);
+            state.activity.accompanyingPeriod.socialIssues.push(issue);
+        },
+        addIssueSelected(state, issue) {
+            //console.log('add issue selected', issue.id);
+            state.activity.socialIssues.push(issue);
+        },
+        updateIssuesSelected(state, issues) {
+            //console.log('update issues selected', issues);
+            state.activity.socialIssues = issues;
+        },
+        updateIssuesOther(state, payload) {
+            //console.log('update issues other');
+            state.socialIssuesOther = payload;
+        },
+        removeIssueInOther(state, issue) {
+            //console.log('remove issue other', issue.id);
+            state.socialIssuesOther = state.socialIssuesOther.filter(
+                (i) => i.id !== issue.id
+            );
+        },
+        resetActionsList(state) {
+            //console.log('reset list actions');
+            state.socialActionsList = [];
+        },
+        addActionInList(state, action) {
+            //console.log('add action list', action.id);
+            state.socialActionsList.push(action);
+        },
+        updateActionsSelected(state, actions) {
+            //console.log('update actions selected', actions);
+            state.activity.socialActions = actions;
+        },
+        filterList(state, list) {
+            const filterList = (list) => {
+                // remove duplicates entries
+                list = list.filter(
+                    (value, index) =>
+                        list.findIndex((array) => array.id === value.id) ===
+                        index
+                );
+                // alpha sort
+                list.sort((a, b) =>
+                    a.text > b.text ? 1 : b.text > a.text ? -1 : 0
+                );
+                return list;
+            };
+            if (list === "issues") {
+                state.activity.accompanyingPeriod.socialIssues = filterList(
+                    state.activity.accompanyingPeriod.socialIssues
+                );
+            }
+            if (list === "actions") {
+                state.socialActionsList = filterList(state.socialActionsList);
+            }
+        },
+
+        // ConcernedGroups
+        addPersonsInvolved(state, payload) {
+            console.log("### mutation addPersonsInvolved", payload);
+            switch (payload.result.type) {
+                case "person":
+                    state.activity.persons.push(payload.result);
+                    break;
+                case "thirdparty":
+                    state.activity.thirdParties.push(payload.result);
+                    break;
+                case "user":
+                    state.activity.users.push(payload.result);
+                    break;
+            }
+        },
+        removePersonInvolved(state, payload) {
+            //console.log('### mutation removePersonInvolved', payload.type);
+            switch (payload.type) {
+                case "person":
+                    state.activity.persons = state.activity.persons.filter(
+                        (person) => person !== payload
+                    );
+                    break;
+                case "thirdparty":
+                    state.activity.thirdParties =
+                        state.activity.thirdParties.filter(
+                            (thirdparty) => thirdparty !== payload
+                        );
+                    break;
+                case "user":
+                    state.activity.users = state.activity.users.filter(
+                        (user) => user !== payload
+                    );
+                    break;
+            }
+        },
+        updateLocation(state, value) {
+            console.log("### mutation: updateLocation", value);
+            state.activity.location = value;
+        },
     },
-    updateLocation(state, value) {
-        console.log('### mutation: updateLocation', value);
-        state.activity.location = value;
-    }
-  },
-  actions: {
-    addIssueSelected({ commit }, issue) {
-      let aSocialIssues = document.getElementById("chill_activitybundle_activity_socialIssues");
-      aSocialIssues.value = addIdToValue(aSocialIssues.value, issue.id);
-      commit('addIssueSelected', issue);
+    actions: {
+        addIssueSelected({ commit }, issue) {
+            let aSocialIssues = document.getElementById(
+                "chill_activitybundle_activity_socialIssues"
+            );
+            aSocialIssues.value = addIdToValue(aSocialIssues.value, issue.id);
+            commit("addIssueSelected", issue);
+        },
+        updateIssuesSelected({ commit }, payload) {
+            let aSocialIssues = document.getElementById(
+                "chill_activitybundle_activity_socialIssues"
+            );
+            aSocialIssues.value = "";
+            payload.forEach((item) => {
+                aSocialIssues.value = addIdToValue(
+                    aSocialIssues.value,
+                    item.id
+                );
+            });
+            commit("updateIssuesSelected", payload);
+        },
+        updateActionsSelected({ commit }, payload) {
+            let aSocialActions = document.getElementById(
+                "chill_activitybundle_activity_socialActions"
+            );
+            aSocialActions.value = "";
+            payload.forEach((item) => {
+                aSocialActions.value = addIdToValue(
+                    aSocialActions.value,
+                    item.id
+                );
+            });
+            commit("updateActionsSelected", payload);
+        },
+        addPersonsInvolved({ commit }, payload) {
+            //console.log('### action addPersonsInvolved', payload.result.type);
+            switch (payload.result.type) {
+                case "person":
+                    let aPersons = document.getElementById(
+                        "chill_activitybundle_activity_persons"
+                    );
+                    aPersons.value = addIdToValue(
+                        aPersons.value,
+                        payload.result.id
+                    );
+                    break;
+                case "thirdparty":
+                    let aThirdParties = document.getElementById(
+                        "chill_activitybundle_activity_thirdParties"
+                    );
+                    aThirdParties.value = addIdToValue(
+                        aThirdParties.value,
+                        payload.result.id
+                    );
+                    break;
+                case "user":
+                    let aUsers = document.getElementById(
+                        "chill_activitybundle_activity_users"
+                    );
+                    aUsers.value = addIdToValue(
+                        aUsers.value,
+                        payload.result.id
+                    );
+                    break;
+            }
+            commit("addPersonsInvolved", payload);
+        },
+        removePersonInvolved({ commit }, payload) {
+            //console.log('### action removePersonInvolved', payload);
+            switch (payload.type) {
+                case "person":
+                    let aPersons = document.getElementById(
+                        "chill_activitybundle_activity_persons"
+                    );
+                    aPersons.value = removeIdFromValue(
+                        aPersons.value,
+                        payload.id
+                    );
+                    break;
+                case "thirdparty":
+                    let aThirdParties = document.getElementById(
+                        "chill_activitybundle_activity_thirdParties"
+                    );
+                    aThirdParties.value = removeIdFromValue(
+                        aThirdParties.value,
+                        payload.id
+                    );
+                    break;
+                case "user":
+                    let aUsers = document.getElementById(
+                        "chill_activitybundle_activity_users"
+                    );
+                    aUsers.value = removeIdFromValue(aUsers.value, payload.id);
+                    break;
+            }
+            commit("removePersonInvolved", payload);
+        },
+        updateLocation({ commit }, value) {
+            console.log("### action: updateLocation", value);
+            let hiddenLocation = document.getElementById(
+                "chill_activitybundle_activity_location"
+            );
+            hiddenLocation.value = value.id;
+            commit("updateLocation", value);
+        },
     },
-    updateIssuesSelected({ commit }, payload) {
-      let aSocialIssues = document.getElementById("chill_activitybundle_activity_socialIssues");
-      aSocialIssues.value = '';
-      payload.forEach(item => {
-        aSocialIssues.value = addIdToValue(aSocialIssues.value, item.id);
-      });
-      commit('updateIssuesSelected', payload);
-    },
-    updateActionsSelected({ commit }, payload) {
-      let aSocialActions = document.getElementById("chill_activitybundle_activity_socialActions");
-      aSocialActions.value = '';
-      payload.forEach(item => {
-        aSocialActions.value = addIdToValue(aSocialActions.value, item.id);
-      });
-      commit('updateActionsSelected', payload);
-    },
-    addPersonsInvolved({ commit }, payload) {
-      //console.log('### action addPersonsInvolved', payload.result.type);
-      switch (payload.result.type) {
-        case 'person':
-          let aPersons = document.getElementById("chill_activitybundle_activity_persons");
-          aPersons.value = addIdToValue(aPersons.value, payload.result.id);
-          break;
-        case 'thirdparty':
-          let aThirdParties = document.getElementById("chill_activitybundle_activity_thirdParties");
-          aThirdParties.value = addIdToValue(aThirdParties.value, payload.result.id);
-          break;
-        case 'user':
-          let aUsers = document.getElementById("chill_activitybundle_activity_users");
-          aUsers.value = addIdToValue(aUsers.value, payload.result.id);
-          break;
-      };
-      commit('addPersonsInvolved', payload);
-    },
-    removePersonInvolved({ commit }, payload) {
-      //console.log('### action removePersonInvolved', payload);
-      switch (payload.type) {
-        case 'person':
-          let aPersons = document.getElementById("chill_activitybundle_activity_persons");
-          aPersons.value = removeIdFromValue(aPersons.value, payload.id);
-          break;
-        case 'thirdparty':
-          let aThirdParties = document.getElementById("chill_activitybundle_activity_thirdParties");
-          aThirdParties.value = removeIdFromValue(aThirdParties.value, payload.id);
-          break;
-        case 'user':
-          let aUsers = document.getElementById("chill_activitybundle_activity_users");
-          aUsers.value = removeIdFromValue(aUsers.value, payload.id);
-          break;
-      };
-      commit('removePersonInvolved', payload);
-    },
-    updateLocation({ commit }, value) {
-        console.log('### action: updateLocation', value);
-        let hiddenLocation = document.getElementById("chill_activitybundle_activity_location");
-        hiddenLocation.value = value.id;
-        commit('updateLocation', value);
-    }
-  }
 });
 
 export default store;

src/Bundle/ChillActivityBundle/Resources/views/Activity/activity-badge-title.html.twig

@@ -27,14 +27,16 @@
         {{ activity.type.name | localize_translatable_string }}
 
         <ul class="small_in_title">
+            {% if activity.location and t.locationVisible %}
             <li>
-                <abbr title="{{ 'location'|trans }}">{{ 'location'|trans ~ ': ' }}</abbr>
-                {# TODO {% if activity.location %}{{ activity.location }}{% endif %} #}
-                Domicile de l'usager
+                <span class="item-key">{{ 'location'|trans ~ ': ' }}</span>
+                <span>{{ activity.location.locationType.title|localize_translatable_string }}</span>
+                {{ activity.location.name }}
             </li>
+            {% endif %}
             {% if activity.user and t.userVisible %}
                 <li>
-                    <abbr title="{{ 'Referrer'|trans }}">{{ 'Referrer'|trans ~ ': ' }}</abbr>
+                    <span class="item-key">{{ 'Referrer'|trans ~ ': ' }}</span>
                     {{ activity.user.usernameCanonical }}
                 </li>
             {% endif %}

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

@@ -12,12 +12,11 @@
         },
         {   'title': 'Third parties'|trans,
             'items': entity.thirdParties,
-            'path' : 'chill_3party_3party_show',
-            'key'  : 'thirdparty_id'
+            'path' : 'chill_crud_3party_3party_view',
+            'key'  : 'id'
         },
         {   'title': 'Users concerned'|trans,
             'items': entity.users,
-            'path' : 'admin_user_show',
             'key'  : 'id'
         },
     ] %}
@@ -35,8 +34,8 @@
         },
         {   'title': 'Third parties'|trans,
             'items': entity.thirdParties,
-            'path' : 'chill_3party_3party_show',
-            'key'  : 'thirdparty_id'
+            'path' : 'chill_crud_3party_3party_view',
+            'key'  : 'id'
         },
         {   'title': 'Users concerned'|trans,
             'items': entity.users,

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

@@ -34,16 +34,18 @@
     {{ form_row(edit_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 edit_form.persons is defined -%}
-    {{ form_widget(edit_form.persons) }}
-{% endif %}
-{%- if edit_form.thirdParties is defined -%}
-    {{ form_widget(edit_form.thirdParties) }}
-{% endif %}
-{%- if edit_form.users is defined -%}
-    {{ form_widget(edit_form.users) }}
+    {%- if edit_form.persons is defined -%}
+        {{ form_widget(edit_form.persons) }}
+    {% endif %}
+    {%- if edit_form.thirdParties is defined -%}
+        {{ form_widget(edit_form.thirdParties) }}
+    {% endif %}
+    {%- if edit_form.users is defined -%}
+        {{ form_widget(edit_form.users) }}
+    {% endif %}
 {% endif %}
 
 <div id="add-persons"></div>

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

@@ -22,6 +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 }};
     </script>
     {{ encore_entry_script_tags('vue_activity') }}
 {% endblock %}

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

@@ -55,7 +55,7 @@
     {% endif %}
 
 <h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
-{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'bloc' } %}
+{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'bloc', 'badge_person': 'true' } %}
 
 <h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
 

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

@@ -1,4 +1,2 @@
 
-{{ dump(notification) }}
-
 <a href="{{ path('chill_activity_activity_show', {'id': notification.relatedEntityId })  }}">Go to Activity</a>