diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php index c0f0baab2..311d2eaad 100644 --- a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php +++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php @@ -158,10 +158,23 @@ class HouseholdController extends AbstractController $form->handleRequest($request); + $addresses = $household->getAddressesOrdered(); + + foreach($addresses as $a) { + if ($a->getId() === $address->getId()){ + $currentValueIndex = array_search($a, $addresses); + } + } + if (count($addresses) > 1 && $currentValueIndex > 0) { + $previousAddress = $addresses[$currentValueIndex - 1]; + $minValidFrom = $previousAddress->getValidTo(); + } else { + $minValidFrom = null; + } + if ($form->isSubmitted() && $form->isValid()) { $this->getDoctrine()->getManager()->persist($address); $this->getDoctrine()->getManager()->flush(); - return $this->redirectToRoute('chill_person_household_addresses', [ 'household_id' => $household->getId() ]); @@ -172,7 +185,8 @@ class HouseholdController extends AbstractController [ 'household' => $household, 'address' => $address, - 'form' => $form->createView() + 'form' => $form->createView(), + 'minValidFrom' => $minValidFrom ] ); } diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_valid_from_edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_valid_from_edit.html.twig index a58e29de0..78c7b0fe1 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_valid_from_edit.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_valid_from_edit.html.twig @@ -11,8 +11,13 @@ {{ form_start(form) }} {{ form_errors(form) }} +