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

Timestamp:

15 Nov 2018, 10:24:58 (6 years ago)

Author:

Henrik Bettermann

Message:

Catch error and resize table.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/reports/student_payment_statistics.py (modified) (4 diffs)

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

@@ -92 +92 @@
         if entry_session != 0 and  stud.entry_session != entry_session:
             continue
-        if breakdown == 'faccode':
-            if getattr(stud, 'faccode') not in paths:
-                # studs can have a faccode ``None``
-                continue
+        if None in  (getattr(stud, 'faccode'), getattr(stud, 'depcode')):
+            continue
         # Dep codes are not unique.
         if breakdown == 'depcode':
@@ -163 +161 @@
         i = 0
         while i < len(data[idx]):
-            row.append("%s (%s)" % ("{:,}".format(data[idx][i+1]), data[idx][i]))
+            if row_name == 'Total':
+                row.append(
+                    "%s\n(%s)" % ("{:,}".format(data[idx][i+1]), data[idx][i]))
+            else:
+                row.append(
+                    "%s (%s)" % ("{:,}".format(data[idx][i+1]), data[idx][i]))
             i += 2
         row = [row_name] + row
@@ -242 +245 @@
     def create_pdf(self, job_id):
         creator = getUtility(IPDFCreator, name=self.pdfcreator)
-        maxlength = len(str(self.data[2][-1][-1])) \
-            + len(str(self.data[2][-1][-2])) \
-            + 3
-        maxlength = max(maxlength, 10)
+        # maxlength = len(str(self.data[2][-1][-1])) \
+        #     + len(str(self.data[2][-1][-2])) \
+        #     + 3
+        # maxlength = max(maxlength, 10)
         table_data = tbl_data_to_table(*self.data)
-        col_widths = [None,] + [.17*cm*maxlength] * len(self.data[1]) + [None,]
+        # col_widths = [None,] + [.17*cm*maxlength] * len(self.data[1]) + [None,]
         pdf_data = [Paragraph('<b>%s - Report %s</b>'
                               % (self.creation_dt_string, job_id),
@@ -266 +269 @@
                     Spacer(1, 12),]
         pdf_data += [
-            Table(table_data, style=TABLE_STYLE, colWidths=col_widths)]
+            Table(table_data, style=TABLE_STYLE)]
         right_footer = translate(
-            _('${a} Student Payments - ${b} -',
-            mapping = {'a':self.mode, 'b':self.session}))
+            _('Student Payments - ${a} - ${b} - ${c} - ',
+            mapping = {'a':self.mode, 'b':self.session, 'c':self.level}))
         pdf = creator.create_pdf(
             pdf_data, None, self.title, self.author, right_footer