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

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

@@ -58,7 +58,7 @@ export default {
          this.$store.dispatch('toggleIntensity', value)
             .catch(({name, violations}) => {
                if (name === 'ValidationException' || name === 'AccessException') {
-                  violations.forEach((violation) => this.$toast.open({message: violation}));
+                  this.$toast.open({message: this.$t('Only the referrer can toggle the intensity of an accompanying course')})
                } else {
                   this.$toast.open({message: 'An error occurred'})
                }
@@ -75,20 +75,15 @@ export default {
             });
       },
       toggleConfidential() {
-         this.$store.dispatch('fetchPermissions').then(() => {
-           if (!this.$store.getters.canTogglePermission) {
-             this.$toast.open({message: "Seul le référent peut modifier la confidentialité"});
-             return Promise.resolve();
-           } else {
-             return this.$store.dispatch('toggleConfidential', (!this.isConfidential));
-           }
-         }).catch(({name, violations}) => {
-             if (name === 'ValidationException' || name === 'AccessException') {
-                violations.forEach((violation) => this.$toast.open({message: violation}));
-             } else {
-                this.$toast.open({message: 'An error occurred'})
-             }
-          });
+         this.$store.dispatch('toggleConfidential')
+            .catch(({name, violations}) => {
+               console.log(name);
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  this.$toast.open({message: this.$t('Only the referrer can toggle the confidentiality of an accompanying course')})
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       },
    },
 }

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

@@ -9,7 +9,7 @@
          <input type="checkbox" v-model="requestorIsAnonymous" class="me-2" />
          {{ $t('requestor.is_anonymous') }}
       </label>
-      <confidential v-if="accompanyingCourse.requestor.type === 'thirdparty'">
+      <confidential :positionBtn="false" v-if="accompanyingCourse.requestor.type === 'thirdparty'">
          <template v-slot:confidential-content>
             <third-party-render-box
                :thirdparty="accompanyingCourse.requestor"
@@ -33,7 +33,7 @@
          </template>
       </confidential>
 
-      <confidential v-else-if="accompanyingCourse.requestor.type === 'person'">
+      <confidential :positionBtnFar="false" v-else-if="accompanyingCourse.requestor.type === 'person'">
          <template v-slot:confidential-content>
             <person-render-box render="bloc"
                :person="accompanyingCourse.requestor"

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

@@ -168,7 +168,7 @@ export default {
          }
          else if (payload.type === 'thirdparty') {
             console.log('data', payload.data)
-            body.name = payload.data.text;
+            body.name = payload.data.name;
             body.email = payload.data.email;
             body.telephone = payload.data.phonenumber;
             body.address = payload.data.address ? { id: payload.data.address.address_id } :  null;

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

@@ -46,6 +46,12 @@ if (root === 'banner') {
       })
       .use(store)
       .use(i18n)
+      .use(VueToast, {
+         position: "bottom-right",
+         type: "error",
+         duration: 5000,
+         dismissible: true
+      })
       .component('banner', Banner)
       .mount('#banner-accompanying-course');
    });

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

@@ -167,6 +167,8 @@ const appMessages = {
       'Error while retriving users.': "Erreur du serveur lors du chargement de la liste des travailleurs.",
       'Error while getting whoami.': "Erreur du serveur lors de la requête 'qui suis-je ?'",
       'Error while retriving origin\'s list.': "Erreur du serveur lors du chargement de la liste des origines de la demande.",
+      'Only the referrer can toggle the intensity of an accompanying course': "Seul le référent peut modifier l'intensité d'un parcours.",
+      'Only the referrer can toggle the confidentiality of an accompanying course': "Seul le référent peut modifier la confidentialité d'un parcours."
    }
 };
 

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

@@ -420,24 +420,24 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                const url = `/api/1.0/person/accompanying-course/resource/${id}.json`;
 
                return makeFetch('PATCH', url, body)
-                   .then((response) => {
-                      commit('patchResource', response);
-                   })
-                   .catch((error) => {
-                      commit('catchError', error);
-                      throw error;
-                   })
+                  .then((response) => {
+                     commit('patchResource', response);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
             /**
              * Update accompanying course intensity/emergency/confidentiality
              */
             toggleIntensity({ commit }, payload) {
-               const url = `/api/1.0/person/accompanying-course/${id}.json`
+               const url = `/api/1.0/person/accompanying-course/${id}/intensity.json`
                const body = { type: "accompanying_period", 'intensity': payload }
 
-               return makeFetch('PATCH', url, body)
+               return makeFetch('POST', url, body)
                   .then((response) => {
-                     commit('toggleIntensity', response.intensity);
+                     commit('toggleIntensity', response);
 
                   })
                   .catch((error) => {
@@ -459,14 +459,18 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                   })
             },
             toggleConfidential({ commit }, payload) {
-               const url = `/api/1.0/person/accompanying-course/${id}.json`
+               const url = `/api/1.0/person/accompanying-course/${id}/confidential.json`
                const body = { type: "accompanying_period", confidential: payload }
 
-               return makeFetch('PATCH', url, body)
+               console.log('url', url, 'body', body);
+
+               return makeFetch('POST', url, body)
                   .then((response) => {
-                     commit('toggleConfidential', response.confidential);
+                     console.log('response', response);
+                     commit('toggleConfidential', response);
                   })
                   .catch((error) => {
+                     console.log('error', error)
                      commit('catchError', error);
                      throw error;
                   })
@@ -737,10 +741,10 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                   "object": {
                      "type": "accompanying_period",
                      "id": id
-                   },
-                   "class": "Chill\\PersonBundle\\Entity\\AccompanyingPeriod",
-                   "roles": [
-                      "CHILL_PERSON_ACCOMPANYING_PERIOD_TOGGLE_CONFIDENTIAL"
+                  },
+                  "class": "Chill\\PersonBundle\\Entity\\AccompanyingPeriod",
+                  "roles": [
+                     "CHILL_PERSON_ACCOMPANYING_PERIOD_TOGGLE_CONFIDENTIAL"
                      ]
                }
 

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue

@@ -126,7 +126,53 @@
                     </ul>
                 </div>
             </div>
+        </div>
+
+        <div class="item-col mx-3" v-if="this.showResidentialAddresses && (person.current_residential_addresses || []).length > 0">
+            <div class="float-button bottom">
+                <div class="box" >
+                    <ul class="list-content fa-ul">
+                        <li v-for="(addr, i) in person.current_residential_addresses" :key="i">
+                            <i class="fa fa-li fa-map-marker"></i>
+                            <div v-if="addr.address">
+                                <address-render-box
+                                    :address="addr.address"
+                                    :isMultiline="isMultiline">
+                                </address-render-box>
+                                <p>({{ $t('renderbox.residential_address') }})</p>
+                            </div>
+                            <div v-else-if="addr.hostPerson" class="mt-3">
+                                <p>{{ $t('renderbox.located_at') }}:</p>
+                                <span class="chill-entity entity-person badge-person">
+                                    <person-text
+                                        v-if="addr.hostPerson"
+                                        :person="addr.hostPerson"
+                                    ></person-text>
+                                </span>
+                                <address-render-box v-if="addr.hostPerson.address"
+                                    :address="addr.hostPerson.address"
+                                    :isMultiline="isMultiline">
+                                </address-render-box>
+                            </div>
+                            <div v-else-if="addr.hostThirdParty" class="mt-3">
+                                <p>{{ $t('renderbox.located_at') }}:</p>
+                                <span class="chill-entity entity-person badge-thirdparty">
+                                    <third-party-text
+                                        v-if="addr.hostThirdParty"
+                                        :thirdparty="addr.hostThirdParty"
+                                    ></third-party-text>
+                                </span>
+                                <address-render-box v-if="addr.hostThirdParty.address"
+                                    :address="addr.hostThirdParty.address"
+                                    :isMultiline="isMultiline">
+                                </address-render-box>
+                            </div>
+
+                        </li>
+                    </ul>
+                </div>
             </div>
+        </div>
 
         </div>
     </section>
@@ -159,6 +205,7 @@ import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRe
 import Confidential from 'ChillMainAssets/vuejs/_components/Confidential.vue';
 import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue';
 import PersonText from 'ChillPersonAssets/vuejs/_components/Entity/PersonText.vue';
+import ThirdPartyText from 'ChillThirdPartyAssets/vuejs/_components/Entity/ThirdPartyText.vue';
 
 export default {
     name: "PersonRenderBox",
@@ -166,9 +213,28 @@ export default {
         AddressRenderBox,
         Confidential,
         BadgeEntity,
-        PersonText
+        PersonText,
+        ThirdPartyText
+    },
+    props: {
+      person: {
+        required: true,
+      },
+      options: {
+        type: Object,
+        required: false,
+      },
+      render: {
+        type: String,
+      },
+      returnPath: {
+        type: String,
+      },
+      showResidentialAddresses: {
+        type: Boolean,
+        default: false,
+      }
     },
-    props: ['person', 'options', 'render', 'returnPath'],
     computed: {
         isMultiline: function() {
             if(this.options.isMultiline){

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue

@@ -15,6 +15,7 @@
             addNoData: true,
             isMultiline: true
          }"
+         :show-residential-addresses="true"
       ></person-render-box>
    </div>
 </div>