Skip to content
This repository was archived by the owner on Feb 16, 2021. It is now read-only.

Commit 6e44861

Browse files
jonasdekeukelaerejonasdekeukelaere
authored
Merge pull request #25 from sumocoders/92-better-datepicker
Use better datepicker
2 parents 1eda628 + ba9817b commit 6e44861

File tree

4 files changed

+200
-66
lines changed

4 files changed

+200
-66
lines changed

‎Form/Type/DatePickerType.php

Lines changed: 25 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace SumoCoders\FrameworkExampleBundle\Form\Type;
44

5+
use IntlDateFormatter;
56
use Symfony\Component\Form\AbstractType;
67
use Symfony\Component\Form\Extension\Core\Type\BirthdayType;
78
use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
@@ -24,112 +25,102 @@ public function buildForm(FormBuilderInterface $builder, array $options)
2425
'date_example1',
2526
DateType::class,
2627
array(
28+
'format' => IntlDateFormatter::LONG,
2729
'data' => $currentDate,
2830
'widget' => 'choice',
2931
'required' => false,
32+
'label' => 'datePicker.date.example',
3033
)
3134
)
3235
->add(
3336
'date_example2',
3437
DateType::class,
35-
array(
36-
'data' => $currentDate,
37-
'widget' => 'text',
38-
'required' => false,
39-
)
40-
)
41-
->add(
42-
'date_example3',
43-
DateType::class,
4438
array(
4539
'data' => $dateInThePast,
4640
'widget' => 'single_text',
4741
'required' => false,
42+
'label' => 'datePicker.date.example',
4843
)
4944
)
5045
->add(
51-
'date_example4',
46+
'date_example3',
5247
DateType::class,
5348
array(
5449
'data' => $dateInThePast,
5550
'widget' => 'single_text',
5651
'datepicker' => true,
5752
'required' => false,
53+
'label' => 'datePicker.date.example',
5854
)
5955
)
6056
->add(
61-
'date_example5',
57+
'date_example4',
6258
DateType::class,
6359
array(
6460
'data' => $currentDate,
6561
'widget' => 'single_text',
6662
'datepicker' => true,
67-
'date_type' => 'normal',
6863
'required' => false,
64+
'label' => 'datePicker.date.example',
6965
)
7066
)
7167
->add(
72-
'date_example6',
68+
'date_example5',
7369
DateType::class,
7470
array(
7571
'data' => $currentDate,
7672
'widget' => 'single_text',
7773
'datepicker' => true,
78-
'date_type' => 'start',
7974
'minimum_date' => new \DateTime('last monday'),
8075
'required' => false,
76+
'label' => 'datePicker.date.example',
8177
)
8278
)
8379
->add(
84-
'date_example7',
80+
'date_example6',
8581
DateType::class,
8682
array(
8783
'data' => $currentDate,
8884
'widget' => 'single_text',
8985
'datepicker' => true,
90-
'date_type' => 'until',
9186
'maximum_date' => new \DateTime('next friday'),
9287
'required' => false,
88+
'label' => 'datePicker.date.example',
9389
)
9490
)
9591
->add(
96-
'date_example8',
92+
'date_example7',
9793
DateType::class,
9894
array(
9995
'data' => $currentDate,
10096
'widget' => 'single_text',
10197
'datepicker' => true,
102-
'date_type' => 'range',
10398
'minimum_date' => new \DateTime('last monday'),
10499
'maximum_date' => new \DateTime('next friday'),
105100
'required' => false,
101+
'label' => 'datePicker.date.example',
106102
)
107103
)
108104
->add(
109105
'datetime_example1',
110106
DateTimeType::class,
111107
array(
108+
'date_format' => IntlDateFormatter::LONG,
112109
'data' => $currentDate,
113110
'widget' => 'choice',
114111
'required' => false,
112+
'label' => 'datePicker.datetime.example',
115113
)
116114
)
117115
->add(
118116
'datetime_example2',
119117
DateTimeType::class,
120-
array(
121-
'data' => $currentDate,
122-
'widget' => 'text',
123-
'required' => false,
124-
)
125-
)
126-
->add(
127-
'datetime_example3',
128-
DateTimeType::class,
129118
array(
130119
'data' => $currentDate,
131120
'widget' => 'single_text',
132121
'required' => false,
122+
'datetimepicker' => true,
123+
'label' => 'datePicker.datetime.example',
133124
)
134125
)
135126
->add(
@@ -139,61 +130,49 @@ public function buildForm(FormBuilderInterface $builder, array $options)
139130
'data' => $currentDate,
140131
'widget' => 'choice',
141132
'required' => false,
133+
'label' => 'datePicker.time.example',
142134
)
143135
)
144136
->add(
145137
'time_example2',
146138
TimeType::class,
147-
array(
148-
'data' => $currentDate,
149-
'widget' => 'text',
150-
'required' => false,
151-
)
152-
)
153-
->add(
154-
'time_example3',
155-
TimeType::class,
156139
array(
157140
'data' => $currentDate,
158141
'widget' => 'single_text',
159142
'required' => false,
143+
'label' => 'datePicker.time.example',
160144
)
161145
)
162146
->add(
163147
'birthday_example1',
164148
BirthdayType::class,
165149
array(
150+
'format' => IntlDateFormatter::LONG,
166151
'data' => $dateInThePast,
167152
'widget' => 'choice',
168153
'required' => false,
154+
'label' => 'datePicker.birthday.example',
169155
)
170156
)
171157
->add(
172158
'birthday_example2',
173159
BirthdayType::class,
174-
array(
175-
'data' => $dateInThePast,
176-
'widget' => 'text',
177-
'required' => false,
178-
)
179-
)
180-
->add(
181-
'birthday_example3',
182-
BirthdayType::class,
183160
array(
184161
'data' => $dateInThePast,
185162
'widget' => 'single_text',
186163
'required' => false,
164+
'label' => 'datePicker.birthday.example',
187165
)
188166
)
189167
->add(
190-
'birthday_example4',
168+
'birthday_example3',
191169
BirthdayType::class,
192170
array(
193171
'data' => $dateInThePast,
194172
'widget' => 'single_text',
195173
'datepicker' => true,
196174
'required' => false,
175+
'label' => 'datePicker.birthday.example',
197176
)
198177
)
199178
;

‎Resources/translations/messages.nl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ example:
2525
fieldset: fieldset
2626

2727
datePicker:
28-
birthday.example: geboortedatg
28+
birthday.example: geboortedag
2929
date.example: datum
3030
datetime.example: datum en tijd
3131
time.example: tijd

0 commit comments

Comments
 (0)