Add snippet hat field

[airbundle] / Form / ApplicationType.php

diff --git a/Form/ApplicationType.php b/Form/ApplicationType.php
index 0607d982913ec4b4b45f59fb6eabbcc674aa304d..ef6819abf6e4cc86c9cca4b2be4ce8dee87ebac7 100644 (file)
--- a/Form/ApplicationType.php
+++ b/Form/ApplicationType.php
@@ -8,7 +8,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\DateType;

-use Symfony\Component\Form\Extension\Core\Type\HiddenType;

 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Validator\Constraints\Date;
 use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Validator\Constraints\Date;
 use Symfony\Component\Validator\Constraints\NotBlank;


@@ -16,6 +15,7 @@ use Symfony\Bridge\Doctrine\RegistryInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 use Rapsys\AirBundle\Entity\User;
 use Rapsys\AirBundle\Entity\Slot;
 use Symfony\Component\Translation\TranslatorInterface;
 use Rapsys\AirBundle\Entity\User;
 use Rapsys\AirBundle\Entity\Slot;

+use Rapsys\AirBundle\Entity\Location;

 
 class ApplicationType extends AbstractType {
        //Doctrine instance
 
 class ApplicationType extends AbstractType {
        //Doctrine instance


@@ -38,7 +38,6 @@ class ApplicationType extends AbstractType {
 
                //Create base form
                $form = $builder
 
                //Create base form
                $form = $builder

-                       ->add('location', EntityType::class, ['class' => 'RapsysAirBundle:Location', 'attr' => ['placeholder' => 'Your location'], 'choice_translation_domain' => true, 'constraints' => [new NotBlank(['message' => 'Please provide your location'])]])

                        ->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('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']])


@@ -46,8 +45,14 @@ class ApplicationType extends AbstractType {
 
                //Add extra user field
                if (!empty($options['admin'])) {
 
                //Add extra user field
                if (!empty($options['admin'])) {

-                       $users = $this->doctrine->getRepository(User::class)->findAllWithTranslatedGroupAndTitle($this->translator);
-                       $form->add('user', ChoiceType::class, ['attr' => ['placeholder' => 'Your user'], 'constraints' => [new NotBlank(['message' => 'Please provide your user'])], 'choices' => $users, 'data' => $options['user'], 'choice_translation_domain' => false]);
+                       $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']]);

                }
 
                //Return form
                }
 
                //Return form


@@ -59,8 +64,9 @@ class ApplicationType extends AbstractType {
         */
        public function configureOptions(OptionsResolver $resolver) {
                //XXX: 1 should be the first user
         */
        public function configureOptions(OptionsResolver $resolver) {
                //XXX: 1 should be the first user

-               $resolver->setDefaults(['error_bubbling' => true, 'admin' => false, 'slot' => null, 'user' => 1]);
+               $resolver->setDefaults(['error_bubbling' => true, 'admin' => false, 'slot' => null, 'location' => null, 'user' => 1]);

                $resolver->setAllowedTypes('admin', 'boolean');
                $resolver->setAllowedTypes('admin', 'boolean');

+               $resolver->setAllowedTypes('location', [Location::class, 'null']);

                $resolver->setAllowedTypes('slot', [Slot::class, 'null']);
                $resolver->setAllowedTypes('user', 'integer');
        }
                $resolver->setAllowedTypes('slot', [Slot::class, 'null']);
                $resolver->setAllowedTypes('user', 'integer');
        }