From 6296c7a307e3037640f4104ad4db5048f216cb75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Thu, 16 Dec 2021 17:00:17 +0100 Subject: [PATCH] household/address: show date validFrom and validTo when moving Household --- CHANGELOG.md | 1 + .../Resources/views/Household/address_edit.html.twig | 1 + .../Resources/views/Household/addresses.html.twig | 4 +--- .../Resources/views/Household/summary.html.twig | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2e1a939b..981388fdc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ and this project adheres to * [docgen]: add age for person * [task]: fix dropdown menu style + fix bug in singleTaskController (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/338) * Household: fix bug when moving person on the same day (see https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/281) +* Household: show date validFrom and validTo when moving ## Test releases 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 c8342fb07..828f69ef5 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig @@ -13,6 +13,7 @@ openPanesInModal: false, stickyActions: true, useValidFrom: true, + useValidTo: true, } %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig index 646463945..2802c62a7 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig @@ -22,10 +22,8 @@ buttonSize: 'btn-lg', buttonText: 'Move household', modalTitle: 'Move household', - } %} - {# useValidFrom: true, - #} + } %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig index e88e07013..df1e45fce 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig @@ -38,6 +38,7 @@ buttonText: 'Move household', modalTitle: 'Move household', buttonDisplayText: false, + useValidFrom: true, } %}