Merge branch 'Aufinal/stat_2' into 'master'

Repassage sur les stats

Closes #246 and #255

See merge request klub-dev-ens/gestioCOF!462
This commit is contained in:
Martin Pepin 2020-09-22 21:06:46 +02:00
commit 57901c0013
5 changed files with 137 additions and 131 deletions

View file

@ -24,6 +24,7 @@ from kfet.models import (
Transfer,
TransferGroup,
)
from kfet.statistic import SCALE_CLASS_CHOICES
from . import KFET_DELETED_TRIGRAMME
from .auth import KFET_GENERIC_TRIGRAMME
@ -601,3 +602,28 @@ class OrderArticleToInventoryForm(forms.Form):
self.category = kwargs["initial"]["category"]
self.category_name = kwargs["initial"]["category__name"]
self.quantity_ordered = kwargs["initial"]["quantity_ordered"]
# ----
# Formulaires pour les statistiques K-Fêt
# ----
class StatScaleForm(forms.Form):
"""Formulaire pour nettoyer les paramètres envoyés aux
vues de statistiques K-Fêt. Non destiné à être affiché.
"""
name = forms.ChoiceField(choices=SCALE_CLASS_CHOICES)
begin = forms.DateTimeField(required=False)
end = forms.DateTimeField(required=False)
n_steps = forms.IntegerField(required=False)
last = forms.BooleanField(required=False)
class AccountStatForm(forms.Form):
""" Idem, mais pour la balance d'un compte """
begin_date = forms.DateTimeField(required=False)
end_date = forms.DateTimeField(required=False)
last_days = forms.IntegerField(required=False)