Changeset 9646 for main/waeup.kofa/trunk/src/waeup

Timestamp:

16 Nov 2012, 12:27:15 (12 years ago)

Author:

Henrik Bettermann

Message:

We do not need an extra attribute for start time.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/reports.py (modified) (5 diffs)

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

@@ -23 +23 @@
 from zope import schema
 from zope.component import (
-    getUtility, getUtilitiesFor, queryUtility, ComponentLookupError)
+    getUtility, getUtilitiesFor, queryUtility)
 from zope.component.hooks import setSite
 from zope.interface import implementer
@@ -105 +105 @@
         )
 
-    starttime = schema.TextLine(
-        title = u'Human readable start datetime')
-
     def __init__(site, generator_name):
         """Create a report job via generator."""
@@ -181 +178 @@
             downloaded. This is only true if the job finished and
             didn't raised exceptions.
-
-        ``<starttime>``
-            Datetime string indicating when the job was started.
 
         If ``user_id`` is ``None``, all jobs are returned.
@@ -298 +292 @@
     def __init__(self, site, generator_name, args=[], kw={}):
         self._generator_name = generator_name
-        try:
-            tz = getUtility(IKofaUtils).tzinfo
-            self.starttime = now(tz).strftime("%Y-%m-%d %H:%M:%S %Z")
-        except ComponentLookupError:
-            self.starttime = None
         super(AsyncReportJob, self).__init__(
             report_job, site, generator_name, args=args, kw=kw)
@@ -486 +475 @@
             discardable = job.finished
             downloadable = job.finished and not job.failed
-            starttime = job.starttime
+            starttime = getattr(job, 'begin_after', None)
+            if starttime:
+                starttime = starttime.astimezone(getUtility(IKofaUtils).tzinfo)
+                starttime = starttime.strftime("%Y-%m-%d %H:%M:%S %Z")
             if not hasattr(job, 'description'):
                 continue