Merge branch 'master' of https://github.com/netgen/LiveVotingBundle

ezpublishlegacy · Jul 31, 2015 · 42893c2 · 42893c2
2 parents 1c51bca + b36b08f
commit 42893c2
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/Form/EventType.php b/Form/EventType.php
@@ -43,8 +43,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'required'    => false,
                 'empty_value' => '(Leave like this to remain master event)',
                 'empty_data' => null))
-            ->add('begin')
-            ->add('end')
+            ->add('begin', "datetime", array(
+                "years" => range(date('Y') - 0, date('Y') + 5),
+            ))
+            ->add('end', "datetime", array(
+                "years" => range(date('Y') - 0, date('Y') + 5)
+            ))
         ;
 
     }

diff --git a/Form/PresentationType.php b/Form/PresentationType.php
@@ -24,8 +24,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ))
             ->add('globalBrake', 'checkbox', array('attr' => array('class' => 'form-control'), "label" => "Global break (lunch, pause, etc.)", 'required' => false))
             ->add('hall', 'text' ,array('attr' => array('class' => 'form-control')))
-            ->add('begin', 'datetime')
-            ->add('end', 'datetime')
+            ->add('begin', 'datetime', array(
+                "years" => range(date('Y') - 0, date('Y') + 5)
+            ))
+            ->add('end', 'datetime', array(
+                "years" => range(date('Y') - 0, date('Y') + 5)
+            ))
             ->add('joind_in_id', 'text', array('attr' => array('class' => 'form-control'), 'required' => false))
             //->add('event', 'entity', array('class'=>'Netgen\LiveVotingBundle\Entity\Event', 'disabled'=>true))
         ;

diff --git a/Form/RegistrationType.php b/Form/RegistrationType.php
@@ -20,8 +20,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'choices' => array('Beginner'=>'Beginner', 'Intermediate'=>'Intermediate', 'Advanced'=>'Advanced'),
                 'label' => 'Developer level'
             ))
-            ->add('arrivalTime')
-            ->add('departureTime')
+            ->add('arrivalTime', "datetime", array(
+                "years" => range(date('Y') - 0, date('Y') + 5)
+            ))
+            ->add('departureTime', "datetime", array(
+                "years" => range(date('Y') - 0, date('Y') + 5)
+            ))
             ->add('event', null ,array('label'=>'Master Event'))
             ->add('user', 'entity', array(
                 'attr' => array('class' => 'form-control'),

diff --git a/Form/RegistrationUserType.php b/Form/RegistrationUserType.php
@@ -19,8 +19,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'choices' => array('Beginner'=>'Beginner', 'Intermediate'=>'Intermediate', 'Advanced'=>'Advanced'),
                 'label' => 'Developer level'
             ))
-            ->add('arrivalTime')
-            ->add('departureTime')
+            ->add('arrivalTime', "datetime", array(
+                "years" => range(date('Y') - 0, date('Y') + 5)
+            ))
+            ->add('departureTime', "datetime", array(
+                "years" => range(date('Y') - 0, date('Y') + 5)
+            ))
         ;
     }