Add date/time-picker, autocomplete support for forms2 (deform)

tailbone/forms2/__init__.py

@@ -26,4 +26,5 @@ Forms Library
 
 from __future__ import unicode_literals, absolute_import
 
+from . import widgets
 from .core import Form

tailbone/forms2/core.py

@@ -45,6 +45,7 @@ from pyramid.renderers import render
 from webhelpers2.html import tags, HTML
 
 from tailbone.util import raw_datetime
+from .widgets import ReadonlyWidget, JQueryDateWidget, JQueryTimeWidget
 
 
 log = logging.getLogger(__name__)
@@ -244,10 +245,16 @@ class Form(object):
                         and not f.startswith('_')
                         and f != 'versions']
 
+            # filter list further, to avoid magic for nodes we already have
+            auto_includes = list(includes)
+            for field in self.nodes:
+                if field in auto_includes:
+                    auto_includes.remove(field)
+
             # make schema - only include *property* fields at this point
             schema = CustomSchemaNode(self.model_class,
                                       includes=[p.key for p in mapper.iterate_properties
-                                                if p.key in includes])
+                                                if p.key in auto_includes])
 
             # for now, must manually add any "extra" fields?  this includes all
             # association proxy fields, not sure how other fields will behave
@@ -256,6 +263,8 @@ class Form(object):
                     node = self.nodes.get(field)
                     if not node:
                         node = colander.SchemaNode(colander.String(), name=field, missing='')
+                    if not node.name:
+                        node.name = field
                     schema.add(node)
 
             # apply any label overrides
@@ -311,6 +320,10 @@ class Form(object):
             self.set_renderer(key, self.render_datetime)
         elif type_ == 'datetime_local':
             self.set_renderer(key, self.render_datetime_local)
+        elif type_ == 'date_jquery':
+            self.set_widget(key, JQueryDateWidget())
+        elif type_ == 'time_jquery':
+            self.set_widget(key, JQueryTimeWidget())
         elif type_ == 'duration':
             self.set_renderer(key, self.render_duration)
         elif type_ == 'boolean':
@@ -478,13 +491,3 @@ class Form(object):
     def validate(self, *args, **kwargs):
         form = self.make_deform_form()
         return form.validate(*args, **kwargs)
-
-
-class ReadonlyWidget(dfwidget.HiddenWidget):
-
-    readonly = True
-
-    def serialize(self, field, cstruct, **kw):
-        if cstruct in (colander.null, None):
-            cstruct = ''
-        return HTML.tag('span', cstruct) + tags.hidden(field.name, value=cstruct, id=field.oid)

tailbone/forms2/widgets.py

@@ -0,0 +1,122 @@
+# -*- coding: utf-8; -*-
+################################################################################
+#
+#  Rattail -- Retail Software Framework
+#  Copyright © 2010-2017 Lance Edgar
+#
+#  This file is part of Rattail.
+#
+#  Rattail is free software: you can redistribute it and/or modify it under the
+#  terms of the GNU General Public License as published by the Free Software
+#  Foundation, either version 3 of the License, or (at your option) any later
+#  version.
+#
+#  Rattail is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+#  details.
+#
+#  You should have received a copy of the GNU General Public License along with
+#  Rattail.  If not, see <http://www.gnu.org/licenses/>.
+#
+################################################################################
+"""
+Form Widgets
+"""
+
+from __future__ import unicode_literals, absolute_import
+
+import six
+import json
+
+import colander
+from deform import widget as dfwidget
+from webhelpers2.html import tags, HTML
+
+
+class ReadonlyWidget(dfwidget.HiddenWidget):
+
+    readonly = True
+
+    def serialize(self, field, cstruct, **kw):
+        if cstruct in (colander.null, None):
+            cstruct = ''
+        return HTML.tag('span', cstruct) + tags.hidden(field.name, value=cstruct, id=field.oid)
+
+
+class JQueryDateWidget(dfwidget.DateInputWidget):
+    """
+    Uses the jQuery datepicker UI widget, instead of whatever it is deform uses
+    by default.
+    """
+    template = 'date_jquery'
+    type_name = 'text'
+    requirements = None
+
+    default_options = (
+        ('changeYear', False),
+    )
+
+    def serialize(self, field, cstruct, **kw):
+        if cstruct in (colander.null, None):
+            cstruct = ''
+        readonly = kw.get('readonly', self.readonly)
+        template = readonly and self.readonly_template or self.template
+        options = dict(
+            kw.get('options') or self.options or self.default_options
+            )
+        options['dateFormat'] = 'yy-mm-dd'
+        kw.setdefault('options_json', json.dumps(options))
+        values = self.get_template_values(field, cstruct, kw)
+        return field.renderer(template, **values)
+
+
+class JQueryTimeWidget(dfwidget.TimeInputWidget):
+    """
+    Uses the jQuery datepicker UI widget, instead of whatever it is deform uses
+    by default.
+    """
+    template = 'time_jquery'
+    type_name = 'text'
+    requirements = None
+    default_options = (
+        ('showPeriod', True),
+    )
+
+
+class JQueryAutocompleteWidget(dfwidget.AutocompleteInputWidget):
+    """ 
+    Uses the jQuery autocomplete plugin, instead of whatever it is deform uses
+    by default.
+    """
+    template = 'autocomplete_jquery'
+    requirements = None
+    field_display = ""
+    service_url = None
+
+    default_options = (
+        ('autoFocus', True),
+    )
+    options = None
+
+    def serialize(self, field, cstruct, **kw):
+        if 'delay' in kw or getattr(self, 'delay', None):
+            raise ValueError(
+                'AutocompleteWidget does not support *delay* parameter '
+                'any longer.'
+            )
+        if cstruct in (colander.null, None):
+            cstruct = ''
+        self.values = self.values or []
+        readonly = kw.get('readonly', self.readonly)
+
+        options = dict(
+            kw.get('options') or self.options or self.default_options
+        )
+        options['source'] = self.service_url
+
+        kw['options'] = json.dumps(options)
+        kw['field_display'] = self.field_display
+        tmpl_values = self.get_template_values(field, cstruct, kw)
+        template = readonly and self.readonly_template or self.template
+        return field.renderer(template, **tmpl_values)