crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[whos] Moar précision.

Browse source
This commit is contained in:
Pierre-Elliott Bécue 2014-08-20 14:41:47 +02:00
parent 9872e0bcf0
commit e30d94bf18
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gestion/whos.py
View file

@ -517,9 +517,11 @@ def adher_details(adher) :
jour = False jour = False
if ann_scol not in adher.paiement() and (adher.adhesion() <= time()): if ann_scol not in adher.paiement() and (adher.adhesion() <= time()):
if not jour: f += ' et ' if not jour: f += ' et '
else: f += coul(u"non adhérent actuellement",'violet')
f += coul(u"Non adhérent actuellement.",'violet')
jour = False jour = False
if not adher.paiement_ok():
if not jour: f += ' et '
f += coul(u"pas d'accès Internet", "violet")
if jour: if jour:
f += coul(u"à jour",'vert') f += coul(u"à jour",'vert')
@ -587,7 +589,7 @@ def adher_details(adher) :
f += coul(u"Adhésion jusqu'au %s" % strftime("%d/%m/%Y %H:%M:%S", localtime(adher.adhesion())), "vert") f += coul(u"Adhésion jusqu'au %s" % strftime("%d/%m/%Y %H:%M:%S", localtime(adher.adhesion())), "vert")
f += u"\n" f += u"\n"
elif adher.paiement(): elif adher.paiement():
f += coul(u"Paiement pour %s/%s ok (connexion inclue)" % (ann_scol, ann_scol+1), "vert") f += coul(u"Paiement pour %s/%s ok (connexion incluse)" % (ann_scol, ann_scol+1), "vert")
f += u"\n" f += u"\n"
# Paiement # Paiement
@ -830,7 +832,7 @@ def club_details(club) :
# Adhésion # Adhésion
if club.adhesion() > time(): if club.adhesion() > time():
f += coul(u"Adhésion jusque %s." % (strftime("%d/%m/%Y %H:%M:%S", localtime(club.adhesion())),), "vert") f += coul(u"Adhésion jusque %s (connexion incluse)." % (strftime("%d/%m/%Y %H:%M:%S", localtime(club.adhesion())),), "vert")
f += '\n' f += '\n'
elif ann_scol in club.paiement(): elif ann_scol in club.paiement():
f += coul(u"Adhésion pour l'année en cours", "vert") f += coul(u"Adhésion pour l'année en cours", "vert")