Changeset 10565

Timestamp:

30 Aug 2013, 05:10:32 (11 years ago)

Author:

Henrik Bettermann

Message:

It's better to use a second pdf creator global utility for landscape formats. Then we can easily customize watermark and logo in custom packages in reports.

Location:

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

Files:

• browser/pdf.py (modified) (4 diffs)
• students/reports/level_report.py (modified) (3 diffs)
• students/reports/student_statistics.py (modified) (3 diffs)

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

@@ -540 +540 @@
     logo_pos = [0, 0, 0]
     logo_left_pos = [0, 0, 0]
+    pagesize = portrait(A4)
 
     @classmethod
@@ -804 +805 @@
 
     def create_pdf(self, data, headerline=None, title=None, author=None,
-                   footer='', note=None, sigs_in_footer=[], topMargin=1.5,
-                   pagesize=portrait(A4)):
+                   footer='', note=None, sigs_in_footer=[], topMargin=1.5):
         """Returns a binary data stream which is a PDF document.
         """
@@ -815 +815 @@
             topMargin=topMargin*inch,
             title=title,
-            pagesize=pagesize,
+            pagesize=self.pagesize,
             showBoundary=False,
             )
@@ -835 +835 @@
         pdf_stream.close()
         return result
+
+class LandscapePDFCreator(PDFCreator):
+    """A utility to help with generating PDF docs in
+    landscape format.
+    """
+    grok.name('landscape')
+    pagesize = landscape(A4)

main/waeup.kofa/trunk/src/waeup/kofa/students/reports/level_report.py

@@ -70 +70 @@
 from reportlab.lib.units import cm
 from reportlab.platypus import Paragraph, Table, Spacer
-from reportlab.lib.pagesizes import A4, landscape
 from waeup.kofa.reports import IReport, IReportGenerator
 from waeup.kofa.reports import Report
@@ -130 +129 @@
 
     def create_pdf(self):
-        creator = getUtility(IPDFCreator)
+        creator = getUtility(IPDFCreator, name='landscape')
         table_data = tbl_data_to_table(self.data)
         #col_widths = [3.5*cm] * len(self.data[0])
@@ -146 +145 @@
             pdf_data, None, doc_title, self.author,
             'Level Report %s/%s/%s/%s' % (
-            self.faccode, self.depcode, self.levelcode, self.sessioncode),
-            pagesize=landscape(A4))
+            self.faccode, self.depcode, self.levelcode, self.sessioncode)
+            )
         return pdf
 

main/waeup.kofa/trunk/src/waeup/kofa/students/reports/student_statistics.py

@@ -85 +85 @@
 from reportlab.lib.units import cm
 from reportlab.platypus import Paragraph, Table, Spacer
-from reportlab.lib.pagesizes import A4, landscape
 from waeup.kofa.reports import IReport, IReportGenerator
 from waeup.kofa.reports import Report
@@ -136 +135 @@
 
     def create_pdf(self):
-        creator = getUtility(IPDFCreator)
+        creator = getUtility(IPDFCreator, name='landscape')
         table_data = tbl_data_to_table(*self.data)
         col_widths = [None,] + [1.6*cm] * len(self.data[1]) + [None,]
@@ -147 +146 @@
         pdf = creator.create_pdf(
             pdf_data, None, doc_title, self.author,
-            'Students in Session %s' % self.session,
-            pagesize=landscape(A4))
+            'Students in Session %s' % self.session
+            )
         return pdf