fix: improve support for date, datetime fields in grids, forms

tests/forms/test_base.py

@@ -162,6 +162,32 @@ class TestForm(TestCase):
         widget = form.make_widget('fdajvdafjjf')
         self.assertIsNone(widget)
 
+    def test_set_default_widgets(self):
+        model = self.app.model
+
+        # no defaults for "plain" schema
+        form = self.make_form(fields=['foo', 'bar'])
+        self.assertEqual(form.widgets, {})
+
+        # no defaults for "plain" mapped class
+        form = self.make_form(model_class=model.Setting)
+        self.assertEqual(form.widgets, {})
+
+        class MyWidget(widgets.Widget):
+            pass
+
+        # widget set for datetime mapped field
+        form = self.make_form(model_class=model.Upgrade)
+        self.assertIn('created', form.widgets)
+        self.assertIsNot(form.widgets['created'], MyWidget)
+        self.assertNotIsInstance(form.widgets['created'], MyWidget)
+
+        # widget *not* set for datetime, if override present
+        form = self.make_form(model_class=model.Upgrade,
+                              widgets={'created': MyWidget()})
+        self.assertIn('created', form.widgets)
+        self.assertIsInstance(form.widgets['created'], MyWidget)
+
     def test_set_grid(self):
         form = self.make_form(fields=['foo', 'bar'])
         self.assertNotIn('foo', form.widgets)

tests/forms/test_schema.py

@@ -27,6 +27,12 @@ class TestWutaDateTime(TestCase):
         result = typ.deserialize(node, '2024-12-11T10:33 PM')
         self.assertIsInstance(result, datetime.datetime)
         self.assertEqual(result, datetime.datetime(2024, 12, 11, 22, 33))
+        self.assertIsNone(result.tzinfo)
+
+        result = typ.deserialize(node, '2024-12-11T22:33:00')
+        self.assertIsInstance(result, datetime.datetime)
+        self.assertEqual(result, datetime.datetime(2024, 12, 11, 22, 33))
+        self.assertIsNone(result.tzinfo)
 
         self.assertRaises(colander.Invalid, typ.deserialize, node, 'bogus')
 

tests/forms/test_widgets.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8; -*-
 
+import datetime
 from unittest.mock import patch
 
 import colander
@@ -8,7 +9,8 @@ from pyramid import testing
 
 from wuttaweb import grids
 from wuttaweb.forms import widgets as mod
-from wuttaweb.forms.schema import FileDownload, PersonRef, RoleRefs, UserRefs, Permissions
+from wuttaweb.forms.schema import (FileDownload, PersonRef, RoleRefs, UserRefs, Permissions,
+                                   WuttaDateTime)
 from tests.util import WebTestCase
 
 
@@ -79,6 +81,32 @@ class TestObjectRefWidget(WebTestCase):
         self.assertNotIn('url', values)
 
 
+class TestWuttaDateTimeWidget(WebTestCase):
+
+    def make_field(self, node, **kwargs):
+        # TODO: not sure why default renderer is in use even though
+        # pyramid_deform was included in setup?  but this works..
+        kwargs.setdefault('renderer', deform.Form.default_renderer)
+        return deform.Field(node, **kwargs)
+
+    def make_widget(self, **kwargs):
+        return mod.WuttaDateTimeWidget(self.request, **kwargs)
+
+    def test_serialize(self):
+        node = colander.SchemaNode(WuttaDateTime())
+        field = self.make_field(node)
+        widget = self.make_widget()
+        dt = datetime.datetime(2024, 12, 12, 13, 49, tzinfo=datetime.timezone.utc)
+
+        # editable widget has normal picker html
+        result = widget.serialize(field, str(dt))
+        self.assertIn('<wutta-datepicker', result)
+
+        # readonly is rendered per app convention
+        result = widget.serialize(field, str(dt), readonly=True)
+        self.assertEqual(result, '2024-12-12 13:49+0000')
+
+
 class TestFileDownloadWidget(WebTestCase):
 
     def make_field(self, node, **kwargs):