Changeset 8200 for main

Timestamp:

17 Apr 2012, 23:35:24 (12 years ago)

Author:

uli

Message:

• Use datetime for applicants containers and
• Register new datetime widget as default for entering datetimes.

Fixed all tests to work with the new stuff.

As this is just a quick shot I put all changes into one commit
to ease any later rollback.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• applicants/browser.py (modified) (2 diffs)
• applicants/interfaces.py (modified) (1 diff)
• applicants/tests/test_batching.py (modified) (2 diffs)
• applicants/tests/test_browser.py (modified) (2 diffs)
• applicants/tests/test_export.py (modified) (3 diffs)
• students/tests/test_batching.py (modified) (1 diff)
• widgets/overrides.zcml (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py

@@ -19 +19 @@
 """
 import os
+import pytz
 import sys
 import grok
@@ -877 +878 @@
     def update(self):
         # Check if application has started ...
-        if not self.context.startdate or self.context.startdate > date.today():
+        if not self.context.startdate or (
+            self.context.startdate > datetime.now(pytz.utc)):
             self.flash(_('Application has not yet started.'))
             self.redirect(self.url(self.context))
             return
         # ... or ended
-        if not self.context.enddate or self.context.enddate < date.today():
+        if not self.context.enddate or (
+            self.context.enddate < datetime.now(pytz.utc)):
             self.flash(_('Application has ended.'))
             self.redirect(self.url(self.context))

main/waeup.kofa/trunk/src/waeup/kofa/applicants/interfaces.py

@@ -221 +221 @@
         """Content as language dictionary with values in HTML format.""")
 
-    startdate = FormattedDate(
+    startdate = schema.Datetime(
         title = _(u'Application Start Date'),
         required = False,
-        show_year = False,
-        )
-
-    enddate = FormattedDate(
+        #show_year = False,
+        )
+
+    enddate = schema.Datetime(
         title = _(u'Application Closing Date'),
         required = False,
-        show_year = False,
+        #show_year = False,
         )
 

main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_batching.py

@@ -20 +20 @@
 import datetime
 import os
+import pytz
 import shutil
 import tempfile
@@ -157 +158 @@
             u'>>de<<\nDieser Text kann von anonymen Benutzern '
             u'gelesen werden.')
-        self.assertEqual(container.startdate, datetime.date(2012, 3, 1))
-        self.assertEqual(container.enddate, datetime.date(2012, 4, 25))
+        self.assertEqual(container.startdate,
+                         datetime.datetime(2012, 3, 1, 0, 0, tzinfo=pytz.utc))
+        self.assertEqual(container.enddate,
+                         datetime.datetime(2012, 4, 25, 0, 0, tzinfo=pytz.utc))
         shutil.rmtree(os.path.dirname(fin_file))
 

main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py

@@ -19 +19 @@
 Test the applicant-related UI components.
 """
+import pytz
 import shutil
 import tempfile
@@ -89 +90 @@
         applicantscontainer.mode = 'create'
         delta = timedelta(days=10)
-        applicantscontainer.startdate = date.today() - delta
-        applicantscontainer.enddate = date.today() + delta
+        applicantscontainer.startdate = datetime.now(pytz.utc) - delta
+        applicantscontainer.enddate = datetime.now(pytz.utc) + delta
         self.app['applicants']['app2009'] = applicantscontainer
         self.applicantscontainer = self.app['applicants']['app2009']

main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_export.py

@@ -1 +1 @@
 import datetime
 import os
+import pytz
 import shutil
 import tempfile
@@ -56 +57 @@
         container.description = u'Some Description\nwith linebreak\n'
         container.description += u'<<de>>man spriht deutsh'
-        container.startdate = datetime.date(2012, 1, 1)
-        container.enddate = datetime.date(2012, 1, 31)
+        container.startdate = datetime.datetime(
+            2012, 1, 1, 12, 0, 0, tzinfo=pytz.utc)
+        container.enddate = datetime.datetime(
+            2012, 1, 31, 23, 0, 0, tzinfo=pytz.utc)
         return container
 
@@ -74 +77 @@
             'dp2012,General Studies 2012/13,app,100,2012,basic,'
             '"Some Description\nwith linebreak\n<<de>>man spriht deutsh",'
-            '2012-01-01,2012-01-31,1\r\n'
+            '2012-01-01 12:00:00+00:00,2012-01-31 23:00:00+00:00,1\r\n'
             )
         return

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_batching.py

@@ -639 +639 @@
         self.assertEqual(payment.p_id, 'p1290797973744')
         cdate = payment.creation_date.strftime("%Y-%m-%d %H:%M:%S")
-        self.assertEqual(cdate, "2010-11-26 19:59:33")
-        self.assertEqual(str(payment.creation_date.tzinfo),'tzinfo(60)')
+        self.assertEqual(cdate, "2010-11-26 18:59:33")
+        self.assertEqual(str(payment.creation_date.tzinfo),'UTC')
         shutil.rmtree(os.path.dirname(fin_file))
 

main/waeup.kofa/trunk/src/waeup/kofa/widgets/overrides.zcml

@@ -34 +34 @@
       />
 
+  <!-- Register pytz-aware edit widget for datetimes -->
+  <adapter
+      for="zope.schema.interfaces.IDatetime
+           zope.publisher.interfaces.browser.IBrowserRequest"
+      provides="zope.formlib.interfaces.ISimpleInputWidget"
+      factory="waeup.kofa.widgets.datetimewidget.PytzDatetimeWidget"
+      permission="zope.Public"
+      />
+
 </configure>