Changeset 10437

Timestamp:

29 Jul 2013, 15:46:37 (11 years ago)

Author:

Henrik Bettermann

Message:

Render trimester courses on course registration slip.

Location:

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

Files:

• students/utils.py (modified) (2 diffs)
• utils/utils.py (modified) (1 diff)

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

@@ -581 +581 @@
                   tableheader_2=None, tabledata_2=None,
                   tableheader_3=None, tabledata_3=None,
+                  tableheader_4=None, tabledata_4=None,
+                  tableheader_5=None, tabledata_5=None,
+                  tableheader_6=None, tabledata_6=None,
                   note=None, signatures=None, sigs_in_footer=(),
                   show_scans=True, topMargin=1.5,
@@ -657 +660 @@
             data.append(contenttable)
 
+       # Insert 4th content table (optionally on second page)
+        if tabledata_4 and tableheader_4:
+            #data.append(PageBreak())
+            #data.append(Spacer(1, 20))
+            data.append(Paragraph(view.content_title_4, HEADING_STYLE))
+            data.append(Spacer(1, 8))
+            contenttable = render_table_data(tableheader_4,tabledata_4)
+            data.append(contenttable)
+
+       # Insert 5th content table (optionally on second page)
+        if tabledata_5 and tableheader_5:
+            #data.append(PageBreak())
+            #data.append(Spacer(1, 20))
+            data.append(Paragraph(view.content_title_5, HEADING_STYLE))
+            data.append(Spacer(1, 8))
+            contenttable = render_table_data(tableheader_5,tabledata_5)
+            data.append(contenttable)
+
+       # Insert 6th content table (optionally on second page)
+        if tabledata_6 and tableheader_6:
+            #data.append(PageBreak())
+            #data.append(Spacer(1, 20))
+            data.append(Paragraph(view.content_title_6, HEADING_STYLE))
+            data.append(Spacer(1, 8))
+            contenttable = render_table_data(tableheader_6,tabledata_6)
+            data.append(contenttable)
+
         # Insert signatures
         # XXX: We are using only sigs_in_footer in waeup.kofa, so we

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

@@ -141 +141 @@
 
     SEMESTER_DICT = {
-        1: 'First Semester',
-        2: 'Second Semester',
+        1: '1st Semester',
+        2: '2nd Semester',
         3: 'Combined',
         9: 'N/A'