From bbee1a26cc393c335f14a40d78a07be18191bbf8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Sat, 28 Aug 2021 07:03:25 +0200 Subject: [PATCH] Add strict Add dance New form schema with optional fields Remove doctrine and translator requirements Cleanup --- Form/ApplicationType.php | 106 +++++++++++++++++++++++++-------------- 1 file changed, 67 insertions(+), 39 deletions(-) diff --git a/Form/ApplicationType.php b/Form/ApplicationType.php index ef6819a..572478c 100644 --- a/Form/ApplicationType.php +++ b/Form/ApplicationType.php @@ -1,4 +1,13 @@ - + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ namespace Rapsys\AirBundle\Form; @@ -11,50 +20,43 @@ use Symfony\Component\Form\Extension\Core\Type\DateType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Validator\Constraints\Date; use Symfony\Component\Validator\Constraints\NotBlank; -use Symfony\Bridge\Doctrine\RegistryInterface; -use Symfony\Component\Translation\TranslatorInterface; -use Rapsys\AirBundle\Entity\User; -use Rapsys\AirBundle\Entity\Slot; + +use Rapsys\AirBundle\Entity\Dance; use Rapsys\AirBundle\Entity\Location; +use Rapsys\AirBundle\Entity\Slot; +/** + * {@inheritdoc} + */ class ApplicationType extends AbstractType { - //Doctrine instance - private $doctrine; - - //Translator instance - protected $translator; - - public function __construct(RegistryInterface $doctrine, TranslatorInterface $translator) { - $this->doctrine = $doctrine; - $this->translator = $translator; - } - /** * {@inheritdoc} */ public function buildForm(FormBuilderInterface $builder, array $options) { - //Retrieve translated slot - #$slots = $this->doctrine->getRepository(Slot::class)->findAllWithTranslatedTitle($this->translator); + //Create form + $form = $builder; + + //Add dance field + $form->add('dance', EntityType::class, ['class' => 'RapsysAirBundle:Dance', 'choices' => $options['dance_choices'], 'preferred_choices' => $options['dance_favorites'], 'attr' => ['placeholder' => 'Your dance'], 'choice_translation_domain' => true, 'constraints' => [new NotBlank(['message' => 'Please provide your dance'])], 'empty_data' => $options['dance_default']]); + + //Add date field + $form->add('date', DateType::class, ['attr' => ['placeholder' => 'Your date', 'class' => 'date'], 'html5' => true, 'input' => 'datetime', 'widget' => 'single_text', 'format' => 'yyyy-MM-dd', 'data' => new \DateTime('+7 day'), 'constraints' => [new NotBlank(['message' => 'Please provide your date']), new Date(['message' => 'Your date doesn\'t seems to be valid'])]]); + + //Add location field + $form->add('location', EntityType::class, ['class' => 'RapsysAirBundle:Location', 'choices' => $options['location_choices'], 'preferred_choices' => $options['location_favorites'], 'attr' => ['placeholder' => 'Your location'], 'choice_translation_domain' => true, 'constraints' => [new NotBlank(['message' => 'Please provide your location'])], 'empty_data' => $options['location_default']]); - //Create base form - $form = $builder - ->add('date', DateType::class, ['attr' => ['placeholder' => 'Your date', 'class' => 'date'], 'html5' => true, 'input' => 'datetime', 'widget' => 'single_text', 'format' => 'yyyy-MM-dd', 'data' => new \DateTime('+7 day'), 'constraints' => [new NotBlank(['message' => 'Please provide your date']), new Date(['message' => 'Your date doesn\'t seems to be valid'])]]) - #->add('slot', ChoiceType::class, ['attr' => ['placeholder' => 'Your slot'], 'constraints' => [new NotBlank(['message' => 'Please provide your slot'])], 'choices' => $slots, 'data' => $options['slot']]) - ->add('slot', EntityType::class, ['class' => 'RapsysAirBundle:Slot', 'attr' => ['placeholder' => 'Your slot'], 'constraints' => [new NotBlank(['message' => 'Please provide your slot'])], 'choice_translation_domain' => true, 'data' => $options['slot']]) - ->add('submit', SubmitType::class, ['label' => 'Send', 'attr' => ['class' => 'submit']]); + //Add slot field + $form->add('slot', EntityType::class, ['class' => 'RapsysAirBundle:Slot', 'attr' => ['placeholder' => 'Your slot'], 'constraints' => [new NotBlank(['message' => 'Please provide your slot'])], 'choice_translation_domain' => true, 'data' => $options['slot_default']]); //Add extra user field - if (!empty($options['admin'])) { - $users = $this->doctrine->getRepository(User::class)->findAllWithTranslatedGroupAndCivility($this->translator); - $form - ->add('location', EntityType::class, ['class' => 'RapsysAirBundle:Location', 'attr' => ['placeholder' => 'Your location'], 'choice_translation_domain' => true, 'constraints' => [new NotBlank(['message' => 'Please provide your location'])], 'data' => $options['location']]) - ->add('user', ChoiceType::class, ['attr' => ['placeholder' => 'Your user'], 'choice_translation_domain' => false, 'constraints' => [new NotBlank(['message' => 'Please provide your user'])], 'choices' => $users, 'data' => $options['user']]); - //Add user locations - } else { - $locations = $this->doctrine->getRepository(Location::class)->findByUserId($options['user']); - $form->add('location', EntityType::class, ['class' => 'RapsysAirBundle:Location', 'choices' => $locations, 'attr' => ['placeholder' => 'Your location'], 'choice_translation_domain' => true, 'constraints' => [new NotBlank(['message' => 'Please provide your location'])], 'data' => $options['location']]); + if (!empty($options['user'])) { + //XXX: choicetype used here to use our own custom translated string + $form->add('user', ChoiceType::class, ['attr' => ['placeholder' => 'Your user'], 'choice_translation_domain' => false, 'constraints' => [new NotBlank(['message' => 'Please provide your user'])], 'choices' => $options['user_choices'], 'empty_data' => $options['user_default']]); } + //Add submit + $form->add('submit', SubmitType::class, ['label' => 'Send', 'attr' => ['class' => 'submit']]); + //Return form return $form; } @@ -63,12 +65,38 @@ class ApplicationType extends AbstractType { * {@inheritdoc} */ public function configureOptions(OptionsResolver $resolver) { - //XXX: 1 should be the first user - $resolver->setDefaults(['error_bubbling' => true, 'admin' => false, 'slot' => null, 'location' => null, 'user' => 1]); - $resolver->setAllowedTypes('admin', 'boolean'); - $resolver->setAllowedTypes('location', [Location::class, 'null']); - $resolver->setAllowedTypes('slot', [Slot::class, 'null']); - $resolver->setAllowedTypes('user', 'integer'); + //Set defaults + $resolver->setDefaults(['error_bubbling' => true, 'dance_choices' => [], 'dance_default' => null, 'dance_favorites' => [], 'location_choices' => [], 'location_default' => null, 'location_favorites' => [], 'slot_default' => null, 'user' => true, 'user_choices' => [], 'user_default' => 1]); + + //Add dance choices + $resolver->setAllowedTypes('dance_choices', 'array'); + + //Add dance default + $resolver->setAllowedTypes('dance_default', [Dance::class, 'null']); + + //Add dance favorites + $resolver->setAllowedTypes('dance_favorites', 'array'); + + //Add location choices + $resolver->setAllowedTypes('location_choices', 'array'); + + //Add location default + $resolver->setAllowedTypes('location_default', [Location::class, 'null']); + + //Add location favorites + $resolver->setAllowedTypes('location_favorites', 'array'); + + //Add slot default + $resolver->setAllowedTypes('slot_default', [Slot::class, 'null']); + + //Add user field + $resolver->setAllowedTypes('user', 'boolean'); + + //Add user choices + $resolver->setAllowedTypes('user_choices', 'array'); + + //Add user default + $resolver->setAllowedTypes('user_default', 'integer'); } /** -- 2.41.1