Merge remote-tracking branch 'origin/master' into issue596_admin_user

src/Bundle/ChillPersonBundle/Form/CreationPersonType.php

@@ -11,10 +11,13 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Form;
 
+use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Form\Event\CustomizeFormEvent;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ChillPhoneNumberType;
+use Chill\MainBundle\Form\Type\PickAddressType;
 use Chill\MainBundle\Form\Type\PickCenterType;
+use Chill\MainBundle\Form\Type\PickCivilityType;
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Form\Type\GenderType;
@@ -24,9 +27,12 @@ use libphonenumber\PhoneNumberType;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Validator\Constraints\Callback;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 final class CreationPersonType extends AbstractType
 {
@@ -55,6 +61,11 @@ final class CreationPersonType extends AbstractType
         $builder
             ->add('firstName')
             ->add('lastName')
+            ->add('civility', PickCivilityType::class, [
+                'required' => false,
+                'label' => 'Civility',
+                'placeholder' => 'choose civility',
+            ])
             ->add('gender', GenderType::class, [
                 'required' => true, 'placeholder' => null,
             ])
@@ -71,6 +82,17 @@ final class CreationPersonType extends AbstractType
             ])
             ->add('email', EmailType::class, [
                 'required' => false,
+            ])
+            ->add('addressForm', CheckboxType::class, [
+                'label' => 'Create a household and add an address',
+                'required' => false,
+                'mapped' => false,
+                'help' => 'A new household will be created. The person will be member of this household.',
+            ])
+            ->add('address', PickAddressType::class, [
+                'required' => false,
+                'mapped' => false,
+                'label' => false,
             ]);
 
         if ($this->askCenters) {
@@ -97,6 +119,9 @@ final class CreationPersonType extends AbstractType
     {
         $resolver->setDefaults([
             'data_class' => Person::class,
+            'constraints' => [
+                new Callback([$this, 'validateCheckedAddress']),
+            ],
         ]);
     }
 
@@ -107,4 +132,18 @@ final class CreationPersonType extends AbstractType
     {
         return self::NAME;
     }
+
+    public function validateCheckedAddress($data, ExecutionContextInterface $context, $payload): void
+    {
+        /** @var bool $addressFrom */
+        $addressFrom = $context->getObject()->get('addressForm')->getData();
+        /** @var ?Address $address */
+        $address = $context->getObject()->get('address')->getData();
+
+        if ($addressFrom && null === $address) {
+            $context->buildViolation('person_creation.If you want to create an household, an address is required')
+                ->atPath('addressForm')
+                ->addViolation();
+        }
+    }
 }

src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php

@@ -26,12 +26,15 @@ class HouseholdMemberType extends AbstractType
                 'input' => 'datetime_immutable',
             ]);
 
-        if (!$options['data']->getPosition()->getShareHousehold()) {
-            $builder->add('endDate', ChillDateType::class, [
-                'label' => 'household.End date',
-                'input' => 'datetime_immutable',
-            ]);
+        if (null !== $options['data']->getPosition()) {
+            if (!$options['data']->getPosition()->getShareHousehold()) {
+                $builder->add('endDate', ChillDateType::class, [
+                    'label' => 'household.End date',
+                    'input' => 'datetime_immutable',
+                ]);
+            }
         }
+
         $builder
             ->add('comment', ChillTextareaType::class, [
                 'label' => 'household.Comment',