Index: django/forms/extras/widgets.py =================================================================== --- django/forms/extras/widgets.py (revision 9337) +++ django/forms/extras/widgets.py (working copy) @@ -6,74 +6,239 @@ import re from django.forms.widgets import Widget, Select -from django.utils.dates import MONTHS +from django.utils.dates import MONTHS, MONTHS_AP, MONTHS_3 from django.utils.safestring import mark_safe +from django.conf import settings -__all__ = ('SelectDateWidget',) +__all__ = ('SelectDateWidget', 'SelectTimeWidget',) -RE_DATE = re.compile(r'(\d{4})-(\d\d?)-(\d\d?)$') -class SelectDateWidget(Widget): +class SelectDateWidgetBase(Widget): """ - A Widget that splits date input into three boxes. + """ + def __init__(self, attrs=None, years=None, format=None): # years is an optional list/tuple of years to use in the "year" select box. - self.attrs = attrs or {} if years: self.years = years else: this_year = datetime.date.today().year self.years = range(this_year, this_year+10) + super(SelectDateWidget, self).__init__(attrs, format) - def render(self, name, value, attrs=None): - try: - year_val, month_val, day_val = value.year, value.month, value.day - except AttributeError: - year_val = month_val = day_val = None - if isinstance(value, basestring): - match = RE_DATE.match(value) - if match: - year_val, month_val, day_val = [int(v) for v in match.groups()] + def value_from_datadict(self, data, files, name): + vals = [] + y = data.get('%s_year' % name) + m = data.get('%s_month' % name) + d = data.get('%s_day' % name) + if y and m and d: + return u'-'.join([y, m, d]) + return data.get(name, None) - output = [] - - if 'id' in self.attrs: - id_ = self.attrs['id'] + def parse_value(self, val): + ret = {} + if isinstance(val, datetime.date): + ret['month'] = val.month + ret['day'] = val.day + ret['year'] = val.year else: - id_ = 'id_%s' % name + try: + l = map(int, val.split('-')) + except (ValueError, AttributeError): + l = (None, None, None) + for i, k in [(0, 'year'), (1, 'month'), (2, 'day')]: + try: + ret[k] = l[i] + except IndexError: + ret[k] = None + return ret - month_choices = MONTHS.items() - month_choices.sort() - local_attrs = self.build_attrs(id=self.month_field % id_) - select_html = Select(choices=month_choices).render(self.month_field % name, month_val, local_attrs) - output.append(select_html) + def parse_format(self, fmt): + """ + Parse the given format `fmt` and set the format property. + """ + if fmt is None: + fmt = settings.DATE_FORMAT + ret = [] + for item in fmt: + if item in ['d', 'D', 'j', 'L']: + ret.append(('day', item,)) + elif item in ['n', 'm', 'F', 'b', 'M', 'N']: + ret.append(('month', item,)) + elif item in ['y', 'Y']: + ret.append(('year', item,)) + return ret - day_choices = [(i, i) for i in range(1, 32)] - local_attrs['id'] = self.day_field % id_ - select_html = Select(choices=day_choices).render(self.day_field % name, day_val, local_attrs) - output.append(select_html) + def month_choices(self, fmt): + """ + Return list of choices (tuple (key, value)) for monthes select. + """ + if fmt == 'n': + # month numbers without leading 0 (1 .. 12) + return [(i, i) for i in range(1, 13)] + elif fmt == 'm': + # month numbers with leading 0 (01 .. 12) + return [(i, '%02d' % i) for i in range(1, 13)] + elif fmt in ['F', 'b', 'M', 'N']: + if fmt == 'F': + # full month names + month_choices = MONTHS.items() + elif fmt == 'b': + # 3 first letters of month lowercase + month_choices = [(k, v.lower()) for (k, v) in MONTHS_3.items()] + elif fmt == 'M': + # 3 first letters of month + month_choices = MONTHS_3.items() + elif fmt == 'N': + # abbrev of month names + month_choices = MONTHS_AP.items() + month_choices.sort() + return month_choices + return [] - year_choices = [(i, i) for i in self.years] - local_attrs['id'] = self.year_field % id_ - select_html = Select(choices=year_choices).render(self.year_field % name, year_val, local_attrs) - output.append(select_html) + def day_choices(self, fmt): + """ + Return list of choices (tuple (key, value)) for days select. + """ + if fmt == 'j': + # day of month number without leading 0 + return [(i, i) for i in range(1, 32)] + elif fmt == 'd': + # day of month number with leading 0 + return [(i, '%02d' % i) for i in range(1, 32)] + return [] - return mark_safe(u'\n'.join(output)) + def year_choices(self, fmt): + """ + Return list of choices (tuple (key, value)) for years select. + """ + if fmt == 'Y': + # years with 4 numbers + return [(i, i) for i in self.years] + elif fmt == 'y': + # years with only the last 2 numbers + return [(i, str(i)[-2:]) for i in self.years] + return [] - def id_for_label(self, id_): - return '%s_month' % id_ - id_for_label = classmethod(id_for_label) +class SelectTimeWidget(SelectDateWidgetBase): + """ + A Widget that splits time input into two or three @@ -234,6 +234,128 @@ 2008-04-01 +# SelectTimeWidget ############################################################ + +>>> from django.forms.extras import SelectTimeWidget +>>> w = SelectTimeWidget() +>>> print w.render('mytime', '') + + + +Accepts a datetime or a string: + +>>> w.render('mydate', datetime.time(15, 45, 15)) == w.render('mydate', '15:45:15') +True + +Using a SelectDateWidget in a form: + +>>> class GetTime(Form): +... mytime = TimeField(widget=SelectTimeWidget) +>>> a = GetTime({'mytime_hour':'15', 'mytime_minute':'45', 'mytime_second':'15'}) +>>> print a.is_valid() +True +>>> print a.cleaned_data['mytime'] +15:45:15 + +As with any widget that implements get_value_from_datadict, +we must be prepared to accept the input from the "as_hidden" +rendering as well. + +>>> print a['mytime'].as_hidden() + +>>> b=GetTime({'mytime':'15:45:15'}) +>>> print b.is_valid() +True +>>> print b.cleaned_data['mytime'] +15:45:15 + + # MultiWidget and MultiValueField ############################################# # MultiWidgets are widgets composed of other widgets. They are usually # combined with MultiValueFields - a field that is composed of other fields.