diff --git a/src/nalodeni/models.py b/src/nalodeni/models.py index a453e7a..55ed4ed 100644 --- a/src/nalodeni/models.py +++ b/src/nalodeni/models.py @@ -301,37 +301,6 @@ class AppUser(AbstractUser, DataAudited): return spc - """ - -from django.db.models import Count -from django.db.models.functions import TruncMonth -from django.db.models.functions import TruncYear - -import nalodeni as n - -objs = n.models.USER_MODEL.objects.annotate( month=TruncMonth('createdStamp')).values('month', 'district').annotate(c=Count('id')).order_by('district','month') - -district_choices = { - 0 : 'PHA', - 1 : 'JHC', - 2 : 'JHM', - 3 : 'KVK', - 4 : 'VYS', - 5 : 'KHK', - 6 : 'LBK', - 7 : 'MSK', - 8 : 'OLK', - 9 : 'PAK', - 10 : 'PLK', - 11 : 'STC', - 12 : 'ULK', - 13 : 'ZLK', -} - -for o in objs: - print( "%s \t %s \t %s" % (district_choices[o['district']] if o['district'] is not None else "---", o['month'].strftime('%Y-%m'),o['c'])) - - """ diff --git a/src/nalodeni/stats.py b/src/nalodeni/stats.py new file mode 100644 index 0000000..2c40b95 --- /dev/null +++ b/src/nalodeni/stats.py @@ -0,0 +1,115 @@ +# -*- encoding: utf-8 -*- + +from datetime import date, datetime, timedelta # timeSlices +from collections import OrderedDict +import csv + +import django +from django.http import HttpResponse, HttpResponseRedirect +from django.template import Template, RequestContext, loader +from django.shortcuts import render, redirect + +from django.contrib.auth.decorators import login_required +from django.urls import reverse +from django.views.decorators.csrf import ensure_csrf_cookie +from django import forms +from django.forms import ModelForm +from django.contrib import messages +from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import pgettext, pgettext_lazy + +from django.db import transaction +from django.db.models import F + +from django.db.models import Count +from django.db.models.functions import TruncMonth +from django.db.models.functions import TruncYear + +from django.core.exceptions import ValidationError + +import logging + +from django.conf import settings as appSettings + +from . import models +from . import forms +from . import auth as nalodeni_auth + +# Logger instance +logger = logging.getLogger(__name__) + +def role_required(roles=[]): + def decorate(func): + def call(request, *args, **kwargs): + for r in roles: + if not r in request.session['site_perms']: + messages.error(request, "Nedostatečné oprávnění pro přístup. Detaily byly zaznamenány.") + return HttpResponseRedirect('/') + result = func(request, *args, **kwargs) + return result + return call + return decorate + +def get_AppUser_objects(request): + ''' Zkontroluje, že všechny objekty v 'objs' vyhovují přiděleným rolím. + Nevyhovující vyřadí. + ''' + sp = request.session['site_perms'] + if 'sso_kodo' not in sp: + return models.AppUser.objects.none() + + if 'sso_admin' in sp: + return models.AppUser.objects.all() + + objs = models.AppUser.objects.filter(district__in=request.session['spc']['dist']) + + return objs + +def get_AppUser_districts(request): + '''Vrátí dostupné kraje podle rolí.''' + + + if 'sso_admin' in request.session['site_perms']: + return list(models.AppUser.DISTRICT_CHOICES) + + rslt = [] + for d in models.AppUser.DISTRICT_CHOICES: + if d[0] in request.session['spc']['dist']: + rslt.append(d) + + return rslt + + +@ensure_csrf_cookie +@login_required(login_url="/prihlaseni") +@role_required(['sso_kodo']) +def reg_counts(request, dist=None): + if dist is None: + dist = int(request.POST.get('dist', -1)) + + objs = get_AppUser_objects(request) + + districts = [(-1, ' -- vše dostupné -- ')] + get_AppUser_districts(request) + # filtrujeme jen povolene kraje, nebo vse pro adminy + if dist != -1 and (dist in request.session['spc']['dist'] or 'sso_admin' in request.session['site_perms']): + selDist = dist + objs = objs.filter(district=selDist) + else: + selDist = -1 + + objs = objs.annotate( month=TruncMonth('createdStamp')).values('month', 'district').annotate(c=Count('id')).order_by('district','month') + + for o in objs: + o['district'] = models.AppUser.DISTRICT_CHOICES_STR[o['district']] if o['district'] is not None else "---" + #print( "%s \t %s \t %s" % (o['district'], o['month'].strftime('%Y-%m'),o['c'])) + + template = 'stats/reg_counts.html' + context = { + 'objs' : objs, + 'distAvail' : districts, + 'selDist' : selDist, + } + + return render(request, template, context) + + diff --git a/src/nalodeni/templates/pirati_cz.html b/src/nalodeni/templates/pirati_cz.html index c12ebc2..0f8a706 100644 --- a/src/nalodeni/templates/pirati_cz.html +++ b/src/nalodeni/templates/pirati_cz.html @@ -239,6 +239,7 @@
  • Registrovaní
  • Nově přihlášení
  • Čekající registrace +
  • Statistiky diff --git a/src/nalodeni/templates/stats/reg_counts.html b/src/nalodeni/templates/stats/reg_counts.html new file mode 100644 index 0000000..212e7b8 --- /dev/null +++ b/src/nalodeni/templates/stats/reg_counts.html @@ -0,0 +1,72 @@ +{% extends 'pirati_cz.html' %} + +{%block head%} + +{%endblock%} +{%block body%} +
    +
    +
    +
    +
    +

    Statistiky registrací dle měsíců a krajů

    +
    +
    + {%csrf_token%} +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    + {% if objs|length > 0 %} + + + + + + + {% for obj in objs %} + + + + + + {% endfor %} +
    KrajRok, měsícPočet registrovaných
    {{obj.district}}{{obj.month|date:"Y-m"}}{{obj.c}}
    + {%else%} + Žádné položky + {%endif%} +
    +
    +
    +
    +
    + +
    +
    +
    +
    +   +
    +
    +
    +
    + + +{%endblock%} diff --git a/src/nalodeni/urls.py b/src/nalodeni/urls.py index 2de5261..39ad285 100644 --- a/src/nalodeni/urls.py +++ b/src/nalodeni/urls.py @@ -4,7 +4,7 @@ from django.conf.urls import include, url from django.conf import settings as appSettings -from . import views, people, news +from . import views, people, news, stats app_name = "nalodeni" urlpatterns = [ @@ -38,6 +38,10 @@ urlpatterns = [ url(r'^people/pending/$', people.pending, name="people_pending"), url(r'^people/update/$', people.update, name="people_update"), + + url(r'^stats/reg_counts/$', stats.reg_counts, name="stats_reg_counts"), + + url(r'^news/all/$', news.news_all, name="news_all"), url(r'^news/list/create/$', news.list_edit, name="news_list_create"), url(r'^news/list/edit/(?P[0-9]+)/$', news.list_edit, name="news_list_edit"),