dabo Commit
Revision 5459
Date: 2009-10-14 14:00:04 -0700 (Wed, 14 Oct 2009)
Author: Paul
Trac: http://trac.dabodev.com/changeset/5459
Changed:
U trunk/dabo/lib/reportWriter.py
Log:
Accepted and committed Larry's report writer patch. See ticket #1281.
Diff:
Modified: trunk/dabo/lib/reportWriter.py
===================================================================
--- trunk/dabo/lib/reportWriter.py 2009-10-13 21:57:01 UTC (rev 5458)
+++ trunk/dabo/lib/reportWriter.py 2009-10-14 21:00:04 UTC (rev 5459)
@@ -1866,10 +1866,12 @@
self._currentColumn += 1
y = pageHeaderOrigin[1]
maxBandHeight = getTotalBandHeight()
- if band == "detail" and not
headers_printed:
+
+ if band in ("detail", "groupFooter")
and not headers_printed:
y = reprintGroupHeaders(y)
- if band != "detail" and headers_printed:
+ else:
return y
+
if not deferred:
y -= bandHeight
@@ -2080,7 +2082,6 @@
endPage()
self.Record = record
self.Canvas.showPages()
- self._pageNumber = 0
beginPage()
y = None
@@ -2088,8 +2089,8 @@
for idx, group in enumerate(groups):
resetPageNum =
eval(group.get("resetPageNumber", "False"))
curVal =
self._groupValues[group["expr"]]["curVal"]
-
- if curVal != group.getProp("expr") or
(startNewPage and group.getProp("StartOnNewPage")):
+
+ if curVal != group.getProp("expr") or
(startNewPage and (group.getProp("StartOnNewPage") or
group.getProp("ReprintHeaderOnNewPage"))):
# first reset curVal:
self._groupValues[group["expr"]]["curVal"] = group.getProp("expr")
@@ -2099,7 +2100,6 @@
# now print the band:
y = printBand("groupHeader", y, group)
-
# print the detail band:
y = printBand("detail", y)
_______________________________________________
Post Messages to: [email protected]
Subscription Maintenance: http://leafe.com/mailman/listinfo/dabo-dev
Searchable Archives: http://leafe.com/archives/search/dabo-dev
This message:
http://leafe.com/archives/byMID/[email protected]
