add: CombinedResultSet

composer/report/field.py

@@ -46,6 +46,7 @@ class Field(Component):
     operator = 'in'
     showTitle = True
     colspan=1
+    colheaderspan=1
     colwidth='auto'
     coltextalign='left'
     colbordertop='1px solid #000'

composer/report/result.py

@@ -106,3 +106,22 @@ class ResultSet(object):
     def categoryColumns(self):
         return self.context.getCategoryFields()
 
+
+class CombinedResultSet(ResultSet):
+    
+    def __init__(self, context, categorySet, resultSet):
+        self.context = context
+        self.categorySet = categorySet
+        self.resultSet = resultSet
+        self.totals = BaseRow(None, self)
+    
+    def getResult(self):
+        result = []
+        for row in self.categorySet:
+            result.append(row)
+            for res in self.resultSet:
+                for f in self.categoryColumns:
+                    if res.getRawValue(f.__name__) == row.getRawValue(f.__name__):
+                        result.append(res)
+        return result
+