From e384bfb0f343bd19928ae6fe9ce28a0082b36af1 Mon Sep 17 00:00:00 2001 From: Dorian Lesbre Date: Wed, 5 Jan 2022 10:45:32 +0100 Subject: [PATCH 1/4] Fix issue #296 --- kfet/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kfet/views.py b/kfet/views.py index 0d9f9544..94ef49e7 100644 --- a/kfet/views.py +++ b/kfet/views.py @@ -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, }, ] From e41bcbb6d7644ff2eca470686fcb2433e9e76478 Mon Sep 17 00:00:00 2001 From: Dorian Lesbre Date: Wed, 5 Jan 2022 10:48:04 +0100 Subject: [PATCH 2/4] Removed duplicate import to please flake8 --- kfet/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kfet/views.py b/kfet/views.py index 94ef49e7..b9561f33 100644 --- a/kfet/views.py +++ b/kfet/views.py @@ -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 From 17a9ae3302d3a8dc26c36de8ed7e0e46a1f1e77d Mon Sep 17 00:00:00 2001 From: Dorian Lesbre Date: Wed, 5 Jan 2022 10:50:45 +0100 Subject: [PATCH 3/4] Update CHANGELOG --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cabd46d4..540b78a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,11 @@ 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-Fet ## Version 0.11 - 26/10/2021 ### COF From b3c047738a20d3883affaac2c6b65bde189e4efa Mon Sep 17 00:00:00 2001 From: Dorian Lesbre Date: Thu, 6 Jan 2022 16:00:26 +0100 Subject: [PATCH 4/4] =?UTF-8?q?Ajout=20accent=20K-F=C3=AAt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 540b78a4..fb152b78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,7 +29,8 @@ adhérents ni des cotisations. ### K-Fêt -- Répare le problème des étiquettes LIQ/Comptes K-Fêt inversées dans les stats des articles K-Fet +- 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