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

use subtotals row id instead of class concat

Browse source
This commit is contained in:
hplattner 2016-12-28 11:40:09 +01:00
parent e26d61c38b
commit aab06b0cc9
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
composer/report/result.py
View file

@ -32,6 +32,8 @@ from loops.common import normalizeName
class BaseRow(object): class BaseRow(object):
rowId = u''
def __init__(self, context, parent): def __init__(self, context, parent):
self.context = context self.context = context
self.parent = parent self.parent = parent
@ -54,8 +56,7 @@ class Row(BaseRow):
attributeHandlers = {} attributeHandlers = {}
cssClass = u'' cssClass = u''
rowId = u'' subTotalsRowIds = []
subTotalRowIds = []
def getRawValue(self, attr): def getRawValue(self, attr):
return self.attributeHandlers.get( return self.attributeHandlers.get(
@ -100,6 +101,8 @@ class GroupHeaderRow(BaseRow):
class SubTotalsRow(BaseRow): class SubTotalsRow(BaseRow):
cssClass = 'subTotalsRow'
def getRawValue(self, attr): def getRawValue(self, attr):
return self.data.get(attr, u'') return self.data.get(attr, u'')
@ -162,7 +165,8 @@ class ResultSet(object):
if isinstance(value, basestring): if isinstance(value, basestring):
rowId = '%s-%s' % (gf.name, normalizeName(value)) rowId = '%s-%s' % (gf.name, normalizeName(value))
rowId = rowId.replace('.', '_') rowId = rowId.replace('.', '_')
subTotalsRow.cssClass = 'subTotalsRow ' + rowId subTotalsRow.cssClass = 'subTotalsRow'
subTotalsRow.rowId = rowId
for idx, c in enumerate(columns): for idx, c in enumerate(columns):
subTotalsRow.data[c.name] = values[idx] subTotalsRow.data[c.name] = values[idx]
if gf in self.subTotalsGroupColumns: if gf in self.subTotalsGroupColumns:
@ -258,7 +262,7 @@ class ResultSet(object):
if isinstance(value, basestring): if isinstance(value, basestring):
value = normalizeName(value) value = normalizeName(value)
value = value.replace('.', '_') value = value.replace('.', '_')
row.subTotalRowIds = copy(row.subTotalRowIds) +\ row.subTotalsRowIds = copy(row.subTotalsRowIds) +\
['%s-%s' % (name, value)] ['%s-%s' % (name, value)]
elif isinstance(row, GroupHeaderRow): elif isinstance(row, GroupHeaderRow):
sourceField = row.sourceField sourceField = row.sourceField