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

add: CombinedResultSet

Browse source
This commit is contained in:
hplattner 2012-03-30 08:35:57 +02:00
parent 459bd2d6bf
commit 6b99765ccf
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
expert/field.py
View file

@ -205,5 +205,10 @@ class SubReportField(Field):
def getCategoryValue(self, row): def getCategoryValue(self, row):
ri = self.getReportInstance(row) ri = self.getReportInstance(row)
return ri.getCategoryResults() return ri.getCategories()
def getCombinedValue(self, row):
ri = self.getReportInstance(row)
return ri.getCombinedResults()

8
expert/report.py
View file

@ -30,7 +30,7 @@ from cybertools.composer.report.base import Report as BaseReport
from cybertools.composer.report.base import LeafQueryCriteria, CompoundQueryCriteria from cybertools.composer.report.base import LeafQueryCriteria, CompoundQueryCriteria
from cybertools.composer.report.interfaces import IReport as IBaseReport from cybertools.composer.report.interfaces import IReport as IBaseReport
from cybertools.composer.report.interfaces import IReportParams from cybertools.composer.report.interfaces import IReportParams
from cybertools.composer.report.result import ResultSet, Row from cybertools.composer.report.result import CombinedResultSet, ResultSet, Row
from cybertools.util.jeep import Jeep from cybertools.util.jeep import Jeep
from loops.common import AdapterBase from loops.common import AdapterBase
from loops.interfaces import ILoopsAdapter from loops.interfaces import ILoopsAdapter
@ -104,10 +104,14 @@ class ReportInstance(BaseReport):
return ResultSet(self, result, rowFactory=self.rowFactory, return ResultSet(self, result, rowFactory=self.rowFactory,
sortCriteria=self.getSortCriteria(), queryCriteria=qc) sortCriteria=self.getSortCriteria(), queryCriteria=qc)
def getCategoryResults(self): def getCategories(self):
result = list(self.selectObjects(None)) result = list(self.selectObjects(None))
return ResultSet(self, result, rowFactory=self.categoryRowFactory, return ResultSet(self, result, rowFactory=self.categoryRowFactory,
filterDublicate=True) 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