From bb77a6b01d054cfe9d92249610108bd980714793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= Date: Sun, 21 Sep 2014 02:55:13 +0200 Subject: [PATCH] =?UTF-8?q?D'un=20point=20de=20vue=20stat,=20ce=20qui=20no?= =?UTF-8?q?us=20int=C3=A9resse=20est=20exclusivement=20l'adh=C3=A9sion,=20?= =?UTF-8?q?pas=20la=20connexion.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Le câblage c'est la gestion de la fiche d'adhésion, si on compte les gens qui paient au mois alors il faut aussi compter la vente d'adaptateurs usb ethernet, ou la gestion du solde, ou autre ; * Du coup, le script est déjà à jour. This reverts 136254980e4f78578a7d6e27369b4414810a3ee1 --- utils/stats_cableurs2.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/stats_cableurs2.py b/utils/stats_cableurs2.py index c7723f74..cbd421b2 100755 --- a/utils/stats_cableurs2.py +++ b/utils/stats_cableurs2.py @@ -45,7 +45,7 @@ def parse_historique(ligne): """Parse une ligne d'historique et renvoie [ligne parsée],action du cableur, date de l'action""" champ = ligne.value.replace(',','').replace(':','').split(' ') - sdate = champ[0].split('/') + sdate = champ[0].split('/') date = datetime.date(int(sdate[2]),int(sdate[1]),int(sdate[0])) champ_action=champ[4] return champ,champ_action,date @@ -59,7 +59,7 @@ def actions_cableurs(): champ=parse_historique(histo[j])[0] champ_action=parse_historique(histo[j])[1] date=parse_historique(histo[j])[2] - if ((champ_action == u'inscription' or u"debutAdhesion+" in champ_action) or len(champ) > 5 and (u"debutAdhesion+" in champ[5] or u"debutConnexion+" in champ[5] or champ[5] == u'inscription')) and date > datetime.date(config.ann_scol, 8, 16) : + if ((champ_action == u'inscription' or u"debutAdhesion+" in champ_action) or len(champ) > 5 and (u"debutAdhesion+" in champ[5] or champ[5] == u'inscription')) and date > datetime.date(config.ann_scol, 8, 16) : historique.append(champ) return historique @@ -77,7 +77,7 @@ def score_cableurs(): histo_action = historique[l][4] if histo_uid == uid and histo_action == u'inscription': inscriptions = inscriptions+1 - if histo_uid == uid and (u"debutConnexion+" in histo_action or (len(historique[l])>5 and (u'debutConnexion+' in historique[l][5]))): + if histo_uid == uid and (u"debutAdhesion+" in histo_action or (len(historique[l])>5 and (u'debutAdhesion+' in historique[l][5]))): reinscriptions = reinscriptions+1 score = 2*inscriptions + reinscriptions scores.append(["%s %s" % (prenom, nom), score, inscriptions, reinscriptions])