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

Timestamp:

26 Jan 2013, 10:55:22 (12 years ago)

Author:

Henrik Bettermann

Message:

Render footer properly and set topMargin.

Location:

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

Files:

• browser/pdf.py (modified) (2 diffs)
• students/utils.py (modified) (3 diffs)

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

@@ -397 +397 @@
 
     def create_pdf(self, data, headerline=None, title=None, author=None,
-                   footer='', note=None, sigs_in_footer=[]):
+                   footer='', note=None, sigs_in_footer=[], topMargin=1.5):
         """Returns a binary data stream which is a PDF document.
         """
@@ -405 +405 @@
             pdf_stream,
             bottomMargin=bottomMargin,
-            topMargin=1.5*inch,
+            topMargin=topMargin*inch,
             title=title,
             pagesize=portrait(A4),

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

@@ -551 +551 @@
                   tableheader_2=None, tabledata_2=None,
                   note=None, signatures=None, sigs_in_footer=(),
-                  show_scans=True):
+                  show_scans=True, topMargin=1.5):
         """Render pdf slips for various pages.
         """
@@ -560 +560 @@
         author = '%s (%s)' % (view.request.principal.title,
                               view.request.principal.id)
-        footer_text = view.label.split('\n')[0]
+        footer_text = view.label.split('\n')
+        if len(footer_text) > 2:
+            # We can add a department in first line
+            footer_text = footer_text[1]
+        else:
+            # Onle the first line is used for the footer
+            footer_text = footer_text[0]
         if getattr(student, 'student_id', None) is not None:
             footer_text = "%s - %s - " % (student.student_id, footer_text)
@@ -620 +626 @@
             pdf_stream = creator.create_pdf(
                 data, None, doc_title, author=author, footer=footer_text,
-                note=note, sigs_in_footer=sigs_in_footer)
+                note=note, sigs_in_footer=sigs_in_footer, topMargin=topMargin)
         except IOError:
             view.flash('Error in image file.')