Changeset 2961 in products for quintagroup.analytics/trunk/quintagroup/analytics/browser/views.py

Timestamp:

Nov 2, 2010 12:08:40 PM (14 years ago)

Author:

fenix

Message:

extend ownership by type view:added other types into chart; all content types are listed in table now

File:

• quintagroup.analytics/trunk/quintagroup/analytics/browser/views.py (modified) (6 diffs)

quintagroup.analytics/trunk/quintagroup/analytics/browser/views.py

@@ -18 +18 @@
 from GChartWrapper import VerticalBarStack
 
+from quintagroup.analytics.config import COLORS, OTHER_TYPES
+
 class OwnershipByType(BrowserView):
     MAX = 10
@@ -47 +49 @@
         return self.users
 
-    def getTypes(self):
+    def getTypes(self, all=False):
         if self.types is None:
             index = self.cat._catalog.getIndex('portal_type')
@@ -62 +64 @@
             data.sort(lambda a, b: a[1] - b[1])
             data.reverse()
-            self.types = [i[0] for i in data[:self.MAX]]
-        return self.types
+            self.types = [i[0] for i in data]
+        return all and self.types or self.types[:self.MAX]
 
     def getContent(self, type_):
@@ -82 +84 @@
     def getChart(self):
         data = []
-        for type_ in self.getTypes():
+        types = self.getTypes()
+        for type_ in types:
             data.append(self.getContent(type_))
+        other = [self.getContent(t) for t in self.getTypes(all=True)[self.MAX:]]
+        data.append([sum(l) for l in zip(*other)])
         max_value = max(self.getTotal())
         chart = VerticalBarStack(data, encoding='text')
-        chart.title('Content ownership by type').legend(*self.types)
+        chart.title('Content ownership by type').legend(*(types+OTHER_TYPES))
         chart.bar('a', 10, 0).legend_pos("b")
-        chart.color('669933', 'CC9966', '993300', 'FF6633', 'E8E4E3', 'A9A486',
-                    'DCB57E', 'FFCC99', '996633', '333300')
+        chart.color(*COLORS)
         chart.size(800, 375).scale(0,max_value).axes('xy').label(*self.users)
         chart.axes.type("y")
@@ -166 +170 @@
         chart.title('Content ownership by state').legend(*self.states)
         chart.bar('a', 10, 0).legend_pos("b")
-        chart.color('669933', 'CC9966', '993300', 'FF6633', 'E8E4E3', 'A9A486',
-                    'DCB57E', 'FFCC99', '996633', '333300')
+        chart.color(*COLORS)
         chart.size(800, 375).scale(0,max_value).axes('xy').label(*self.users)
         chart.axes.type("y")
@@ -245 +248 @@
         chart.title('Content type by state').legend(*self.states)
         chart.bar('a', 10, 0).legend_pos("b")
-        chart.color('669933', 'CC9966', '993300', 'FF6633', 'E8E4E3', 'A9A486',
-                    'DCB57E', 'FFCC99', '996633', '333300')
+        chart.color(*COLORS)
         chart.size(800, 375).scale(0,max_value).axes('xy').label(*self.types)
         chart.axes.type("y")