Merge branch 'master' into notification/completion

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

@@ -12,7 +12,7 @@
         </div>
         <div v-if="getContext === 'accompanyingCourse' && suggestedEntities.length > 0">
             <ul class="list-suggest add-items inline">
-                <li v-for="p in suggestedEntities" @click="addSuggestedEntity(p)">
+                <li v-for="(p, i) in suggestedEntities" @click="addSuggestedEntity(p)" :key="`suggestedEntities-${i}`">
                     <span>{{ p.text }}</span>
                 </li>
             </ul>

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

@@ -15,13 +15,15 @@
                     :searchable="true"
                     :placeholder="$t('activity.choose_location')"
                     :custom-label="customLabel"
+                    :select-label="$t('multiselect.select_label')"
+                    :deselect-label="$t('multiselect.deselect_label')"
+                    :selected-label="$t('multiselect.selected_label')"
                     :options="availableLocations"
                     group-values="locations"
                     group-label="locationGroup"
                     v-model="location"
                 >
                 </VueMultiselect>
-
                 <new-location v-bind:locations="locations"></new-location>
             </div>
         </div>
@@ -32,7 +34,6 @@
 import { mapState, mapGetters } from "vuex";
 import VueMultiselect from "vue-multiselect";
 import NewLocation from "./Location/NewLocation.vue";
-import { getLocations, getLocationTypeByDefaultFor, getUserCurrentLocation } from "../api.js";
 
 export default {
     name: "Location",

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

@@ -9,9 +9,9 @@
 
             <check-social-issue
                v-for="issue in socialIssuesList"
-               v-bind:key="issue.id"
-               v-bind:issue="issue"
-               v-bind:selection="socialIssuesSelected"
+               :key="issue.id"
+               :issue="issue"
+               :selection="socialIssuesSelected"
                @updateSelected="updateIssuesSelected">
             </check-social-issue>
 
@@ -21,18 +21,18 @@
                label="text"
                track-by="id"
                open-direction="bottom"
-               v-bind:close-on-select="true"
-               v-bind:preserve-search="false"
-               v-bind:reset-after="true"
-               v-bind:hide-selected="true"
-               v-bind:taggable="false"
-               v-bind:multiple="false"
-               v-bind:searchable="true"
-               v-bind:allow-empty="true"
-               v-bind:show-labels="false"
-               v-bind:loading="issueIsLoading"
-               v-bind:placeholder="$t('activity.choose_other_social_issue')"
-               v-bind:options="socialIssuesOther"
+               :close-on-select="true"
+               :preserve-search="false"
+               :reset-after="true"
+               :hide-selected="true"
+               :taggable="false"
+               :multiple="false"
+               :searchable="true"
+               :allow-empty="true"
+               :show-labels="false"
+               :loading="issueIsLoading"
+               :placeholder="$t('activity.choose_other_social_issue')"
+               :options="socialIssuesOther"
                @select="addIssueInList">
             </VueMultiselect>
             </div>
@@ -58,9 +58,9 @@
                  <check-social-action
                      v-if="socialIssuesSelected.length || socialActionsSelected.length"
                      v-for="action in socialActionsList"
-                     v-bind:key="action.id"
-                     v-bind:action="action"
-                     v-bind:selection="socialActionsSelected"
+                     :key="action.id"
+                     :action="action"
+                     :selection="socialActionsSelected"
                      @updateSelected="updateActionsSelected">
                  </check-social-action>
              </template>

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

@@ -1,4 +1,5 @@
 import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
+import { multiSelectMessages } from 'ChillMainAssets/vuejs/_js/i18n'
 
 const activityMessages = {
    fr: {
@@ -33,12 +34,11 @@ const activityMessages = {
           },
           create_address: 'Créer une adresse',
           edit_address: "Modifier l'adresse"
-
       }
    }
 }
 
-Object.assign(activityMessages.fr, personMessages.fr);
+Object.assign(activityMessages.fr, personMessages.fr, multiSelectMessages.fr);
 
 export {
    activityMessages