Merge branch '327_pinned_comment' into issue321_layout_improvements_actionForm

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

@@ -20,10 +20,10 @@
                tag-name="textarea">
             </ckeditor>
 
-            <div v-if="initialComment" class="metadata">
+            <div v-if="pinnedComment" class="metadata">
                {{ $t('comment.created_by', [
-               initialComment.creator.text,
-               $d(initialComment.createdAt.datetime, 'long')
+               pinnedComment.creator.text,
+               $d(pinnedComment.createdAt.datetime, 'long')
             ]) }}
             </div>
 
@@ -32,7 +32,7 @@
                   <li>
                      <button type="submit" class="btn btn-save">{{ $t('action.save') }}</button>
                   </li>
-                  <li v-if="initialComment !== null">
+                  <li v-if="pinnedComment !== null">
                      <a class="btn btn-delete"
                         @click="removeComment">
                         {{ $t('action.delete') }}
@@ -66,15 +66,15 @@ export default {
       }
    },
    computed: {
-      initialComment() {
-         return this.$store.state.accompanyingCourse.initialComment;
+      pinnedComment() {
+         return this.$store.state.accompanyingCourse.pinnedComment;
       },
       content: {
          set(value) {
             this.formdata.content = value;
          },
          get() {
-            return (this.initialComment)? this.initialComment.content : {};
+            return (this.pinnedComment)? this.pinnedComment.content : {};
          }
       },
       errors() {
@@ -107,7 +107,7 @@ export default {
 /*
 * TODO
 * - [x] delete button in ul record_actions, but not in form
-* - [ ] display updatedAt => initialComment fetch PATCH content changes MUST NOT change object id !!
+* - [ ] display updatedAt => pinnedComment fetch PATCH content changes MUST NOT change object id !!
 */
 </script>
 

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

@@ -132,10 +132,6 @@ const appMessages = {
          sure_description: "Une fois le changement confirmé, il ne sera plus possible de le remettre à l'état de brouillon !",
          ok: "Confirmer le parcours"
       },
-      action: {
-         choose_other_social_issue: "Veuillez choisir un autre problématique",
-         cancel: "Annuler",
-      },
       // catch errors
       'Error while updating AccompanyingPeriod Course.': "Erreur du serveur lors de la mise à jour du parcours d'accompagnement.",
       'Error while retriving AccompanyingPeriod Course.': "Erreur du serveur lors du chargement du parcours d'accompagnement.",

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

@@ -163,7 +163,7 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
             },
             postFirstComment(state, comment) {
                //console.log('### mutation: postFirstComment', comment);
-               state.accompanyingCourse.initialComment = comment;
+               state.accompanyingCourse.pinnedComment = comment;
             },
             updateSocialIssues(state, value) {
                console.log('updateSocialIssues', value);
@@ -565,11 +565,11 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
             },
             postFirstComment({ commit }, payload) {
                const url = `/api/1.0/person/accompanying-course/${id}.json`
-               const body = { type: "accompanying_period", initialComment: payload }
+               const body = { type: "accompanying_period", pinnedComment: payload }
 
                return makeFetch('PATCH', url, body)
                   .then((response) => {
-                     commit('postFirstComment', response.initialComment);
+                     commit('postFirstComment', response.pinnedComment);
                   })
                   .catch((error) => {
                      commit('catchError', error);