Changeset 10575

Timestamp:

2 Sep 2013, 06:40:49 (11 years ago)

Author:

Henrik Bettermann

Message:

Make StudentStatisticsReportPDFView reusable.

Location:

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

Files:

• level_report.py (modified) (2 diffs)
• student_statistics.py (modified) (1 diff)

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

@@ -26 +26 @@
 from waeup.kofa.reports import IReport
 from waeup.kofa.browser.pdf import get_signature_tables
+from waeup.kofa.students.reports.student_statistics import (
+    StudentStatisticsReportPDFView)
 
 class ILevelReport(IReport):
@@ -256 +258 @@
         return
 
-class LevelReportPDFView(grok.View):
+class LevelReportPDFView(StudentStatisticsReportPDFView):
 
     grok.context(ILevelReport)
     grok.name('pdf')
     grok.require('waeup.Public')
-
-    def render(self):
-        filename = 'LevelReport_%s_%s_%s_%s_%s.pdf' % (
+    prefix = 'LevelReport'
+
+    def _filename(self):
+        return 'LevelReport_%s_%s_%s_%s_%s.pdf' % (
             self.context.faccode, self.context.depcode,
             self.context.sessioncode, self.context.levelcode,
             self.context.creation_dt_string)
-        filename = filename.replace(
-            '/', '_').replace(' ','_').replace(':', '-')
-        self.response.setHeader(
-            'Content-Type', 'application/pdf')
-        self.response.setHeader(
-            'Content-Disposition:', 'attachment; filename="%s' % filename)
-        pdf_stream = self.context.create_pdf()
-        ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
-        grok.getSite().logger.info('%s - report %s downloaded: %s' % (
-            ob_class, self.context.__name__, filename))
-        return pdf_stream
+

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

@@ -221 +221 @@
     grok.name('pdf')
     grok.require('waeup.Public')
-
-    def render(self):
-        filename = 'StudentStatisticsReport_%s_%s_%s.pdf' % (
+    prefix = ''
+
+    def _filename(self):
+        return 'StudentStatisticsReport_%s_%s_%s.pdf' % (
             self.context.session, self.context.mode,
             self.context.creation_dt_string)
-        filename = filename.replace(
+
+    def render(self):
+        filename = self._filename().replace(
             '/', '_').replace(' ','_').replace(':', '-')
         self.response.setHeader(