--- a/ckanext/ga_report/controller.py +++ b/ckanext/ga_report/controller.py @@ -10,10 +10,10 @@ log = logging.getLogger('ckanext.ga-report') -def _get_month_name(str): +def _get_month_name(strdate): import calendar from time import strptime - d = strptime('2012-10', '%Y-%m') + d = strptime(strdate, '%Y-%m') return '%s %s' % (calendar.month_name[d.tm_mon], d.tm_year) @@ -21,7 +21,7 @@ months = [] vals = model.Session.query(cls.period_name).distinct().all() for m in vals: - months.append( (m[0], _get_month_name(m))) + months.append( (m[0], _get_month_name(m[0]))) return sorted(months, key=operator.itemgetter(0), reverse=True) @@ -58,7 +58,8 @@ entries = model.Session.query(GA_Stat).\ filter(GA_Stat.stat_name=='Totals').\ - filter(GA_Stat.period_name==c.month).all() + filter(GA_Stat.period_name==c.month).\ + order_by('ga_stat.key').all() c.global_totals = [(s.key, s.value) for s in entries ] keys = {