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

fix: replace Combined/CategoryResultSets with computed HeaderRows

Browse source
This commit is contained in:
hplattner 2012-04-03 15:20:59 +02:00
parent 6b99765ccf
commit 86e25111b5
2 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
expert/field.py
View file

@ -202,13 +202,4 @@ class SubReportField(Field):
def getValue(self, row): def getValue(self, row):
ri = self.getReportInstance(row) ri = self.getReportInstance(row)
return ri.getResults() return ri.getResults()
def getCategoryValue(self, row):
ri = self.getReportInstance(row)
return ri.getCategories()
def getCombinedValue(self, row):
ri = self.getReportInstance(row)
return ri.getCombinedResults()

11
expert/report.py
View file

@ -77,6 +77,7 @@ class ReportInstance(BaseReport):
adapts(IReport) adapts(IReport)
rowFactory = Row rowFactory = Row
headerRowFactory = Row
view = None # set upon creation view = None # set upon creation
@ -102,16 +103,8 @@ class ReportInstance(BaseReport):
result = list(self.selectObjects(parts)) # may modify parts result = list(self.selectObjects(parts)) # may modify parts
qc = CompoundQueryCriteria(parts) qc = CompoundQueryCriteria(parts)
return ResultSet(self, result, rowFactory=self.rowFactory, return ResultSet(self, result, rowFactory=self.rowFactory,
headerRowFactory=self.headerRowFactory,
sortCriteria=self.getSortCriteria(), queryCriteria=qc) sortCriteria=self.getSortCriteria(), queryCriteria=qc)
def getCategories(self):
result = list(self.selectObjects(None))
return ResultSet(self, result, rowFactory=self.categoryRowFactory,
filterDublicate=True)
def getCombinedResults(self):
return CombinedResultSet(self, self.getCategories(), self.getResults())
def selectObjects(self, parts): def selectObjects(self, parts):
# to be implemented by subclass # to be implemented by subclass