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

reportign: fix subtotals (work in progress)

Browse source
This commit is contained in:
Helmut Merz 2012-11-09 09:51:17 +01:00
parent 4da72fb2a7
commit 302b8959c4
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
composer/report/result.py
View file

@ -152,9 +152,12 @@ class ResultSet(object):
for idx, f in enumerate(self.groupColumns): for idx, f in enumerate(self.groupColumns):
value = f.getRawValue(row) value = f.getRawValue(row)
if value != groupValues[idx]: if value != groupValues[idx]:
# TODO: loop through all lower-level fields
# for j, f in enumerate(self.groupColumns)[idx:]:
# # use idx+j for correct indexing
groupValues[idx] = value groupValues[idx] = value
headerRows.append(self.getHeaderRow(row, (f,) + f.outputWith)) headerRows.append(self.getHeaderRow(row, (f,) + f.outputWith))
if lastRow is not None: if lastRow is not None and f.getDisplayValue(lastRow):
subTotalsRows.append( subTotalsRows.append(
self.getSubTotalsRow(f, self.getSubTotalsRow(f,
lastRow, lastRow,
@ -171,6 +174,18 @@ class ResultSet(object):
for idx2, f in enumerate(sc): for idx2, f in enumerate(sc):
subTotals[idx][idx2] += f.getValue(row) subTotals[idx][idx2] += f.getValue(row)
lastRow = row lastRow = row
if lastRow is not None:
subTotalsRows = []
for idx, f in enumerate(self.groupColumns):
if f.getDisplayValue(lastRow):
subTotalsRows.append(
self.getSubTotalsRow(f,
lastRow,
self.subTotalsColumns[idx],
subTotals[idx]
))
for subTotalsRow in reversed(subTotalsRows):
res.append(subTotalsRow)
result = res result = res
if self.limits: if self.limits:
start, stop = self.limits start, stop = self.limits