Changeset 310

Timestamp:

03/17/08 17:12:05 (9 months ago)

Author:

johnbywater

Message:

Changed date format from YYYY-MM-DD to DD-MM-YYYY.

Files:

• trunk/src/dm/datetimeconvertor.py (modified) (1 diff)
• trunk/src/dm/dom/base.py (modified) (1 diff)
• trunk/src/dm/dom/meta.py (modified) (2 diffs)
• trunk/src/dm/dom/metatest.py (modified) (2 diffs)
• trunk/src/dm/view/manipulator.py (modified) (19 diffs)
• trunk/src/dm/webkit/__init__.py (modified) (2 diffs)

trunk/src/dm/datetimeconvertor.py

@@ -57 +57 @@
-        )
-
+class RDateConvertor(object):  
+    "Converts between HTML (string) and python (mx.DateTime.Date)."
+        
+    def fromHTML(self, dateHtml):
+        day, month, year = None, None, None
+        if dateHtml in ['', None]:
+            return None
+        elif dateHtml.__class__ == "".__class__:
+            day, month, year = [int(i) for i in dateHtml.split('-')]
+        elif dateHtml.__class__ == datetime.date:
+            day, month, year = dateHtml.day, dateHtml.month, dateHtml.year
+        elif dateHtml.__class__ == datetime.datetime:
+            day, month, year = dateHtml.day, dateHtml.month, dateHtml.year
+        else:
+            msg = "Unsupported date input type: %s" % dateHtml.__class__
+            raise Exception(msg)
+        return mx.DateTime.Date(year, month, day)
+
+    def toHTML(self, dateObject):
+        if dateObject in ['', None]:
+            return ''
+        return "%s-%s-%s" % (
+            str(dateObject.day).zfill(2),
+            str(dateObject.month).zfill(2),
+            str(dateObject.year).zfill(4),
+        )
+

trunk/src/dm/dom/base.py

@@ -174 +174 @@
-        "Supports: len(registry)"
-        return self.count()
-        #return self.database.countRecords(self.typeName)
-
-    def __iter__(self, **kwds):

trunk/src/dm/dom/meta.py

@@ -8 +8 @@
-from dm.datetimeconvertor import DateTimeConvertor
-from dm.datetimeconvertor import DateConvertor
+from dm.datetimeconvertor import RDateConvertor
-import Image
-from dm.dictionarywords import IMAGES_DIR_PATH
@@ -394 +395 @@
-
-
+class RDate(DateTime):
+    "Models a domain object date attribute, but with 'reverse' ANSI format."
+    
+    convertor = RDateConvertor()
+
+
-class Boolean(ValueObjectAttr):
-    "Models a domain object boolean attribute."

trunk/src/dm/dom/metatest.py

@@ -16 +16 @@
-        unittest.makeSuite(TestDateTime),
-        unittest.makeSuite(TestDate),
+        unittest.makeSuite(TestRDate),
-        unittest.makeSuite(TestBoolean_True),
-        unittest.makeSuite(TestBoolean_False),
@@ -152 +153 @@
-
-
+class TestRDate(MetaAttrTestCase):
+    
+    fieldClass = dm.dom.meta.RDate
+    typeName = 'RDate'
+    isValueObject = True
+    htmlValue = '03-06-2007'
+    htmlRepr = '03-06-2007'
+    domValue = mx.DateTime.Date(2007, 6, 3)
+    dbValue = mx.DateTime.Date(2007, 6, 3)
+    
+    def test_convertor(self):
+        self.failUnless(self.field.convertor)
+
+
-class TestBoolean_True(MetaAttrTestCase):
-    

trunk/src/dm/view/manipulator.py

@@ -1 +1 @@
-from dm.ioc import *
-from dm.exceptions import KforgeCommandError
-from dm.webkit import *
-from dm.dictionarywords import WEBKIT_NAME
+from dm.webkit import Manipulator
+from dm.webkit import htmlescape
-import re
+import dm.webkit
-
-class BaseManipulator(Manipulator):
@@ -12 +14 @@
-    commands   = RequiredFeature('CommandSet')
-    logger     = RequiredFeature('Logger')
+    webkit     = dm.webkit
-
-    def getValidationErrors(self, data):
@@ -117 +120 @@
-            choices = metaAttr.getAllChoices(self.domainObject)
-            if webkitName == 'django':
-
+self.webkit.
-                    field_name=metaAttr.name,
-                    is_required=isFieldRequired,
@@ -124 +127 @@
-                )
-            elif webkitName == 'pylons':
-
+self.webkit.
-                    metaAttr.name,
-                    multiple=True,
@@ -134 +137 @@
-                choices = [('', '-- select option --')] + choices
-                if webkitName == 'django':
-
+self.webkit.
-                        field_name=metaAttr.name,
-                        is_required=isFieldRequired,
@@ -140 +143 @@
-                    )
-                elif webkitName == 'pylons':
-
+self.webkit.
-                        metaAttr.name,
-                    )
-            else:  # need to find a way to only do this for string keys
-                if webkitName == 'django':
-
-
-
-
-
-
+self.webkit.
+
+
+
+
+self.webkit.
-                        metaAttr.name,
-                        size=40
@@ -158 +161 @@
-                if metaAttr.name[0:5] == 'email':
-                    if webkitName == 'django':
-
+self.webkit.
-                            field_name=metaAttr.name,
-                            is_required=isFieldRequired,
@@ -164 +167 @@
-                        )
-                    elif webkitName == 'pylons':
-
+self.webkit.
-                            metaAttr.name,
-                            size=36
@@ -170 +173 @@
-                else:
-                    if webkitName == 'django':
-
+self.webkit.
-                            field_name=metaAttr.name,
-                            is_required=isFieldRequired,
-                        )
-                    elif webkitName == 'pylons':
-
+self.webkit.
-                            metaAttr.name,
-                            size=40
@@ -182 +185 @@
-            elif metaAttr.typeName == 'Text':
-                if webkitName == 'django':
-
+self.webkit.
-                        field_name=metaAttr.name,
-                        is_required=isFieldRequired,
@@ -189 +192 @@
-                    )
-                elif webkitName == 'pylons':
-
+self.webkit.
-                        metaAttr.name,
-                        size=40
@@ -195 +198 @@
-            elif metaAttr.typeName == 'Password':
-                if webkitName == 'django':
-
-
-
-
-
-
+self.webkit.
+
+
+
+
+self.webkit.
-                        metaAttr.name,
-                        size=40
@@ -206 +209 @@
-            elif metaAttr.typeName == 'Integer':
-                if webkitName == 'django':
-
-
-
-
-
-
+self.webkit.
+
+
+
+
+self.webkit.
-                        metaAttr.name,
-                        size=40
@@ -217 +220 @@
-            elif metaAttr.typeName == 'Boolean':
-                if webkitName == 'django':
-
+self.webkit.
-                        field_name=metaAttr.name
-                        # doesn't accept 'is_required' parameter
-                    )
-                elif webkitName == 'pylons':
-
+self.webkit.
-                        metaAttr.name,
-                        size=40
@@ -228 +231 @@
-            elif metaAttr.typeName == 'Url':
-                if webkitName == 'django':
-
-
-
-
-
-
+self.webkit.
+
+
+
+
+self.webkit.
-                        metaAttr.name,
-                        size=40
@@ -239 +242 @@
-            elif metaAttr.typeName == 'DateTime':
-                if webkitName == 'django':
-
-
-
-
-
-
+self.webkit.
+
+
+
+
+self.webkit.
-                        metaAttr.name,
-                        size=40
@@ -250 +253 @@
-            elif metaAttr.typeName == 'Date':
-                if webkitName == 'django':
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        metaAttr.name,
-                        size=40
@@ -261 +275 @@
-            else:
-                if webkitName == 'django':
-
-
-
-
-
-
+self.webkit.
+
+
+
+
+self.webkit.
-                        metaAttr.name,
-                        size=40
@@ -272 +286 @@
-        elif metaAttr.typeName == 'ImageFile':
-            if webkitName == 'django':
-
+self.webkit.
-                    field_name=metaAttr.name,
-                    is_required=isFieldRequired,
-                )
-            elif webkitName == 'pylons':
-
+self.webkit.
-                        metaAttr.name,
-                        size=40

trunk/src/dm/webkit/__init__.py

@@ -12 +12 @@
-    import django
-    from django.utils.html import escape as htmlescape
+    from django.forms import validators
-    from django.forms import Manipulator
-    from django.forms import SelectField, SelectMultipleField, TextField
@@ -52 +53 @@
-
-
+
+
+# Django extensions, without a home.
+if webkitName == 'django':
+
+    import sre
+    _rdatere = r'((?:0?[1-9])|(?:[12][0-9])|(?:3[0-1]))-((?:0?[1-9])|(?:1[0-2]))-(19|2\d)\d{2}'
+    ransi_date_re = sre.compile('^%s$' % _rdatere)
+
+    class RDateField(TextField):
+        """A FormField that automatically converts its data to a datetime.date objec
+    t.
+        The data should be in the format DD-MM-YYYY"""
+        def __init__(self, field_name, is_required=False, validator_list=None):
+            if validator_list is None: validator_list = []
+            validator_list = [self.isValidDate] + validator_list
+            TextField.__init__(self, field_name, length=10, maxlength=10,
+                is_required=is_required, validator_list=validator_list)
+    
+        def isValidDate(self, field_data, all_data):
+            try:
+                if not ransi_date_re.search(field_data):
+                    raise ValidationError(
+                        'Enter a valid date in DD-MM-YYYY format.'
+                    )
+            except validators.ValidationError, e:
+                raise validators.CriticalValidationError, e.messages
+    
+        def html2python(data):
+            "Converts the field into a datetime.date object"
+            import time, datetime
+            try:
+                time_tuple = time.strptime(data, '%d-%m-%Y')
+                return datetime.date(*time_tuple[0:3])
+            except (ValueError, TypeError):
+                return None
+        html2python = staticmethod(html2python)
+    
+        def render(self, data):
+            return super(RDateField, self).render(data)
+    
+