Changeset 10329

Timestamp:

21 Jun 2013, 07:26:10 (12 years ago)

Author:

Henrik Bettermann

Message:

Render two-column table of widgets behind the regular widgets table.

Add login information to note.

File:

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

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

@@ -95 +95 @@
         return [x is not None and x.longtitle() or x for x in dept, faculty]
 
-    def _addComments(self, data):
+    def _addLoginInformation(self):
         if self.context.state == 'created':
             comment = translate(_(
-                'Proceed to the login page of the portal' +
+                '\n Proceed to the login page of the portal' +
                 ' and enter your new credentials:' +
                 ' user name= ${a}, password = ${b}. ' +
@@ -106 +106 @@
                     'b':self.context.application_number}
                 ))
-            comment = Paragraph(comment, SMALL_PARA_STYLE)
-            data.extend([Spacer(1, 18), comment])
-        return data
+        return comment
 
     def _getPDFCreator(self):
@@ -150 +148 @@
         data.append(header_table)
 
-        # append two-column table of widgets of those fields defined in
-        # two_columns_design_fields
-        fields = [
-            field for field in self.form_fields
-                if not field.__name__ in self.column_two_fields and
-                field.__name__ in self.two_columns_design_fields]
-        if fields:
-            data.append(creator.getWidgetsTable(
-                fields, self.context, view, lang=portal_language,
-                domain='waeup.kofa', twoDataCols=True))
-
         # append widgets except those already added in column two
+        # and those in two_columns_design_fields
         dept, faculty = self._getDeptAndFaculty()
         fields = [
@@ -174 +162 @@
             dept=dept, faculty=faculty))
 
-        # append comments
-        data = self._addComments(data)
+        # append two-column table of widgets of those fields defined in
+        # two_columns_design_fields
+        if len(self.two_columns_design_fields):
+            fields = [
+                field for field in self.form_fields
+                    if not field.__name__ in self.column_two_fields and
+                    field.__name__ in self.two_columns_design_fields]
+            if fields:
+                data.append(creator.getWidgetsTable(
+                    fields, self.context, view, lang=portal_language,
+                    domain='waeup.kofa', separators=separators,
+                    twoDataCols=True))
 
-        return creator.create_pdf(data, None, doc_title, note=self.note)
+        # append login information
+        note = self.note + self._addLoginInformation()
+
+        return creator.create_pdf(data, None, doc_title, note=note)