Merge lp:~numerigraphe/openobject-server/5.0-bug516966-wrong-pageCount-pageNumber into lp:openobject-server/5.0

[Numérigraphe]

Contributions from Xavier ALT (AJM) and Numérigraphe to fix Bug #516966: report_sxw: wrong pageCount and pageNumber when attachments are not kept.

If this can't make it in 5.0 I personally won't mind if you reject this merge, but please let us know.
Lionel

[Xavier ALT (dex-phx)]

Hi Lionel,

I've check with your modifications, all goods for me. Now pageCount is ok with or without the presence of <pageNumberReset/> tag.

Test 1 - 1 Invoice - 1 page
Test 2 - 1 Invoice - 2 pages
Test 3 - 5 Invoice - 1 page for all invoice
Test 4 - 5 Invoice - different number of pages for each invoices
Test 5 - report containing <pageNumberReset/> - different number of pages records

review: Approve

Unmerged revisions

2053. By Numerigraphe - Lionel Sausin <email address hidden> on 2010-05-20

[FIX] report: PageReset should be before PageBreak in new story

2052. By Numerigraphe - Lionel Sausin <email address hidden> on 2010-05-19

[FIX] report: reset page count in each story

2051. By Xavier ALT (AJM) on 2010-05-19

[FIX] report: fix <pageNumberReset>

=== modified file 'bin/report/render/rml2pdf/trml2pdf.py'
--- bin/report/render/rml2pdf/trml2pdf.py	2011-09-05 09:41:08 +0000
+++ bin/report/render/rml2pdf/trml2pdf.py	2011-11-16 14:34:27 +0000
@@ -40,15 +40,19 @@
 encoding = 'utf-8'
 
 class PageCount(platypus.Flowable):
+    def __init__(self, page_count=1):
+        platypus.Flowable.__init__(self)
+        self.page_count = page_count
+
     def draw(self):
-        self.canv.beginForm("pageCount")
+        self.canv.beginForm("pageCount%s" % (self.page_count))
         self.canv.setFont("Helvetica", utils.unit_get(str(8)))
         self.canv.drawString(0, 0, str(self.canv.getPageNumber()))
         self.canv.endForm()
 
 class PageReset(platypus.Flowable):
     def draw(self):
-        self.canv._pageNumber = 0
+        self.canv._doPageReset = True
 
 class _rml_styles(object,):
     def __init__(self, nodes, localcontext):
@@ -205,6 +209,7 @@
             pt_obj.render(el)
         else:
             self.canvas = canvas.Canvas(out)
+            self.canvas.page_count = 1
             pd = self.etree.find('pageDrawing')[0]
             pd_obj = _rml_canvas(self.canvas, self.localcontext, None, self, self.images, path=self.path, title=self.title)
             pd_obj.render(pd)
@@ -236,7 +241,7 @@
             if n.tag == 'pageCount':
                 if x or y:
                     self.canvas.translate(x,y)
-                self.canvas.doForm('pageCount')
+                self.canvas.doForm('pageCount%s' % (self.canvas.page_count))
                 if x or y:
                     self.canvas.translate(-x,-y)
             if n.tag == 'pageNumber':
@@ -717,6 +722,13 @@
         ActionFlowable.__init__(self,('frameEnd',resume))
 
 class TinyDocTemplate(platypus.BaseDocTemplate):
+
+    def beforeDocument(self):
+        # Store some useful value directly inside canvas, so it's available
+        # on flowable drawing
+        self.canv.page_count = 1
+        self.canv._doPageReset = False
+
     def ___handle_pageBegin(self):
         self.page = self.page + 1
         self.pageTemplate.beforeDrawPage(self.canv,self)
@@ -732,9 +744,15 @@
                 self.frame = f
                 break
         self.handle_frameBegin()
-    def afterFlowable(self, flowable):
-        if isinstance(flowable, PageReset):
+
+    def afterPage(self):
+        if self.canv._doPageReset:
+            # Following a <pageNumberReset/> tag, we reset page number to 0 
+            # and increment story count (so that page count is specific to
+            # the story
             self.canv._pageNumber = 0
+            self.canv._doPageReset = False
+            self.canv.page_count += 1
 
 class _rml_template(object):
     def __init__(self, localcontext, out, node, doc, images={}, path='.', title=None):
@@ -776,14 +794,22 @@
     def render(self, node_stories):
         fis = []
         r = _rml_flowable(self.doc,self.localcontext, images=self.images, path=self.path, title=self.title)
-        story_cnt = 0
+        story_cnt = 0 # story counter
+        page_cnt = 0 # page number counter (can differ from story_cnt if PageReset is used)
         for node_story in node_stories:
             if story_cnt > 0:
+                fis.append(PageReset())
                 fis.append(platypus.PageBreak())
             fis += r.render(node_story)
             story_cnt += 1
-        if self.localcontext:
-            fis.append(PageCount())
+            page_cnt += 1
+
+            for (st, _n) in etree.iterwalk(node_story, tag='pageBreak'):
+                fis.append(PageCount(page_count=page_cnt))
+                page_cnt += 1
+            if self.localcontext:
+                # 1 PageCount for each story or pageNumberReset
+                fis.append(PageCount(page_count=page_cnt))
         self.doc_tmpl.build(fis)
 
 def parseNode(rml, localcontext = {},fout=None, images={}, path='.',title=None):