Changeset 9957

Timestamp:

15 Feb 2013, 13:31:58 (12 years ago)

Author:

Henrik Bettermann

Message:

Show also level courses on slips.

Location:

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

Files:

• browser.py (modified) (3 diffs)
• utils.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

@@ -1134 +1134 @@
 
     @property
+    def content_title_3(self):
+        portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
+        return translate(_('Level Courses'), 'waeup.kofa',
+            target_language=portal_language)
+
+    @property
     def label(self):
         portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
@@ -1163 +1169 @@
             [value for value in self.context.values() if value.semester == 2],
             key=lambda value: str(value.semester) + value.code)
+        tabledata_3 = sorted(
+            [value for value in self.context.values() if value.semester == 3],
+            key=lambda value: str(value.semester) + value.code)
         tableheader = [(Code,'code', 2.5),
                          (Title,'title', 5),
@@ -1178 +1187 @@
             tabledata_1=tabledata_1,
             tableheader_2=tableheader,
-            tabledata_2=tabledata_2
+            tabledata_2=tabledata_2,
+            tableheader_3=tableheader,
+            tabledata_3=tabledata_3
             )
 

main/waeup.kofa/trunk/src/waeup/kofa/students/utils.py

@@ -596 +596 @@
                   tableheader_1=None, tabledata_1=None,
                   tableheader_2=None, tabledata_2=None,
+                  tableheader_3=None, tabledata_3=None,
                   note=None, signatures=None, sigs_in_footer=(),
                   show_scans=True, topMargin=1.5):
@@ -662 +663 @@
             data.append(contenttable)
 
+       # Insert 3rd content table (optionally on second page)
+        if tabledata_3 and tableheader_3:
+            #data.append(PageBreak())
+            #data.append(Spacer(1, 20))
+            data.append(Paragraph(view.content_title_3, HEADING_STYLE))
+            data.append(Spacer(1, 8))
+            contenttable = render_table_data(tableheader_3,tabledata_3)
+            data.append(contenttable)
+
         # Insert signatures
         if signatures and not sigs_in_footer: