Changeset 8183

Timestamp:

16 Apr 2012, 21:07:28 (12 years ago)

Author:

Henrik Bettermann

Message:

Part 2: Consider time zone when creating datetime strings for histories, filenames etc.

Location:

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

Files:

• accesscodes/accesscode.py (modified) (1 diff)
• applicants/browser.py (modified) (1 diff)
• browser/pdf.py (modified) (2 diffs)
• hostels/hostel.py (modified) (3 diffs)
• objecthistory.py (modified) (1 diff)
• students/utils.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/accesscode.py

@@ -246 +246 @@
         """
         ac_storage = self._getStoragePath()
-        now = datetime.now()
+        tz = getUtility(IKofaUtils).tzinfo
+        now = datetime.now(tz)
         timestamp = now.strftime('%Y_%m_%d_%H_%M_%S')
         csv_path = os.path.join(

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

@@ -828 +828 @@
             return
         IWorkflowInfo(self.context).fireTransition('submit')
-        self.context.application_date = datetime.now()
+        tz = getUtility(IKofaUtils).tzinfo
+        self.context.application_date = datetime.now(tz)
         self.context.locked = True
         self.flash(_('Form has been submitted.'))

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

@@ -32 +32 @@
 from zope.i18n import translate
 from zope.publisher.browser import TestRequest
+from zope.component import getUtility
 from waeup.kofa.browser.interfaces import IPDFCreator
+from waeup.kofa.interfaces import IKofaUtils
 from waeup.kofa.interfaces import MessageFactory as _
 
@@ -328 +330 @@
         canvas.setFont("Helvetica", 9)
         if not getattr(doc, 'kofa_nodate', False):
-            today = datetime.now().strftime('%d/%m/%Y %H:%M:%S')
+            tz = getUtility(IKofaUtils).tzinfo
+            today = datetime.now(tz).strftime('%d/%m/%Y %H:%M:%S')
             canvas.drawString(2.2*cm, 0.5 * inch,
                 translate(_(u'Date: ${a}', mapping = {'a': today})))

main/waeup.kofa/trunk/src/waeup/kofa/hostels/hostel.py

@@ -21 +21 @@
 import grok
 from zope.event import notify
+from zope.component import getUtility
 from datetime import datetime
 from waeup.kofa.utils.helpers import attrs_to_fields
@@ -26 +27 @@
 from waeup.kofa.hostels.interfaces import IHostel, IBed, IBedAllocateStudent
 from waeup.kofa.students.interfaces import IBedTicket
+from waeup.kofa.interfaces import IKofaUtils
 from waeup.kofa.interfaces import MessageFactory as _
 
@@ -204 +206 @@
                 return '%s without bed ticket' % old_owner
             bedticket.bed = None
-            timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+            tz = getUtility(IKofaUtils).tzinfo
+            timestamp = datetime.now(tz).strftime("%Y-%m-%d %H:%M:%S")
             bedticket.bed_coordinates = u'-- booking cancelled on %s --' % timestamp
             return old_owner

main/waeup.kofa/trunk/src/waeup/kofa/objecthistory.py

@@ -60 +60 @@
         """
         msgs = self._getMessages()
-        timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        tz = getUtility(IKofaUtils).tzinfo
+        timestamp = datetime.now(tz).strftime("%Y-%m-%d %H:%M:%S")
         user = get_current_principal()
         if user is None:

main/waeup.kofa/trunk/src/waeup/kofa/students/utils.py

@@ -207 +207 @@
       story = []
       frame_footer = Frame(1*cm,0,width-(2*cm),1*cm)
-      timestamp = datetime.now().strftime("%d/%m/%Y %H:%M:%S")
+      tz = getUtility(IKofaUtils).tzinfo
+      timestamp = datetime.now(tz).strftime("%d/%m/%Y %H:%M:%S")
       left_text = '<font size=10>%s</font>' % timestamp
       story.append(Paragraph(left_text, style["Normal"]))