Merge pull request #25 from sumocoders/92-better-datepicker

Use better datepicker
sumocoders · Sep 21, 2017 · 6e44861 · 6e44861
2 parents 1eda628 + ba9817b
commit 6e44861
Show file tree

Hide file tree

Showing 4 changed files with 200 additions and 66 deletions.
diff --git a/Form/Type/DatePickerType.php b/Form/Type/DatePickerType.php
@@ -2,6 +2,7 @@
 
 namespace SumoCoders\FrameworkExampleBundle\Form\Type;
 
+use IntlDateFormatter;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\BirthdayType;
 use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
@@ -24,112 +25,102 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'date_example1',
                 DateType::class,
                 array(
+                    'format' => IntlDateFormatter::LONG,
                     'data' => $currentDate,
                     'widget' => 'choice',
                     'required' => false,
+                    'label' => 'datePicker.date.example',
                 )
             )
             ->add(
                 'date_example2',
                 DateType::class,
-                array(
-                    'data' => $currentDate,
-                    'widget' => 'text',
-                    'required' => false,
-                )
-            )
-            ->add(
-                'date_example3',
-                DateType::class,
                 array(
                     'data' => $dateInThePast,
                     'widget' => 'single_text',
                     'required' => false,
+                    'label' => 'datePicker.date.example',
                 )
             )
             ->add(
-                'date_example4',
+                'date_example3',
                 DateType::class,
                 array(
                     'data' => $dateInThePast,
                     'widget' => 'single_text',
                     'datepicker' => true,
                     'required' => false,
+                    'label' => 'datePicker.date.example',
                 )
             )
             ->add(
-                'date_example5',
+                'date_example4',
                 DateType::class,
                 array(
                     'data' => $currentDate,
                     'widget' => 'single_text',
                     'datepicker' => true,
-                    'date_type' => 'normal',
                     'required' => false,
+                    'label' => 'datePicker.date.example',
                 )
             )
             ->add(
-                'date_example6',
+                'date_example5',
                 DateType::class,
                 array(
                     'data' => $currentDate,
                     'widget' => 'single_text',
                     'datepicker' => true,
-                    'date_type' => 'start',
                     'minimum_date' => new \DateTime('last monday'),
                     'required' => false,
+                    'label' => 'datePicker.date.example',
                 )
             )
             ->add(
-                'date_example7',
+                'date_example6',
                 DateType::class,
                 array(
                     'data' => $currentDate,
                     'widget' => 'single_text',
                     'datepicker' => true,
-                    'date_type' => 'until',
                     'maximum_date' => new \DateTime('next friday'),
                     'required' => false,
+                    'label' => 'datePicker.date.example',
                 )
             )
             ->add(
-                'date_example8',
+                'date_example7',
                 DateType::class,
                 array(
                     'data' => $currentDate,
                     'widget' => 'single_text',
                     'datepicker' => true,
-                    'date_type' => 'range',
                     'minimum_date' => new \DateTime('last monday'),
                     'maximum_date' => new \DateTime('next friday'),
                     'required' => false,
+                    'label' => 'datePicker.date.example',
                 )
             )
             ->add(
                 'datetime_example1',
                 DateTimeType::class,
                 array(
+                    'date_format' => IntlDateFormatter::LONG,
                     'data' => $currentDate,
                     'widget' => 'choice',
                     'required' => false,
+                    'label' => 'datePicker.datetime.example',
                 )
             )
             ->add(
                 'datetime_example2',
                 DateTimeType::class,
-                array(
-                    'data' => $currentDate,
-                    'widget' => 'text',
-                    'required' => false,
-                )
-            )
-            ->add(
-                'datetime_example3',
-                DateTimeType::class,
                 array(
                     'data' => $currentDate,
                     'widget' => 'single_text',
                     'required' => false,
+                    'datetimepicker' => true,
+                    'label' => 'datePicker.datetime.example',
                 )
             )
             ->add(
@@ -139,61 +130,49 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'data' => $currentDate,
                     'widget' => 'choice',
                     'required' => false,
+                    'label' => 'datePicker.time.example',
                 )
             )
             ->add(
                 'time_example2',
                 TimeType::class,
-                array(
-                    'data' => $currentDate,
-                    'widget' => 'text',
-                    'required' => false,
-                )
-            )
-            ->add(
-                'time_example3',
-                TimeType::class,
                 array(
                     'data' => $currentDate,
                     'widget' => 'single_text',
                     'required' => false,
+                    'label' => 'datePicker.time.example',
                 )
             )
             ->add(
                 'birthday_example1',
                 BirthdayType::class,
                 array(
+                    'format' => IntlDateFormatter::LONG,
                     'data' => $dateInThePast,
                     'widget' => 'choice',
                     'required' => false,
+                    'label' => 'datePicker.birthday.example',
                 )
             )
             ->add(
                 'birthday_example2',
                 BirthdayType::class,
-                array(
-                    'data' => $dateInThePast,
-                    'widget' => 'text',
-                    'required' => false,
-                )
-            )
-            ->add(
-                'birthday_example3',
-                BirthdayType::class,
                 array(
                     'data' => $dateInThePast,
                     'widget' => 'single_text',
                     'required' => false,
+                    'label' => 'datePicker.birthday.example',
                 )
             )
             ->add(
-                'birthday_example4',
+                'birthday_example3',
                 BirthdayType::class,
                 array(
                     'data' => $dateInThePast,
                     'widget' => 'single_text',
                     'datepicker' => true,
                     'required' => false,
+                    'label' => 'datePicker.birthday.example',
                 )
             )
         ;

diff --git a/Resources/translations/messages.nl.yml b/Resources/translations/messages.nl.yml
@@ -25,7 +25,7 @@ example:
     fieldset: fieldset
 
 datePicker:
-  birthday.example: geboortedatg
+  birthday.example: geboortedag
   date.example: datum
   datetime.example: datum en tijd
   time.example: tijd