forked from DGNum/gestioCOF
Merge branch 'dodo/fix_stat_labels' into 'master'
Dodo/fix stat labels Closes #296 See merge request klub-dev-ens/gestioCOF!510
This commit is contained in:
commit
1ad025e046
2 changed files with 9 additions and 3 deletions
|
@ -25,6 +25,12 @@ adhérents ni des cotisations.
|
|||
|
||||
- Créer un compte hCaptcha (https://www.hcaptcha.com/), au COF, et remplacer les secrets associés
|
||||
|
||||
## Version ??? - ??/??/????
|
||||
|
||||
### K-Fêt
|
||||
|
||||
- Répare le problème des étiquettes LIQ/Comptes K-Fêt inversées dans les stats des articles K-Fêt
|
||||
|
||||
## Version 0.11 - 26/10/2021
|
||||
|
||||
### COF
|
||||
|
|
|
@ -12,7 +12,7 @@ from django.contrib.auth.decorators import login_required, permission_required
|
|||
from django.contrib.auth.mixins import PermissionRequiredMixin
|
||||
from django.contrib.auth.models import Permission, User
|
||||
from django.contrib.messages.views import SuccessMessageMixin
|
||||
from django.core.exceptions import SuspiciousOperation, ValidationError
|
||||
from django.core.exceptions import SuspiciousOperation
|
||||
from django.db import transaction
|
||||
from django.db.models import Count, F, Max, OuterRef, Prefetch, Q, Subquery, Sum
|
||||
from django.forms import ValidationError, formset_factory
|
||||
|
@ -2728,10 +2728,10 @@ class ArticleStatSales(ScaleMixin, JSONDetailView):
|
|||
"label": "Toutes consommations",
|
||||
"values": nb_ventes,
|
||||
},
|
||||
{"color": "rgb(54, 162, 235)", "label": "LIQ", "values": nb_cof},
|
||||
{"color": "rgb(54, 162, 235)", "label": "Comptes K-Fêt", "values": nb_cof},
|
||||
{
|
||||
"color": "rgb(255, 205, 86)",
|
||||
"label": "Comptes K-Fêt",
|
||||
"label": "LIQ",
|
||||
"values": nb_noncof,
|
||||
},
|
||||
]
|
||||
|
|
Loading…
Reference in a new issue