CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Cached and fixed statistics

Browse Source
This commit is contained in:
Raphael Michel
2015-08-15 14:31:09 +02:00
parent b648d161d6
commit 9720cd8fea
2 changed files with 93 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/pretix/plugins/statistics/signals.py
View File

@@ -4,10 +4,11 @@ from django.template import Context
from django.template.loader import get_template from django.template.loader import get_template
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from pretix.base.signals import order_paid, order_placed
from pretix.control.signals import html_head, nav_event from pretix.control.signals import html_head, nav_event
@receiver(nav_event) @receiver(nav_event, dispatch_uid="statistics_nav")
def control_nav_import(sender, request=None, **kwargs): def control_nav_import(sender, request=None, **kwargs):
url = resolve(request.path_info) url = resolve(request.path_info)
if not request.eventperm.can_view_orders: if not request.eventperm.can_view_orders:
@@ -25,7 +26,7 @@ def control_nav_import(sender, request=None, **kwargs):
] ]
@receiver(html_head) @receiver(html_head, dispatch_uid="statistics_html_head")
def html_head_presale(sender, request=None, **kwargs): def html_head_presale(sender, request=None, **kwargs):
url = resolve(request.path_info) url = resolve(request.path_info)
if url.namespace == 'plugins:statistics': if url.namespace == 'plugins:statistics':
@@ -34,3 +35,14 @@ def html_head_presale(sender, request=None, **kwargs):
return template.render(ctx) return template.render(ctx)
else: else:
return "" return ""
def clear_cache(sender, *args, **kwargs):
cache = sender.get_cache()
cache.delete('statistics_obd_data')
cache.delete('statistics_obp_data')
cache.delete('statistics_rev_data')
order_placed.connect(clear_cache)
order_paid.connect(clear_cache)

11
src/pretix/plugins/statistics/views.py
View File

@@ -18,7 +18,11 @@ class IndexView(EventPermissionRequiredMixin, TemplateView):
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
ctx = super().get_context_data(**kwargs) ctx = super().get_context_data(**kwargs)
cache = self.request.event.get_cache()
# Orders by day # Orders by day
ctx['obd_data'] = cache.get('statistics_obd_data')
if not ctx['obd_data']:
ordered_by_day = {} ordered_by_day = {}
for o in Order.objects.current.filter(event=self.request.event).values('datetime'): for o in Order.objects.current.filter(event=self.request.event).values('datetime'):
day = o['datetime'].date() day = o['datetime'].date()
@@ -45,8 +49,11 @@ class IndexView(EventPermissionRequiredMixin, TemplateView):
}) })
ctx['obd_data'] = json.dumps(data) ctx['obd_data'] = json.dumps(data)
cache.set('statistics_obd_data', ctx['obd_data'])
# Orders by product # Orders by product
ctx['obp_data'] = cache.get('statistics_obp_data')
if not ctx['obp_data']:
num_ordered = { num_ordered = {
p['item']: p['cnt'] p['item']: p['cnt']
for p in (OrderPosition.objects.current for p in (OrderPosition.objects.current
@@ -72,7 +79,10 @@ class IndexView(EventPermissionRequiredMixin, TemplateView):
'paid': num_paid.get(item, 0) 'paid': num_paid.get(item, 0)
} for item, cnt in num_ordered.items() } for item, cnt in num_ordered.items()
] ]
cache.set('statistics_obp_data', ctx['obp_data'])
ctx['rev_data'] = cache.get('statistics_rev_data')
if not ctx['rev_data']:
rev_by_day = {} rev_by_day = {}
for o in Order.objects.current.filter(event=self.request.event, for o in Order.objects.current.filter(event=self.request.event,
status=Order.STATUS_PAID, status=Order.STATUS_PAID,
@@ -93,5 +103,6 @@ class IndexView(EventPermissionRequiredMixin, TemplateView):
'revenue': round(total, 2), 'revenue': round(total, 2),
}) })
ctx['rev_data'] = json.dumps(data) ctx['rev_data'] = json.dumps(data)
cache.set('statistics_rev_data', ctx['rev_data'])
return ctx return ctx