From fe30a995fbdef62bbb9c99c390baf065a6f35040 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Mon, 30 Nov 2020 10:05:54 +0100 Subject: [PATCH] Add location prefill when on a location view --- Controller/LocationController.php | 4 +++- Form/ApplicationType.php | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Controller/LocationController.php b/Controller/LocationController.php index 0f47a99..7f1a96b 100644 --- a/Controller/LocationController.php +++ b/Controller/LocationController.php @@ -48,7 +48,9 @@ class LocationController extends DefaultController { 'user' => $this->getUser()->getId(), //Set default slot to evening //XXX: default to Evening (3) - 'slot' => $doctrine->getRepository(Slot::class)->findOneById(3) + 'slot' => $doctrine->getRepository(Slot::class)->findOneById(3), + //Set default location to current one + 'location' => $location ]); //Add form to context diff --git a/Form/ApplicationType.php b/Form/ApplicationType.php index 0607d98..8778fe9 100644 --- a/Form/ApplicationType.php +++ b/Form/ApplicationType.php @@ -16,6 +16,7 @@ use Symfony\Bridge\Doctrine\RegistryInterface; 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 @@ -38,7 +39,7 @@ class ApplicationType extends AbstractType { //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('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('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']]) @@ -59,8 +60,9 @@ class ApplicationType extends AbstractType { */ 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('location', [Location::class, 'null']); $resolver->setAllowedTypes('slot', [Slot::class, 'null']); $resolver->setAllowedTypes('user', 'integer'); } -- 2.41.1