From f1c29a8bd3b782d26871c37a5965c3cc91be63ae Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Wed, 22 Sep 2021 12:08:16 +0200 Subject: [PATCH 1/7] Household summary: improve Address display when there is no address --- .../views/Household/summary.html.twig | 68 +++++++++---------- 1 file changed, 32 insertions(+), 36 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig index d8c53dbf5..115f5a208 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig @@ -16,42 +16,39 @@ {% set address = household.currentAddress %} - {% if address is empty %} -

{{ 'household.Household does not have any address currently'|trans }}

- {% else %} -
- -
- -

{{ 'Address'|trans }}

+
+
+

{{ 'Address'|trans }}

+ {% if address is empty %} +

{{ 'household.Household does not have any address currently'|trans }}

+ {% else %} {{ address|chill_entity_render_box({'multiline': true}) }} + {% endif %} -
    -
  • - {# include vue_address component #} - {% 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 }), - mode: 'new', - buttonSize: 'btn-sm', - buttonText: 'Move household', - modalTitle: 'Move household', - buttonDisplayText: false, - } %} - {# - openPanesInModal: false - #} -
    • -
  • - - - -
    • -
- -
+
    +
  • + {# include vue_address component #} + {% include '@ChillMain/Address/_insert_vue_address.html.twig' with { + targetEntity: { name: 'household', id: household.id }, + backUrl: path('chill_person_household_summary', { 'household_id': household.id }), + forceRedirect: true, + mode: 'new', + buttonSize: 'btn-sm', + buttonText: 'Move household', + modalTitle: 'Move household', + buttonDisplayText: false, + } %} +
    • +
  • + + + +
    • +
+
+ {% if address is not empty %}
{% if form is null %} @@ -106,10 +103,9 @@ {{ form_end(form) }} {% endif %} -
-
- {% endif %} + {% endif %} +

{{ 'household.Household members'|trans }}

From dee27ee01f5f78ec0661b657f049f1b5fbd851b3 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Wed, 22 Sep 2021 12:09:39 +0200 Subject: [PATCH 2/7] Address: extend hideAddress option for twig cases --- .../Resources/public/vuejs/Address/index.js | 10 ++++++++-- .../views/Address/_insert_vue_address.html.twig | 5 +++++ .../Resources/views/Household/summary.html.twig | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js index c890737ba..04cbbd0d3 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js @@ -33,24 +33,30 @@ 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/views/Address/_insert_vue_address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig index 36482fe9c..68531dea1 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 @@ -19,6 +19,7 @@ * useValidFrom bool (default: false) * useValidTo bool (default: false) * forceRedirect bool (default: false) + * hideAddress bool (default: false) #}
{{ encore_entry_script_tags('vue_address') }} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig index 115f5a208..91cef1d15 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig @@ -33,6 +33,7 @@ targetEntity: { name: 'household', id: household.id }, backUrl: path('chill_person_household_summary', { 'household_id': household.id }), forceRedirect: true, + hideAddress: true, mode: 'new', buttonSize: 'btn-sm', buttonText: 'Move household', From e336990b16a45d09fa00068c9006e58cd85a2aa2 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Wed, 22 Sep 2021 12:10:17 +0200 Subject: [PATCH 3/7] comment console.log --- .../ChillMainBundle/Resources/public/vuejs/Address/App.vue | 4 ++-- .../Resources/public/vuejs/Address/components/AddAddress.vue | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue index 5136f830a..5370ff817 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..ae3a0324f 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue @@ -458,11 +458,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() From 7c2422743e6aea640bb44ae2bdcaa785efad4b11 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Wed, 22 Sep 2021 12:22:12 +0200 Subject: [PATCH 4/7] Address: remove unused translations specific to household or person context --- .../vuejs/Address/components/ShowPane.vue | 11 +--------- .../Resources/public/vuejs/Address/i18n.js | 9 -------- .../public/vuejs/HouseholdAddress/js/i18n.js | 21 ------------------- 3 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/js/i18n.js 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..c5a9d0510 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue @@ -78,16 +78,7 @@ 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') ? diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js index cc7a5ef79..2a2fc28ce 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js @@ -39,17 +39,8 @@ const addressMessages = { 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/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 -}; From d6f6f49090bcc8df2e0d0488bbdb08b6ecbc3734 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Wed, 22 Sep 2021 13:04:51 +0200 Subject: [PATCH 5/7] address renderbox, improve how display address-more informations --- .../Resources/public/vuejs/Address/i18n.js | 2 +- .../_components/Entity/AddressRenderBox.vue | 2 +- .../Resources/views/Entity/address.html.twig | 18 +++++++++--------- .../translations/messages.fr.yml | 9 +++++++++ .../views/Household/summary.html.twig | 2 +- 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js index 2a2fc28ce..9f26430e1 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é', 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/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 b230b6ac1..9ffff5bcb 100644 --- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml @@ -74,6 +74,15 @@ 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 Your search is empty. Please provide search terms.: La recherche est vide. Merci de fournir des termes de recherche. diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig index 91cef1d15..9feebaee8 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig @@ -23,7 +23,7 @@ {% if address is empty %}

{{ 'household.Household does not have any address currently'|trans }}

{% else %} - {{ address|chill_entity_render_box({'multiline': true}) }} + {{ address|chill_entity_render_box({'multiline': true, 'extended_infos': true }) }} {% endif %}
    From dbb9e6a663ccbdc0afc2b8521ee9a00ffa5549ed Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Wed, 22 Sep 2021 13:05:48 +0200 Subject: [PATCH 6/7] Address: success message exception when redirection --- .../Resources/public/vuejs/Address/components/ShowPane.vue | 5 +++++ .../ChillMainBundle/Resources/public/vuejs/Address/i18n.js | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) 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 c5a9d0510..25f8c95ec 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') }}
@@ -84,6 +85,10 @@ export default { return (typeof this.options.hideAddress !== 'undefined') ? this.options.hideAddress : this.defaultz.hideAddress; }, + forceRedirect() { + return (typeof this.options.forceRedirect !== 'undefined') ? + this.options.forceRedirect : this.defaultz.forceRedirect; + }, 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 9f26430e1..9d7185696 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js @@ -34,8 +34,9 @@ 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", From dfc6ed9bf3870b6e0c66fbd81efb2a520b662e02 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Wed, 22 Sep 2021 13:18:46 +0200 Subject: [PATCH 7/7] Address: remove forceRedirect option: backUrl option not null is considerated as forceRedirect true --- .../public/vuejs/Address/components/AddAddress.vue | 8 +++++--- .../public/vuejs/Address/components/ShowPane.vue | 3 +-- .../Resources/public/vuejs/Address/index.js | 3 --- .../Resources/views/Address/_insert_vue_address.html.twig | 5 ----- .../Resources/views/Address/edit.html.twig | 4 +++- .../Resources/views/Address/new.html.twig | 2 +- .../Resources/views/Household/address_edit.html.twig | 6 ++---- .../Resources/views/Household/address_move.html.twig | 5 +---- .../Resources/views/Household/addresses.html.twig | 5 +---- .../Resources/views/Household/summary.html.twig | 1 - 10 files changed, 14 insertions(+), 28 deletions(-) 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 ae3a0324f..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 { 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 25f8c95ec..96628766c 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue @@ -86,8 +86,7 @@ export default { this.options.hideAddress : this.defaultz.hideAddress; }, forceRedirect() { - return (typeof this.options.forceRedirect !== 'undefined') ? - this.options.forceRedirect : this.defaultz.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/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js index 04cbbd0d3..f0a308b7b 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js @@ -52,9 +52,6 @@ containers.forEach((container) => { 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: showPane display only a button hideAddress: container.dataset.hideAddress === 'true' //boolean, default: false } 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 68531dea1..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,6 @@ * stickyActions bool (default: false) * useValidFrom bool (default: false) * useValidTo bool (default: false) - * forceRedirect bool (default: false) * hideAddress bool (default: 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 717f31e77..94a79db2a 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, #} @@ -68,8 +67,6 @@ }) }}
  • - - {# include vue_address component #} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig index 9feebaee8..ceb835d2e 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig @@ -32,7 +32,6 @@ {% include '@ChillMain/Address/_insert_vue_address.html.twig' with { targetEntity: { name: 'household', id: household.id }, backUrl: path('chill_person_household_summary', { 'household_id': household.id }), - forceRedirect: true, hideAddress: true, mode: 'new', buttonSize: 'btn-sm',