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

Timestamp:

8 Feb 2017, 07:56:05 (8 years ago)

Author:

Henrik Bettermann

Message:

Harmonize student level statistics report.

File:

• main/waeup.aaue/trunk/src/waeup/aaue/students/reports/student_level_statistics.py (modified) (4 diffs)

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

@@ -74 +74 @@
     cat = queryUtility(ICatalog, name="students_catalog")
     result = cat.searchResults(current_session=(session, session))
-    table = [[0 for x in xrange(2 * len(levels) + 2)] for y in xrange(len(paths)+1)]
+    table = [[0 for x in xrange(2 * len(levels) + 2)]
+             for y in xrange(len(paths)+1)]
     mode_groups = getUtility(IKofaUtils).MODE_GROUPS
     for stud in result:
-        if mode != 'All' and stud.current_mode not in mode_groups[mode]:
+        if mode != 'All' and stud.current_mode \
+            and stud.current_mode not in mode_groups[mode]:
             continue
         if getattr(stud, breakdown) is None:
@@ -177 +179 @@
         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,]
+        col_widths = [None,] + [1.8*cm] * (
+            len(self.data[1]) - 1)+ [2.0*cm] + [None,]
         pdf_data = [Paragraph('<b>%s - Report %s</b>'
                               % (self.creation_dt_string, job_id),
                               STYLE["Normal"]),
                     Spacer(1, 12),]
+        pdf_data += [Paragraph(
+                    translate(
+                        'Study Mode: ${a}<br />'
+                        'Academic Session: ${b}',
+                        mapping = {'a':self.mode,
+                                   'b':self.session,
+                                   }),
+                    STYLE["Normal"]),
+                    Spacer(1, 12),]
         pdf_data += [
             Table(table_data, style=TABLE_STYLE, colWidths=col_widths)]
-        doc_title = translate(
-            _('${a} Students - ${c}',
-            mapping = {'a':self.mode, 'c':self.session}))
+        doc_title = translate(_('Student Level Statistics'))
         pdf = creator.create_pdf(
-            pdf_data, None, doc_title, self.author, doc_title + ' -'
+            pdf_data, None, doc_title, self.author,
+            doc_title + ' - %s -' % self.session,
             )
         return pdf
@@ -249 +260 @@
             ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
             grok.getSite().logger.info(
-                '%s - report %s created: %s (session=%s, mode=%s, breakdown=%s)' % (
+                '%s - report %s created: %s '
+                '(session=%s, mode=%s, breakdown=%s)' % (
                 ob_class, job_id, self.context.title,
                 session, mode, breakdown))
@@ -278 +290 @@
 
     def _filename(self):
-        return 'StudentLevelStatisticsReport_%s_%s_%s.pdf' % (
-            self.context.session, self.context.mode,
+        return 'StudentLevelStatisticsReport_rno%s_%s.pdf' % (
+            self.context.__name__,
             self.context.creation_dt_string)