diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue index e4d332289..a1496e7d6 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue @@ -33,8 +33,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/ActionButtons.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ActionButtons.vue new file mode 100644 index 000000000..afe059da6 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ActionButtons.vue @@ -0,0 +1,44 @@ + + + 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 2a210e992..259266c92 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue @@ -1,18 +1,21 @@ @@ -82,16 +80,18 @@ import CountrySelection from './AddAddress/CountrySelection'; import CitySelection from './AddAddress/CitySelection'; import AddressSelection from './AddAddress/AddressSelection'; import AddressMap from './AddAddress/AddressMap'; -import AddressMore from './AddAddress/AddressMore' +import AddressMore from './AddAddress/AddressMore'; +import ActionButtons from './ActionButtons.vue'; export default { - name: "EditAddressPane", + name: "EditPane", components: { CountrySelection, CitySelection, AddressSelection, AddressMap, - AddressMore + AddressMore, + ActionButtons }, props: [ 'context', diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue new file mode 100644 index 000000000..2738f7775 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue @@ -0,0 +1,86 @@ + + + diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue new file mode 100644 index 000000000..b3abe5128 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue @@ -0,0 +1,63 @@ + + + + + diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js index cb628586a..f54aaa407 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js @@ -38,12 +38,11 @@ containers.forEach((container) => { create: container.dataset.modalTitle || null, edit: container.dataset.modalTitle || null }, - /// Display each step in page or Modal - bindModal: { - step1: container.dataset.bindModalStep1 !== 'false', //boolean, default: true - step2: container.dataset.bindModalStep2 !== 'false' //boolean, default: true - }, - // Use Date fields + /// 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 @@ -57,5 +56,5 @@ containers.forEach((container) => { .component('app', App) .mount(container); - console.log('container dataset', container.dataset); + //console.log('container dataset', container.dataset); }); 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 05f557d44..bf996f593 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 @@ -7,16 +7,17 @@ name: string id: integer } - * mode string ['edit*'|'create'] + * mode string ['edit*'|'new'] * addressId integer * backUrl twig route: path('route', {parameters}) * modalTitle twig translated chain * buttonText twig translated chain * buttonSize bootstrap class like 'btn-sm' - * buttonDisplayText bool - * bindModalStep1 bool - * bindModalStep2 bool - + * buttonDisplayText bool (default: true) + * openPanesInModal bool (default: true) + * stickyActions bool (default: false) + * useValidFrom bool (default: false) + * useValidTo bool (default: false) #}
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 6d65c0a7f..2b7dfa8f0 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig @@ -10,8 +10,7 @@ {% 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 }), - bindModalStep1: false, - bindModalStep2: false, + openPanesInModal: false, } %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig index 7f35b7ae9..041dfbfbe 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig @@ -18,7 +18,7 @@ {% include '@ChillMain/Address/_insert_vue_address.html.twig' with { targetEntity: { name: 'household', id: household.id }, backUrl: path('chill_person_household_address_move', { 'household_id': household.id }), - mode: 'create', + mode: 'new', buttonSize: 'btn-lg', buttonText: 'Move household', modalTitle: 'Move household', diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig index a680f18f2..d8c53dbf5 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig @@ -33,15 +33,14 @@ {% 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: 'create', + mode: 'new', buttonSize: 'btn-sm', buttonText: 'Move household', modalTitle: 'Move household', buttonDisplayText: false, } %} {# - bindModalStep1: false, - bindModalStep2: true, + openPanesInModal: false #}