diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue index e006e9028..d429098a5 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue +++ b/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() { diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue index dd9171cc2..ad11fc02f 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue +++ b/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() diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue index 99b531d97..96628766c 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue @@ -9,6 +9,7 @@
{{ $t(getSuccessText) }} + {{ $t('wait_redirection') }}
@@ -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; } diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js index cc7a5ef79..9d7185696 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js +++ b/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', } }; diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js index c890737ba..f0a308b7b 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js +++ b/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 } } } diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue index 997774190..ec925a6b7 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue @@ -16,7 +16,7 @@

-
+
{{ $t('floor') }}: {{ address.floor }} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig index 36482fe9c..f4f63c4eb 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig @@ -18,7 +18,7 @@ * stickyActions bool (default: false) * useValidFrom bool (default: false) * useValidTo bool (default: false) - * forceRedirect bool (default: false) + * hideAddress bool (default: false) #}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig index 4628e3cb5..b1bdb8438 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig @@ -34,25 +34,25 @@ {% macro extended(address, options) %} {% if address.floor is not empty %} - {{ address.floor }} + {{ 'address more.floor'|trans }} {{ address.floor }} {% endif %} {% if address.corridor is not empty %} - {{ address.corridor }} + {{ 'address more.corridor'|trans }} {{ address.corridor }} {% endif %} {% if address.steps is not empty %} - {{ address.steps }} + {{ 'address more.steps'|trans }} {{ address.steps }} {% endif %} {% if address.buildingName is not empty %} - {{ address.buildingName }} + {{ 'address more.buildingName'|trans }} {{ address.buildingName }} {% endif %} {% if address.flat is not empty %} - {{ address.flat }} - {% endif %} - {% if address.distribution is not empty %} - {{ address.distribution }} + {{ 'address more.flat'|trans }} {{ address.flat }} {% endif %} {% if address.extra is not empty %} - {{ address.extra }} + {{ 'address more.extra'|trans }} {{ address.extra }} + {% endif %} + {% if address.distribution is not empty %} + {{ 'address more.distribution'|trans }} {{ address.distribution }} {% endif %} {% endmacro %} diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml index 750c99618..9ffff5bcb 100644 --- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml @@ -74,6 +74,14 @@ address: address_homeless: L'adresse est-elle celle d'un domicile fixe ? real address: Adresse d'un domicile consider homeless: N'est pas l'adresse d'un domicile (SDF) +address more: + floor: ét + corridor: coul + steps: esc + flat: appart + buildingName: résidence + extra: '' + distribution: cedex Create a new address: Créer une nouvelle adresse #serach diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/js/i18n.js deleted file mode 100644 index d62e9add9..000000000 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/js/i18n.js +++ /dev/null @@ -1,21 +0,0 @@ -import { addressMessages } from 'ChillMainAssets/vuejs/Address/i18n' - -const appMessages = { - fr: { - select_a_existing_address: 'Sélectionner une adresse existante', - create_a_new_address: 'Créer une nouvelle adresse', - add_an_address_to_household: 'Enregistrer', - validFrom: 'Date du déménagement', - move_date: 'Date du déménagement', - back_to_the_list: 'Retour à la liste', - 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', - loading: 'chargement en cours...' - } -}; - -Object.assign(appMessages.fr, addressMessages.fr); - -export { - appMessages -}; diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig index dd7679cc2..e2e9167b3 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig @@ -29,9 +29,11 @@ {# include vue_address component #} {% include '@ChillMain/Address/_insert_vue_address.html.twig' with { targetEntity: { name: 'person', id: person.id }, - backUrl: path('chill_person_address_list', { 'person_id': person.id }), openPanesInModal: false, } %} + {# + backUrl: path('chill_person_address_list', { 'person_id': person.id }), + #} {% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig index 14ddace0a..da2bfe474 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig @@ -29,10 +29,10 @@ {# include vue_address component #} {% include '@ChillMain/Address/_insert_vue_address.html.twig' with { targetEntity: { name: 'person', id: person.id }, - backUrl: path('chill_person_address_list', { 'person_id': person.id }), stickyActions: true, } %} {# + backUrl: path('chill_person_address_list', { 'person_id': person.id }), openPanesInModal: false, useValidFrom: true, #} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig index e9c41bf45..c909e62d3 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig @@ -9,12 +9,10 @@ {# include vue_address component #} {% include '@ChillMain/Address/_insert_vue_address.html.twig' with { targetEntity: { name: 'household', id: household.id }, - stickyActions: true - } %} - {# backUrl: path('chill_person_household_addresses', { 'household_id': household.id }), + stickyActions: true, openPanesInModal: false, - #} + } %}
{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig index 50346672b..2015a8599 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig @@ -10,12 +10,9 @@ {% include '@ChillMain/Address/_insert_vue_address.html.twig' with { targetEntity: { name: 'household', id: household.id }, backUrl: path('chill_person_household_addresses', { 'household_id': household.id }), - forceRedirect: true, + openPanesInModal: false, stickyActions: true, } %} - {# - openPanesInModal: false, - #}
{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig index 48988b73b..646463945 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig @@ -18,14 +18,13 @@ {% include '@ChillMain/Address/_insert_vue_address.html.twig' with { targetEntity: { name: 'household', id: household.id }, backUrl: path('chill_person_household_addresses', { 'household_id': household.id }), - forceRedirect: true, mode: 'new', - useValidFrom: true, buttonSize: 'btn-lg', buttonText: 'Move household', modalTitle: 'Move household', } %} {# + useValidFrom: true, #} @@ -67,7 +66,6 @@ }) }}