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)

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

@@ -18,80 +18,91 @@ 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
ordered_by_day = {} ctx['obd_data'] = cache.get('statistics_obd_data')
for o in Order.objects.current.filter(event=self.request.event).values('datetime'): if not ctx['obd_data']:
day = o['datetime'].date() ordered_by_day = {}
ordered_by_day[day] = ordered_by_day.get(day, 0) + 1 for o in Order.objects.current.filter(event=self.request.event).values('datetime'):
paid_by_day = {} day = o['datetime'].date()
for o in Order.objects.current.filter(event=self.request.event, ordered_by_day[day] = ordered_by_day.get(day, 0) + 1
payment_date__isnull=False).values('payment_date'): paid_by_day = {}
day = o['payment_date'].date() for o in Order.objects.current.filter(event=self.request.event,
paid_by_day[day] = paid_by_day.get(day, 0) + 1 payment_date__isnull=False).values('payment_date'):
day = o['payment_date'].date()
paid_by_day[day] = paid_by_day.get(day, 0) + 1
data = [] data = []
for d in dateutil.rrule.rrule( for d in dateutil.rrule.rrule(
dateutil.rrule.DAILY, dateutil.rrule.DAILY,
dtstart=min(ordered_by_day.keys() if ordered_by_day else datetime.date.today()), dtstart=min(ordered_by_day.keys() if ordered_by_day else datetime.date.today()),
until=max( until=max(
max(ordered_by_day.keys() if paid_by_day else [datetime.date.today()]), max(ordered_by_day.keys() if paid_by_day else [datetime.date.today()]),
max(paid_by_day.keys() if paid_by_day else [datetime.date(1970, 1, 1)]) max(paid_by_day.keys() if paid_by_day else [datetime.date(1970, 1, 1)])
)): )):
d = d.date() d = d.date()
data.append({ data.append({
'date': d.strftime('%Y-%m-%d'), 'date': d.strftime('%Y-%m-%d'),
'ordered': ordered_by_day.get(d, 0), 'ordered': ordered_by_day.get(d, 0),
'paid': paid_by_day.get(d, 0) 'paid': paid_by_day.get(d, 0)
}) })
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
num_ordered = { ctx['obp_data'] = cache.get('statistics_obp_data')
p['item']: p['cnt'] if not ctx['obp_data']:
for p in (OrderPosition.objects.current num_ordered = {
.filter(order__event=self.request.event) p['item']: p['cnt']
.values('item', 'variation') for p in (OrderPosition.objects.current
.annotate(cnt=Count('id'))) .filter(order__event=self.request.event)
} .values('item', 'variation')
num_paid = { .annotate(cnt=Count('id')))
p['item']: p['cnt'] }
for p in (OrderPosition.objects.current num_paid = {
.filter(order__event=self.request.event, order__status=Order.STATUS_PAID) p['item']: p['cnt']
.values('item', 'variation') for p in (OrderPosition.objects.current
.annotate(cnt=Count('id'))) .filter(order__event=self.request.event, order__status=Order.STATUS_PAID)
} .values('item', 'variation')
item_names = { .annotate(cnt=Count('id')))
i.identity: str(i.name) }
for i in Item.objects.current.filter(event=self.request.event) item_names = {
} i.identity: str(i.name)
ctx['obp_data'] = [ for i in Item.objects.current.filter(event=self.request.event)
{ }
'item': item_names[item], ctx['obp_data'] = [
'ordered': cnt, {
'paid': num_paid.get(item, 0) 'item': item_names[item],
} for item, cnt in num_ordered.items() 'ordered': cnt,
] 'paid': num_paid.get(item, 0)
} for item, cnt in num_ordered.items()
]
cache.set('statistics_obp_data', ctx['obp_data'])
rev_by_day = {} ctx['rev_data'] = cache.get('statistics_rev_data')
for o in Order.objects.current.filter(event=self.request.event, if not ctx['rev_data']:
status=Order.STATUS_PAID, rev_by_day = {}
payment_date__isnull=False).values('payment_date', 'total'): for o in Order.objects.current.filter(event=self.request.event,
day = o['payment_date'].date() status=Order.STATUS_PAID,
rev_by_day[day] = rev_by_day.get(day, 0) + o['total'] payment_date__isnull=False).values('payment_date', 'total'):
day = o['payment_date'].date()
rev_by_day[day] = rev_by_day.get(day, 0) + o['total']
data = [] data = []
total = 0 total = 0
for d in dateutil.rrule.rrule( for d in dateutil.rrule.rrule(
dateutil.rrule.DAILY, dateutil.rrule.DAILY,
dtstart=min(rev_by_day.keys() if rev_by_day else [datetime.date.today()]), dtstart=min(rev_by_day.keys() if rev_by_day else [datetime.date.today()]),
until=max(rev_by_day.keys() if rev_by_day else [datetime.date.today()])): until=max(rev_by_day.keys() if rev_by_day else [datetime.date.today()])):
d = d.date() d = d.date()
total += float(rev_by_day.get(d, 0)) total += float(rev_by_day.get(d, 0))
data.append({ data.append({
'date': d.strftime('%Y-%m-%d'), 'date': d.strftime('%Y-%m-%d'),
'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