Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

household address: add max date for changing the validFrom date

Browse Source
This commit is contained in:
nobohan 2022-04-06 15:31:17 +02:00
parent 017b7bca87
commit 6a4edd000f
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
View File

@ -172,6 +172,13 @@ class HouseholdController extends AbstractController
$minValidFrom = null; $minValidFrom = null;
} }
if (count($addresses) > 1 && count($addresses) > $currentValueIndex + 1) {
$nextAddress = $addresses[$currentValueIndex + 1];
$maxValidFrom = $nextAddress->getValidFrom();
} else {
$maxValidFrom = null;
}
if ($form->isSubmitted() && $form->isValid()) { if ($form->isSubmitted() && $form->isValid()) {
$this->getDoctrine()->getManager()->persist($address); $this->getDoctrine()->getManager()->persist($address);
$this->getDoctrine()->getManager()->flush(); $this->getDoctrine()->getManager()->flush();
@ -186,7 +193,8 @@ class HouseholdController extends AbstractController
'household' => $household, 'household' => $household,
'address' => $address, 'address' => $address,
'form' => $form->createView(), 'form' => $form->createView(),
'minValidFrom' => $minValidFrom 'minValidFrom' => $minValidFrom,
'maxValidFrom' => $maxValidFrom
] ]
); );
} }

12
src/Bundle/ChillPersonBundle/Resources/views/Household/address_valid_from_edit.html.twig
View File

@ -13,10 +13,16 @@
<div> <div>
{% if minValidFrom is not null %} {% if minValidFrom is not null and maxValidFrom is not null %}
{{ form_row(form.validFrom, {'attr': {'min': minValidFrom|date('Y-m-d') }}) }} {{ form_row(form.validFrom, {'attr': {'min': minValidFrom|date('Y-m-d'), 'max': maxValidFrom|date('Y-m-d') }}) }}
{% else %} {% else %}
{{ form_row(form.validFrom) }} {% if minValidFrom is not null %}
{{ form_row(form.validFrom, {'attr': {'min': minValidFrom|date('Y-m-d')}}) }}
{% elseif maxValidFrom is not null %}
{{ form_row(form.validFrom, {'attr': {'max': maxValidFrom|date('Y-m-d')}}) }}
{% else %}
{{ form_row(form.validFrom) }}
{% endif %}
{% endif %} {% endif %}
</div> </div>
<div hidden> <div hidden>