Merge branch 'improve_address' into person_renderbox_thirdparty_onthefly

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue

@@ -31,8 +31,8 @@ export default {
       }
    },
    mounted() {
-      console.log('AddAddress: data context', this.context);
-      console.log('AddAddress: data options', this.options);
+      //console.log('AddAddress: data context', this.context);
+      //console.log('AddAddress: data options', this.options);
    },
    methods: {
       displayErrors() {

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue

@@ -252,7 +252,6 @@ export default {
                validFrom: false,
                validTo: false
             },
-            forceRedirect: false,
             hideAddress: false
          },
          entity: {
@@ -324,6 +323,9 @@ export default {
       bypassFirstStep() {
          // exception: passing step0 if new address and pane are not in modal
          return !this.context.edit && !this.inModal;
+      },
+      forceRedirect() {
+         return this.context.backUrl !== null;
       }
    },
    mounted() {
@@ -396,7 +398,7 @@ export default {
             this.openDatePane();
          } else {
             this.applyChanges();
-            if (!this.options.forceRedirect) {
+            if (!this.forceRedirect) {
                this.openShowPane();
             }
          }
@@ -425,7 +427,7 @@ export default {
       */
       afterLastPaneAction(params) {
          this.initForm();
-         if (this.options.forceRedirect === true) {
+         if (this.forceRedirect) {
             console.log("redirect to backUrl");
             window.location.assign(this.context.backUrl);
          } else {
@@ -458,11 +460,9 @@ export default {
 
       getCountries() {
          this.flag.loading = true;
-         console.log('## GO');
          fetchCountries().then(
             countries => new Promise((resolve, reject) => {
                this.entity.loaded.countries = countries.results;
-               console.log('## COMPLETE !');
                this.flag.editPane = true;
                this.flag.loading = false;
                resolve()

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue

@@ -9,6 +9,7 @@
    </div>
    <div v-if="flag.success" class="alert alert-success">
       {{ $t(getSuccessText) }}
+      <span v-if="forceRedirect">{{ $t('wait_redirection') }}</span>
    </div>
 
    <div v-if="noAddressWithStickyActions" class="mt-5">
@@ -78,21 +79,15 @@ export default {
          return (this.context.edit) ? this.defaultz.button.text.edit : this.defaultz.button.text.create;
       },
       getSuccessText() {
-         switch (this.context.target.name) {
-            /*
-            case 'household':
-               return (this.context.edit) ? 'household_address_edit_success' : 'household_address_move_success';
-            case 'person':
-               return (this.context.edit) ? 'person_address_edit_success' : 'person_address_creation_success';
-            */
-            default:
-               return (this.context.edit) ? 'address_edit_success' : 'address_new_success';
-         }
+         return (this.context.edit) ? 'address_edit_success' : 'address_new_success';
       },
       hideAddress() {
          return (typeof this.options.hideAddress !== 'undefined') ?
             this.options.hideAddress : this.defaultz.hideAddress;
       },
+      forceRedirect() {
+         return this.context.backUrl !== null;
+      },
       noAddressWithStickyActions() {
          return !this.context.edit && !this.address.id && this.options.stickyActions;
       }

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js

@@ -22,7 +22,7 @@ const addressMessages = {
         corridor: 'Couloir',
         steps: 'Escalier',
         flat: 'Appartement',
-        buildingName: 'Nom du bâtiment',
+        buildingName: 'Résidence',
         extra: 'Complément d\'adresse',
         distribution: 'Cedex',
         create_postal_code: 'Localité inconnue. Cliquez ici pour créer une nouvelle localité',
@@ -34,22 +34,14 @@ const addressMessages = {
         back_to_the_list: 'Retour à la liste',
         loading: 'chargement en cours...',
         address_suggestions: "Suggestion d'adresses",
-        address_new_success: 'La nouvelle adresse est enregistrée',
-        address_edit_success: 'L\'adresse a été mise à jour',
+        address_new_success: 'La nouvelle adresse est enregistrée.',
+        address_edit_success: 'L\'adresse a été mise à jour.',
+        wait_redirection: " La page est redirigée.",
         not_yet_address: "Il n'y a pas encore d'adresse. Cliquez sur '+ Créer une adresse'",
         use_this_address: "Utiliser cette adresse",
 
-        // person specific
-        add_an_address_to_person: 'Ajouter l\'adresse à la personne',
-        person_address_creation_success: 'La nouvelle adresse de la personne est enregistrée',
-        person_address_edit_success: 'L\'adresse de la personne a été mise à jour',
-
         // household specific
         move_date: 'Date du déménagement',
-        select_a_existing_address: 'Sélectionner une adresse existante',
-        add_an_address_to_household: 'Enregistrer',
-        household_address_move_success: 'La nouvelle adresse du ménage est enregistrée',
-        household_address_edit_success: 'L\'adresse du ménage a été mise à jour',
 
     }
 };

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js

@@ -33,24 +33,27 @@ containers.forEach((container) => {
                             size: container.dataset.buttonSize || null,
                             displayText: container.dataset.buttonDisplayText !== 'false'  //boolean, default: true
                         },
+
                         /// Modal title text if create or edit address (trans chain, see i18n)
                         title: {
                             create: container.dataset.modalTitle || null,
                             edit: container.dataset.modalTitle || null
                         },
+
                         /// Display panes in Modal for step123
                         openPanesInModal: container.dataset.openPanesInModal !== 'false',  //boolean, default: true
+
                         /// Display actions buttons of panes in a sticky-form-button navbar
                         stickyActions: container.dataset.stickyActions === 'true',  //boolean, default: false
+
                         /// Use Date fields
                         useDate: {
                             validFrom: container.dataset.useValidFrom === 'true',  //boolean, default: false
                             validTo: container.dataset.useValidTo === 'true'       //boolean, default: false
                         },
-                        /// Force redirection after last step (cfr. backUrl)
-                        forceRedirect: container.dataset.forceRedirect === 'true',  //boolean, default: false
-                        /// Don't display show renderbox Address
-                        //hideAddress: false         //boolean, default: false
+
+                        /// Don't display show renderbox Address: showPane display only a button
+                        hideAddress: container.dataset.hideAddress === 'true'       //boolean, default: false
                     }
                 }
             }

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue

@@ -16,7 +16,7 @@
          </p>
       </component>
 
-      <div v-if="isMultiline === true">
+      <div v-if="isMultiline === true" class="address-more">
          <div v-if="address.floor">
             <span class="floor">
                <b>{{ $t('floor') }}</b>: {{ address.floor }}