diff --git a/CHANGELOG.md b/CHANGELOG.md index 89d559a5f..f63fd5fd9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ and this project adheres to * [person] show current address in search results * [person] show alt names in search results * [admin]: links to activity admin section added again. +* [household]: endDate field deleted from household edit form. * [household]: View accompanying periods of current and old household members. * [tasks]: different layout for task list / my tasks, and fix link to tasks in alert or in warning * [admin]: links to activity admin section added again. diff --git a/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php b/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php index 4d8d5a165..05a65c7d7 100644 --- a/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php +++ b/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php @@ -16,13 +16,7 @@ class HouseholdMemberType extends AbstractType ->add('startDate', ChillDateType::class, [ 'label' => 'household.Start date', 'input' => 'datetime_immutable', - ]) - ->add('endDate', ChillDateType::class, [ - 'label' => 'household.End date', - 'input' => 'datetime_immutable', - 'required' => false - ]) - ; + ]); if ($options['data']->getPosition()->isAllowHolder()) { $builder ->add('holder', ChoiceType::class, [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php index 3da325a9e..9b7b97a4f 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php @@ -193,8 +193,6 @@ class HouseholdMemberControllerTest extends WebTestCase $form = $crawler->selectButton('Enregistrer') ->form(); - $form['household_member[endDate]'] = (new \DateTime('tomorrow')) - ->format('Y-m-d'); $crawler = $client->submit($form);