From 17dd52c3dca97651d1169b450887791d0b4f90b5 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 13 Aug 2021 17:20:58 +0200
Subject: [PATCH] import ShowAddress in CourseLocation, with alert if temporary
 address

---
 .../vuejs/Address/components/ShowAddress.vue  |  4 +--
 .../components/CourseLocation.vue             | 27 ++++++++++---------
 .../vuejs/AccompanyingCourse/js/i18n.js       |  1 +
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue
index d833cf193..056d1044f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue
@@ -1,5 +1,5 @@
 <template>
-   <div class="chill-entity entity-address">
+   <div class="chill-entity entity-address my-3">
       <div class="address multiline">
          <p v-if="address.text"
             class="street">
@@ -51,8 +51,6 @@
             </span>
          </div>
       </div>
-
-
    </div>
 </template>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index e29f85bc7..e16086c64 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -10,18 +10,14 @@
             {{ error }}
          </div>
 
-         <div v-if="accompanyingCourse.location"
-              class="chill-entity entity-address">
-            <div class="address multiline">
-               <p class="street">{{ accompanyingCourse.location.street }}
-                  <span class="streetnumber">{{ accompanyingCourse.location.streetNumber }}</span>
-               </p>
-               <p class="postcode">
-                  <span class="code">{{ accompanyingCourse.location.postcode.code }}</span>
-                  <span class="name">{{ accompanyingCourse.location.postcode.name }}</span>
-               </p>
-               <p class="country">{{ accompanyingCourse.location.country.name.fr }}</p>
-            </div>
+         <show-address
+            v-if="accompanyingCourse.location"
+            :address="accompanyingCourse.location">
+         </show-address>
+
+         <div v-if="isTemporaryAddress"
+              class="alert alert-warning">
+            <p>{{ $t('courselocation.temporary_address_must_be_changed') }}</p>
          </div>
 
          <ul class="record_actions">
@@ -45,11 +41,13 @@
 <script>
 import { mapState } from "vuex";
 import AddAddress from 'ChillMainAssets/vuejs/Address/components/AddAddress.vue';
+import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
 
 export default {
    name: "CourseLocation",
    components: {
-      AddAddress
+      AddAddress,
+      ShowAddress
    },
    data() {
       return {
@@ -83,6 +81,9 @@ export default {
       }),
       hasTemporaryAddressButton() {  // return true if locationStatus equal 'none' or 'address'
          return this.accompanyingCourse.locationStatus !== 'person';
+      },
+      isTemporaryAddress() {
+         return this.accompanyingCourse.locationStatus === 'address';
       }
    },
    methods: {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
index 83f90fb91..254b011fe 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -69,6 +69,7 @@ const appMessages = {
          add_temporary_address: "Ajouter une adresse temporaire",
          edit_temporary_address: "Modifier l'adresse temporaire",
          assign_course_address: "Désigner comme l'adresse du parcours",
+         temporary_address_must_be_changed: "Cette addresse est temporaire et doit être remplacée rapidement par celle d'un usager de référence.",
       },
       referrer: {
          title: "Référent du parcours",