Merge pull request #4 from PetrDlouhy/master

More flexible charts

Author: kmike

AUTHORS.rst

@@ -2,4 +2,5 @@ Authors
 =======
 
 * Mikhail Korobov;
-* Alex Lovell-Troy.
+* Petr Dlouhý;
+* Alex Lovell-Troy.

README.rst

@@ -83,9 +83,11 @@ To build charts for other time-series data, inherit from BaseChart and set a few
         template = 'admin_user_stats/modules/chart.html'
         chart_size = "580x100"
         days = None
+        values_count = 10 #use either days or values_count
         interval = 'days'
         queryset = Activity.objects.filter(kitten=True).exclude(active=None)
         date_field = 'activity_date'
+        aggregate = Sum('amount')
 
 BaseCharts
 ---------

admin_user_stats/base_modules.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from datetime import timedelta
+from django.db.models import Count
 from django.utils.translation import ugettext_lazy as _
 try:
     from django.utils.timezone import now
@@ -21,9 +22,11 @@ class BaseChart(modules.DashboardModule):
     template = 'admin_user_stats/modules/chart.html'
     chart_size = "580x100"
     days = None
+    values_count = 30
     interval = 'days'
     queryset = None
     date_field = 'date_joined'
+    aggregate = Count('id')
 
     def is_empty(self):
         return False
@@ -32,7 +35,7 @@ def __init__(self, *args, **kwargs):
         super(BaseChart, self).__init__(*args, **kwargs)
 
         if self.days is None:
-            self.days = {'days': 30, 'weeks': 30*7, 'months': 30*12}[self.interval]
+            self.days = {'days': self.values_count, 'weeks': self.values_count*7, 'months': self.values_count*30, 'years': self.values_count*365}[self.interval]
 
         self.data = self.get_data(self.interval, self.days)
         self.prepare_template_data(self.data)
@@ -42,12 +45,13 @@ def get_caption(self, dt):
             'days': dt.day,
             'months': dt.strftime("%b"),
             'weeks': dt.strftime('%W'),
+            'years': dt.strftime('%Y'),
         }[self.interval]
 
     # @cached(60*5)
     def get_data(self, interval, days):
         """ Returns an array with new users count per interval """
-        stats = QuerySetStats(self.queryset, self.date_field)
+        stats = QuerySetStats(self.queryset, self.date_field, aggregate = self.aggregate)
         today = now()
         begin = today - timedelta(days=days-1)
         return stats.time_series(begin, today+timedelta(days=1), interval)
@@ -75,4 +79,5 @@ def get_charts(self):
             self.chart_model(_('By Day'), interval='days'),
             self.chart_model(_('By Week'), interval='weeks'),
             self.chart_model(_('By Month'), interval='months'),
+            self.chart_model(_('By Year'), interval='years'),
         ]