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

Timestamp:

21 Jun 2013, 07:23:42 (12 years ago)

Author:

Henrik Bettermann

Message:

Do not modify table_style in _getWidgetsTableData. Otherwise we can't split table_data into two tables.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/browser/pdf.py (modified) (4 diffs)

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

@@ -623 +623 @@
 
     def _getWidgetsTableData(self, widgets, separators, domain,
-                             lang, table_style, twoDataCols):
+                             lang, twoDataCols):
         row_num = 0
         table_data = []
         for widget in widgets:
-            # We do not render headlines in multi-column design
-            if twoDataCols is False and separators and separators.get(widget.name):
+            if separators and separators.get(widget.name):
                 f_headline = translate(
                     separators[widget.name], domain, target_language=lang)
                 f_headline = Paragraph(f_headline, HEADLINE1_STYLE)
                 table_data.append([f_headline])
-                table_style.append(('SPAN', (0,row_num), (-1,row_num)),)
-                table_style.append(
-                    ('TOPPADDING', (0,row_num), (-1,row_num), 12),)
                 row_num += 1
             f_label = translate(widget.label.strip(), domain,
@@ -648 +644 @@
             table_data.append([f_label,f_text])
             row_num += 1
-        return table_data, row_num, table_style
+        return table_data, row_num
 
     def getWidgetsTable(self, form_fields, context, view, lang='en',
@@ -688 +684 @@
 
         # Determine table data
-        table_data, row_num, table_style = self._getWidgetsTableData(
-            widgets, separators, domain, lang, table_style, twoDataCols)
+        table_data, row_num = self._getWidgetsTableData(
+            widgets, separators, domain, lang, twoDataCols)
 
         # Add course (admitted, etc.) if applicable
@@ -699 +695 @@
             table_data, row_num, dept, faculty, lang, domain)
 
-        # render two-column table of tables
+        # render two-column table of tables if applicable
         lines = len(table_data)
         middle = lines/2
         if twoDataCols is True and lines > 2:
-            table_left = Table(table_data[:middle+1],
-                               style=table_style, colWidths=[5*cm, 4*cm])
-            table_right = Table(table_data[middle+1:],
-                                style=table_style, colWidths=[5*cm, 4*cm])
-            table_style.append(('LEFTPADDING', (0,0), (0,-1), 3*cm),)
+            table_left = Table(table_data[:middle],
+                               style=table_style, colWidths=[4*cm, 5*cm])
+            table_right = Table(table_data[middle:],
+                                style=table_style, colWidths=[4*cm, 5*cm])
+            table_style.append(('LEFTPADDING', (0,0), (0,-1), 3.147*cm),)
             table = Table([[table_left, table_right],],style=table_style)
             return table