cco/cybertools
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix sequenceNumber generation in reports result rows

Browse source
This commit is contained in:
hplattner 2013-08-07 17:34:25 +02:00
parent f68b1db2a4
commit 03f2812088
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
composer/report/result.py
View file

@ -131,7 +131,10 @@ class ResultSet(object):
subTotalsRow.data[c.name] = values[idx] subTotalsRow.data[c.name] = values[idx]
if gf in self.subTotalsGroupColumns: if gf in self.subTotalsGroupColumns:
if gf.totalsDescription is None: if gf.totalsDescription is None:
subTotalsRow.data[gf.output] = u'SUMME: ' + gf.getDisplayValue(row) display = gf.getDisplayValue(row)
if isinstance(display, dict):
display = display.get('title')
subTotalsRow.data[gf.output] = u'SUMME: ' + display
else: else:
v = gf.totalsDescription.getDisplayValue(row) v = gf.totalsDescription.getDisplayValue(row)
if v is None: if v is None:
@ -190,8 +193,11 @@ class ResultSet(object):
if self.limits: if self.limits:
start, stop = self.limits start, stop = self.limits
result = result[start:stop] result = result[start:stop]
number = 0
for idx, row in enumerate(result): for idx, row in enumerate(result):
row.sequenceNumber = idx + 1 if not isinstance(row, (GroupHeaderRow, SubTotalsRow)):
row.sequenceNumber = number + 1
number += 1
return result return result
@Lazy @Lazy