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

Timestamp:

18 Nov 2012, 00:16:15 (12 years ago)

Author:

uli

Message:

More all-you-can-eat offers for views.

Location:

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

Files:

• browser/reports.py (modified) (3 diffs)
• reports.py (modified) (1 diff)

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

@@ -19 +19 @@
 """
 import grok
-from zope.component import getUtility
+from zope.component import getUtility, queryUtility
 from zope.location.location import located
-from waeup.kofa.interfaces import IJobManager
+from waeup.kofa.interfaces import IJobManager, IKofaUtils
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.browser.layout import KofaPage
-from waeup.kofa.reports import IReportsContainer
+from waeup.kofa.reports import IReportsContainer, IReportGenerator
 from waeup.kofa.reports import get_generators
 
@@ -49 +49 @@
             self.flash('Report discarded: %s' % job_id)
         self.entries = self._generate_entries(user_id=None)
-        #self.entries = self.context.get_report_jobs_description()
         if job_id and DOWNLOAD:
             self.redirect(self._report_url(job_id))
@@ -60 +59 @@
             job_id, gen_name, user = entry
             job = getUtility(IJobManager).get(job_id)
-            descr = '%r, %r' % (job.args, job.kwargs)
-            new_entry = (job_id, descr, job.status, job.finished, job.finished and not job.failed, not job.finished, job.begin_after, user)
+            generator = queryUtility(IReportGenerator, name=gen_name)
+            gen_title = getattr(generator, 'title', 'Unknown')
+            args = ', '.join([str(x) for x in job.kwargs['kw'].values()])
+            descr = '%s (%s)' % (gen_title, args)
+            status = job.finished and 'ready' or 'running'
+            status = job.failed and 'FAILED' or status
+            starttime = getattr(job, 'begin_after', None)
+            if starttime:
+                starttime = starttime.astimezone(
+                    getUtility(
+                        IKofaUtils).tzinfo).strftime("%Y-%m-%d %H:%M:%S %Z")
+            new_entry = (job_id, descr, status, job.finished, job.finished and not job.failed, not job.finished, starttime, user)
             entries.append(new_entry)
         return entries

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

@@ -171 +171 @@
 
     title = _("Unnamed Report")
+
     def generate(self, site, args=[], kw={}):
         result = Report()