From cecbb583c649cabea28778d554e30a40c86c4d81 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Mon, 21 Sep 2020 16:13:05 +0200 Subject: [PATCH] =?UTF-8?q?Change=20le=20nom=20des=20param=C3=A8tres?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kfet/urls.py | 2 +- kfet/views.py | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/kfet/urls.py b/kfet/urls.py index 0982a46e..d16aba84 100644 --- a/kfet/urls.py +++ b/kfet/urls.py @@ -240,7 +240,7 @@ urlpatterns = [ # ----- path("purchases", views.purchases_csv, name="kfet.purchases"), path( - "purchases/-/-", + "purchases/-/-", views.purchases_csv, name="kfet.purchases", ), diff --git a/kfet/views.py b/kfet/views.py index 78de56cc..48d75db7 100644 --- a/kfet/views.py +++ b/kfet/views.py @@ -2458,30 +2458,32 @@ class ScaleMixin(object): @teamkfet_required -def purchases_csv(request, st_y=None, st_m=None, en_y=None, en_m=None): +def purchases_csv( + request, start_year=None, start_month=None, end_year=None, end_month=None +): """ Renvoie un historique des achats en K-Fêt, par mois et sur une période donnée (Par défault les 12 mois précédents) """ # Si on ne spécifie pas tout l'intervalle, on prend les 12 derniers mois - if (st_y and st_m and en_y and en_m) is None: + if (start_year and start_month and end_year and end_month) is None: # On utilise replace pour gérer le cas des années bissextiles sans # changer de mois end = date.today().replace(day=1) start = end - timedelta(days=365) - st_y = start.year - st_m = start.month - en_y = end.year - en_m = end.month + start_year = start.year + start_month = start.month + end_year = end.year + end_month = end.month # On calcule la liste des premiers jours des mois dont on veut avoir les # ventes dates = [] - for year in range(st_y, en_y + 1): - m_st = st_m if year == st_y else 1 - m_en = en_m if year == en_y else 12 - for month in range(m_st, m_en + 1): + for year in range(start_year, end_year + 1): + month_start = start_month if year == start_year else 1 + month_end = end_month if year == end_year else 12 + for month in range(month_start, month_end + 1): dates.append(date(year, month, 1)) # On rajoute le mois suivant