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

Timestamp:

30 Jul 2013, 06:22:45 (11 years ago)

Author:

Henrik Bettermann

Message:

Ease customization and define tabletitle outside render method.

Location:

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

Files:

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

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

@@ -1269 +1269 @@
             + ' %s' % level_title
 
+    @property
+    def tabletitle(self):
+        portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
+        tabletitle = []
+        tabletitle.append(translate(_('1st Semester Courses'), 'waeup.kofa',
+            target_language=portal_language))
+        tabletitle.append(translate(_('2nd Semester Courses'), 'waeup.kofa',
+            target_language=portal_language))
+        tabletitle.append(translate(_('Level Courses'), 'waeup.kofa',
+            target_language=portal_language))
+        return tabletitle
+
     def render(self):
         portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
@@ -1287 +1299 @@
         tableheader = []
         contenttitle = []
-        for i in range(6):
+        for i in range(1,7):
             tabledata.append(sorted(
                 [value for value in self.context.values() if value.semester == i],
@@ -1300 +1312 @@
                              #('Auto', 'automatic', 1.5)
                              ])
-            contenttitle.append(None)
-
-        contenttitle[1] = translate(_('1st Semester Courses'), 'waeup.kofa',
-            target_language=portal_language)
-        contenttitle[2] = translate(_('2nd Semester Courses'), 'waeup.kofa',
-            target_language=portal_language)
-        contenttitle[3] = translate(_('Level Courses'), 'waeup.kofa',
-            target_language=portal_language)
-
         return students_utils.renderPDF(
             self, 'course_registration_slip.pdf',
@@ -1314 +1317 @@
             tableheader=tableheader,
             tabledata=tabledata,
-            contenttitle=contenttitle,
             omit_fields=self.omit_fields
             )

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

@@ -578 +578 @@
     def renderPDF(self, view, filename='slip.pdf', student=None,
                   studentview=None,
-                  tableheader=[], tabledata=[], contenttitle=[],
+                  tableheader=[], tabledata=[],
                   note=None, signatures=None, sigs_in_footer=(),
                   show_scans=True, topMargin=1.5,
@@ -629 +629 @@
 
         # Insert content tables (optionally on second page)
-        for i in range(len(tabledata)):
-            if tabledata[i] and tableheader[i]:
-                #data.append(PageBreak())
-                #data.append(Spacer(1, 20))
-                data.append(Paragraph(contenttitle[i], HEADING_STYLE))
-                data.append(Spacer(1, 8))
-                contenttable = render_table_data(tableheader[i],tabledata[i])
-                data.append(contenttable)
+        if hasattr(view, 'tabletitle'):
+            for i in range(len(view.tabletitle)):
+                if tabledata[i] and tableheader[i]:
+                    #data.append(PageBreak())
+                    #data.append(Spacer(1, 20))
+                    data.append(Paragraph(view.tabletitle[i], HEADING_STYLE))
+                    data.append(Spacer(1, 8))
+                    contenttable = render_table_data(tableheader[i],tabledata[i])
+                    data.append(contenttable)
 
         # Insert signatures