0001-forms-use-native-date-widget-if-available-11109.patch

Frédéric Péters, 04 avril 2020 20:49

Voir les différences: en ligne côte à côte

Subject: [PATCH] forms: use native date widget if available (#11109)

 wcs/qommon/form.py                            | 35 +++++++++----------
 wcs/qommon/static/js/qommon.forms.js          |  1 +
 .../templates/qommon/forms/widgets/date.html  | 12 +++++--
 3 files changed, 27 insertions(+), 21 deletions(-)

         def __init__(self, name, value=None, **kwargs):
             minimum_date = kwargs.pop('minimum_date', None)
             if minimum_date:
                 self.minimum_date = misc.get_as_datetime(minimum_date).timetuple()[:3]
                 self.minimum_date = misc.get_as_datetime(minimum_date)
             maximum_date = kwargs.pop('maximum_date', None)
             if maximum_date:
                 self.maximum_date = misc.get_as_datetime(maximum_date).timetuple()[:3]
                 self.maximum_date = misc.get_as_datetime(maximum_date)
             if kwargs.pop('minimum_is_future', False):
                 if kwargs.get('date_can_be_today'):
                     self.minimum_date = time.localtime()
                     self.minimum_date = datetime.date.today()
                 else:
                     self.minimum_date = (datetime.datetime.today() + datetime.timedelta(1)).timetuple()
                     self.minimum_date = (datetime.datetime.today() + datetime.timedelta(1))
             if kwargs.pop('date_in_the_past', False):
                 if kwargs.get('date_can_be_today'):
                     self.maximum_date = time.localtime()
                     self.maximum_date = datetime.date.today()
                 else:
                     self.maximum_date = (datetime.datetime.today() - datetime.timedelta(1)).timetuple()
                     self.maximum_date = (datetime.datetime.today() - datetime.timedelta(1))
             if 'date_can_be_today' in kwargs:
                 del kwargs['date_can_be_today']
-...
                 if value[0] < 1800 or value[0] > 2099:
                     self.error = _('invalid date')
                     self.value = None
                 elif self.minimum_date and value[:3] < self.minimum_date[:3]:
                 elif self.minimum_date and value[:3] < self.minimum_date.timetuple()[:3]:
                     self.error = _('invalid date: date must be on or after %s') % strftime(
                             misc.date_format(), datetime.datetime(*self.minimum_date[:6]))
                 elif self.maximum_date and value[:3] > self.maximum_date[:3]:
                     format_string = misc.date_format()
                             misc.date_format(), self.minimum_date)
                 elif self.maximum_date and value[:3] > self.maximum_date.timetuple()[:3]:
                     self.error = _('invalid date; date must be on or before %s') % strftime(
                             misc.date_format(), datetime.datetime(*self.maximum_date[:6]))
                             misc.date_format(), self.maximum_date)
         def add_media(self):
             self.prepare_javascript()
-...
         def date_format(self):
             return self.get_format_string().replace('%Y', 'yyyy').replace(
                     '%m', 'mm').replace('%d', 'dd').replace('%H', 'hh').replace(
                     '%M',  'ii').replace('%S', 'ss')
                     '%M', 'ii').replace('%S', 'ss')
         def start_date(self):
             return self.date_format().replace(
                         'yyyy', '%04d' % self.minimum_date[0]).replace(
                         'mm', '%02d' % self.minimum_date[1]).replace(
                         'dd', '%02d' % self.minimum_date[2]).replace(
                         'yyyy', '%04d' % self.minimum_date.year).replace(
                         'mm', '%02d' % self.minimum_date.month).replace(
                         'dd', '%02d' % self.minimum_date.day).replace(
                         'hh', '00').replace('ii', '00').replace('ss', '00')
         def end_date(self):
             return self.date_format().replace(
                         'yyyy', '%04d' % self.maximum_date[0]).replace(
                         'mm', '%02d' % self.maximum_date[1]).replace(
                         'dd', '%02d' % self.maximum_date[2]).replace(
                         'yyyy', '%04d' % self.maximum_date.year).replace(
                         'mm', '%02d' % self.maximum_date.month).replace(
                         'dd', '%02d' % self.maximum_date.day).replace(
                         'hh', '00').replace('ii', '00').replace('ss', '00')

wcs/qommon/static/js/qommon.forms.js
31	31	});
32	32	}
33	33	$('.date-pick').each(function() {
	34	if (this.type == "date") return; // prefer native date widget
34	35	var $date_input = $(this);
35	36	var options = Object();
36	37	options.autoclose = true;

     {% extends "qommon/forms/widget.html" %}
     {% block widget-control %}
     <input id="form_{{widget.name}}" name="{{widget.name}}" type="text"
     <input id="form_{{widget.name}}" name="{{widget.name}}" type="date"
       {% for attr in widget.attrs.items %}{{attr.0}}="{{attr.1}}"{% endfor %}
       {% if widget.required %}aria-required="true"{% endif %}
       {% if widget.value %}value="{{ widget.value }}"{% endif %}
-...
       {# it is more appropriate to select a far away date. #}
       data-start-view="{% if widget.value %}2{% else %}4{% endif %}"
       {% if widget.minimum_date %}data-start-date="{{ widget.start_date }}"{% endif %}
       {% if widget.maximum_date %}data-end-date="{{ widget.end_date }}"{% endif %}
       {% if widget.minimum_date %}
       data-start-date="{{ widget.start_date }}"
       min="{{widget.minimum_date|date:"Y-m-d"}}"
       {% endif %}
       {% if widget.maximum_date %}
       data-end-date="{{ widget.end_date }}"
       max="{{widget.maximum_date|date:"Y-m-d"}}"
       {% endif %}
       {% endif %}
+      >
     {% endblock %}
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-forms-use-native-date-widget-if-available-11109.patch