Changeset 14374 for main/waeup.aaue/trunk/src/waeup/aaue

Timestamp:

6 Jan 2017, 22:42:07 (8 years ago)

Author:

Henrik Bettermann

Message:

Show report number (job_id) on report pdf slips.

Location:

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

Files:

• raw_score_report.py (modified) (2 diffs)
• student_level_statistics.py (modified) (1 diff)
• tests/test_level_report.py (modified) (1 diff)
• tests/test_raw_score_report.py (modified) (1 diff)
• tests/test_student_level_statistics.py (modified) (1 diff)

main/waeup.aaue/trunk/src/waeup/aaue/students/reports/raw_score_report.py

@@ -216 +216 @@
                 faccode, depcode, session, self.levelcode, course_codes)
 
-    def create_pdf(self):
+    def create_pdf(self, job_id):
         creator = getUtility(IPDFCreator, name='A3landscape')
         table_data = dict()
@@ -223 +223 @@
                 self.data[level], self.course_codes[level])
         col_widths = [1*cm, 4*cm, 5*cm] + [1*cm] * len(self.course_codes)
-        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.aaue/trunk/src/waeup/aaue/students/reports/student_level_statistics.py

@@ -174 +174 @@
         self.data = get_student_stats(session, mode, 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.8*cm] * (len(self.data[1]) - 1)+ [2.0*cm] + [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.aaue/trunk/src/waeup/aaue/students/reports/tests/test_level_report.py

@@ -36 +36 @@
         self.student['studycourse']['100']['Course1'].ca = 0
         report = CustomLevelReport('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.aaue/trunk/src/waeup/aaue/students/reports/tests/test_raw_score_report.py

@@ -67 +67 @@
         self.student['studycourse']['200']['Course2'] = ticket
         report = RawScoreReport('fac1', 'dep1', 2011, 200)
-        result = report.create_pdf()
+        result = report.create_pdf('JOB_ID')
         self.assertTrue(result.startswith('%PDF-'))
         path = os.path.join(samples_dir(), 'raw_score_report.pdf')

main/waeup.aaue/trunk/src/waeup/aaue/students/reports/tests/test_student_level_statistics.py

@@ -102 +102 @@
         self.student['studycourse'].current_level = 220
         report = StudentLevelStatisticsReport(2010, 'Undergraduate Full-Time', 'depcode')
-        result = report.create_pdf()
+        result = report.create_pdf('JOB_ID')
         self.assertTrue(result.startswith('%PDF-'))
         path = os.path.join(samples_dir(), 'student_level_statistics.pdf')