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

Timestamp:

6 Jan 2017, 22:40:30 (8 years ago)

Author:

Henrik Bettermann

Message:

Show report number (job_id) on report pdf slips.

Location:

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

Files:

• reports.py (modified) (2 diffs)
• students/reports/level_report.py (modified) (2 diffs)
• students/reports/session_results_presentation.py (modified) (1 diff)
• students/reports/student_payment_statistics.py (modified) (1 diff)
• students/reports/student_statistics.py (modified) (2 diffs)
• students/reports/tests/test_level_report.py (modified) (1 diff)
• students/reports/tests/test_session_results_presentation.py (modified) (3 diffs)
• students/reports/tests/test_student_payment_statistics.py (modified) (1 diff)
• students/reports/tests/test_student_statistics.py (modified) (2 diffs)
• tests/test_reports.py (modified) (1 diff)

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

@@ -44 +44 @@
         """not when any output was created.""")
 
-    def create_pdf():
+    def create_pdf(job_id):
         """Generate a PDF copy.
         """
@@ -190 +190 @@
         self.creation_dt = now()
 
-    def create_pdf(self):
+    def create_pdf(self, job_id):
         raise NotImplementedError()
 

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

@@ -185 +185 @@
         self.data = get_students(faccode, depcode, session, level)
 
-    def create_pdf(self):
+    def create_pdf(self, job_id):
         creator = getUtility(IPDFCreator, name='landscape')
         table_data = tbl_data_to_table(self.data)
@@ -191 +191 @@
         col_widths = [1*cm, 4*cm, 5*cm, 0.8*cm, 0.8*cm, 0.8*cm, 1*cm,
                       6*cm, 0.8*cm, 0.8*cm, 1*cm, 2*cm]
-        pdf_data = [Paragraph('<b>%s</b>' % self.creation_dt_string,
+        pdf_data = [Paragraph('<b>%s - Report %s</b>'
+                              % (self.creation_dt_string, job_id),
                               STYLE["Normal"]),
                     Spacer(1, 12),]

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

@@ -143 +143 @@
         self.data = get_students(faccode, depcode, session, level)
 
-    def create_pdf(self):
+    def create_pdf(self, job_id):
         creator = getUtility(IPDFCreator)
         #col_widths = [2*cm, 4*cm, 5*cm, 0.8*cm, 0.8*cm, 0.8*cm, 6*cm, ]
-        pdf_data = [Paragraph('<b>%s</b>' % self.creation_dt_string,
+        pdf_data = [Paragraph('<b>%s - Report %s</b>'
+                              % (self.creation_dt_string, job_id),
                               STYLE["Normal"]),
                     Spacer(1, 12),]

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

@@ -200 +200 @@
         self.data = get_student_payment_stats(session, mode, level, breakdown)
 
-    def create_pdf(self):
+    def create_pdf(self, job_id):
         creator = getUtility(IPDFCreator, name='landscape')
         table_data = tbl_data_to_table(*self.data)
         col_widths = [None,] + [3.2*cm] * len(self.data[1]) + [None,]
-        pdf_data = [Paragraph('<b>%s</b>' % self.creation_dt_string,
+        pdf_data = [Paragraph('<b>%s - Report %s</b>'
+                              % (self.creation_dt_string, job_id),
                               STYLE["Normal"]),
                     Spacer(1, 12),]

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

@@ -161 +161 @@
         self.data = get_student_stats(session, mode, level, breakdown)
 
-    def create_pdf(self):
+    def create_pdf(self, job_id):
         creator = getUtility(IPDFCreator, name='landscape')
         table_data = tbl_data_to_table(*self.data)
         col_widths = [None,] + [1.6*cm] * len(self.data[1]) + [None,]
-        pdf_data = [Paragraph('<b>%s</b>' % self.creation_dt_string,
+        pdf_data = [Paragraph('<b>%s - Report %s</b>'
+                              % (self.creation_dt_string, job_id),
                               STYLE["Normal"]),
                     Spacer(1, 12),]
@@ -296 +297 @@
         self.response.setHeader(
             'Content-Disposition:', 'attachment; filename="%s' % filename)
-        pdf_stream = self.context.create_pdf()
+        pdf_stream = self.context.create_pdf(self.context.__name__)
         ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
         grok.getSite().logger.info('%s - report %s downloaded: %s' % (

main/waeup.kofa/trunk/src/waeup/kofa/students/reports/tests/test_level_report.py

@@ -63 +63 @@
         self.student['studycourse']['100']['Course3'] = ticket
         report = LevelReport('fac1', 'dep1', 2010, 100)
-        result = report.create_pdf()
+        result = report.create_pdf('JOB_ID')
         self.assertTrue(result.startswith('%PDF-'))
         path = os.path.join(samples_dir(), 'level_report.pdf')

main/waeup.kofa/trunk/src/waeup/kofa/students/reports/tests/test_session_results_presentation.py

@@ -63 +63 @@
     def test_create_pdf(self):
         report = SessionResultsPresentation('fac1', 'dep1', 2010, 100)
-        result = report.create_pdf()
+        result = report.create_pdf('JOB_ID')
         self.assertTrue(result.startswith('%PDF-'))
         path = os.path.join(samples_dir(), 'session_results_presentation.pdf')
@@ -81 +81 @@
         self.student['studycourse']['620']['Course2'] = ticket
         report = SessionResultsPresentation('fac1', 'dep1', 2013, 620)
-        result = report.create_pdf()
+        result = report.create_pdf('JOB_ID')
         self.assertTrue(result.startswith('%PDF-'))
         path = os.path.join(samples_dir(), 'session_results_presentation_620.pdf')
@@ -102 +102 @@
         self.student['studycourse']['200']['Course2'] = ticket
         report = SessionResultsPresentation('fac1', 'dep1', 2010, 0)
-        result = report.create_pdf()
+        result = report.create_pdf('JOB_ID')
         self.assertTrue(result.startswith('%PDF-'))
         path = os.path.join(samples_dir(), 'session_results_presentation_erroneous.pdf')

main/waeup.kofa/trunk/src/waeup/kofa/students/reports/tests/test_student_payment_statistics.py

@@ -56 +56 @@
         report = StudentPaymentStatisticsReport(
             2010, 'Undergraduate Full-Time', 0,  'faccode')
-        result = report.create_pdf()
+        result = report.create_pdf('JOB_ID')
         self.assertTrue(result.startswith('%PDF-'))
         path = os.path.join(samples_dir(), 'student_payment_statistics.pdf')

main/waeup.kofa/trunk/src/waeup/kofa/students/reports/tests/test_student_statistics.py

@@ -120 +120 @@
         report = StudentStatisticsReport(
             2010, 'Undergraduate Full-Time', 0, 'faccode')
-        result = report.create_pdf()
+        result = report.create_pdf('JOB_ID')
         self.assertTrue(result.startswith('%PDF-'))
         path = os.path.join(samples_dir(), 'student_statistics.pdf')
@@ -131 +131 @@
         report = StudentStatisticsReport(
             2010, 'Undergraduate Full-Time', 100, 'faccode')
-        result = report.create_pdf()
+        result = report.create_pdf('JOB_ID')
         self.assertTrue(result.startswith('%PDF-'))
         path = os.path.join(samples_dir(), 'student_statistics_100.pdf')

main/waeup.kofa/trunk/src/waeup/kofa/tests/test_reports.py

@@ -72 +72 @@
         # trying to create a pdf results in an error
         report = Report()
-        self.assertRaises(NotImplementedError, report.create_pdf)
+        self.assertRaises(NotImplementedError, report.create_pdf, 'JOB_ID')
         return