Update Pivot Chart Plugin and Demo

sshwsfc · sshwsfc · commit df88f459b3a6 · 2014-07-06T22:39:09.000+08:00
diff --git a/demo_app/app/adminx.py b/demo_app/app/adminx.py
@@ -4,6 +4,7 @@
 from xadmin.layout import Main, TabHolder, Tab, Fieldset, Row, Col, AppendedText, Side
 from xadmin.plugins.inline import Inline
 from xadmin.plugins.batch import BatchChangeAction
+from django.db.models import Avg, Max, Min, Count, Sum
 
 class MainDashboard(object):
     widgets = [
@@ -22,8 +23,8 @@ class MainDashboard(object):
 
 
 class BaseSetting(object):
-    enable_themes = True
-    use_bootswatch = True
+    enable_themes = False
+    use_bootswatch = False
 xadmin.site.register(views.BaseAdminView, BaseSetting)
 
 
@@ -172,24 +173,39 @@ def avg_count(self, instance):
     avg_count.allow_tags = True
     avg_count.is_column = True
 
-    list_display = ('date', 'user_count', 'view_count', 'avg_count')
-    list_display_links = ('date',)
+    def user_count_sum(self, obj):
+      return obj
+    user_count_sum.short_description = "User Count Sum"
 
-    list_filter = ['date', 'user_count', 'view_count']
+    def view_count_sum(self, obj):
+      return obj
+    view_count_sum.short_description = "View Count Sum"
+
+    list_display = ('date', 'user_count_sum', 'view_count_sum')
+
+    list_filter = ['date']
     actions = None
-    aggregate_fields = {"user_count": "sum", 'view_count': "sum"}
 
-    refresh_times = (3, 5, 10)
-    data_charts = {
-        "user_count": {'title': u"User Report", "x-field": "date", "y-field": ("user_count", "view_count"), "order": ('date',)},
-        "avg_count": {'title': u"Avg Report", "x-field": "date", "y-field": ('avg_count',), "order": ('date',)},
-        "per_month": {'title': u"Monthly Users", "x-field": "_chart_month", "y-field": ("user_count", ), 
-                              "option": {
-                                         "series": {"bars": {"align": "center", "barWidth": 0.8,'show':True}}, 
-                                         "xaxis": {"aggregate": "sum", "mode": "categories"},
-                                         },
-                            },
+    pivot_fields = {
+      'values' : ['date',],
+      'annotate': {
+        'user_count_sum': Sum('user_count'),
+        'view_count_sum': Sum('view_count'),
+      }
     }
+    # aggregate_fields = {"user_count": "sum", 'view_count': "sum"}
+
+    # refresh_times = (3, 5, 10)
+    # data_charts = {
+    #     "user_count": {'title': u"User Report", "x-field": "date", "y-field": ("user_count", "view_count"), "order": ('date',)},
+    #     "avg_count": {'title': u"Avg Report", "x-field": "date", "y-field": ('avg_count',), "order": ('date',)},
+    #     "per_month": {'title': u"Monthly Users", "x-field": "_chart_month", "y-field": ("user_count", ), 
+    #                           "option": {
+    #                                      "series": {"bars": {"align": "center", "barWidth": 0.8,'show':True}}, 
+    #                                      "xaxis": {"aggregate": "sum", "mode": "categories"},
+    #                                      },
+    #                         },
+    # }
     
     def _chart_month(self,obj):
         return obj.date.strftime("%B")
diff --git a/demo_app/demo/urls.py b/demo_app/demo/urls.py
@@ -7,10 +7,9 @@
 # from xadmin.plugins import xversion
 # xversion.register_models()
 
-from django.contrib import admin
-admin.autodiscover()
+# from django.contrib import admin
+# admin.autodiscover()
 
 urlpatterns = patterns('',
-    url(r'^admin/', include(admin.site.urls)),
     url(r'^', include(xadmin.site.urls))
 )
diff --git a/xadmin/plugins/pivot_chart.py b/xadmin/plugins/pivot_chart.py
@@ -19,24 +19,19 @@ def mock_for_field_label(obj):
 
 class PivotChartPlugin(BaseAdminPlugin):
 
-    pivot_fields = []
+    pivot_fields = None
 
     def result_item(self, __, obj, field_name, row):
+        print obj
         item = ResultItem(field_name, row)
         item.text = obj[field_name]
         return item
 
-    def get_list_display(self, __):
-        self.admin_view.list_display = ['log_time', 'click_count_sum']
-        return __()
-
     def init_request(self, *args, **kwargs):
-        self.admin_view.click_count_sum = mock_for_field_label
-        self.admin_view.log_time = mock_for_field_label
         return bool(self.pivot_fields)
 
     def queryset(self, qs):
-        return qs.values('log_time').annotate(click_count_sum=Sum('click_count'))
+        return qs.values(*self.pivot_fields['values']).annotate(**self.pivot_fields['annotate'])
 
     # Media
     def get_media(self, media):
