whos: correction d'affichage de l'état d'un club
This commit is contained in:
parent
dda8e116d6
commit
dc08f78d87
1 changed files with 7 additions and 5 deletions
|
@ -339,13 +339,15 @@ def clubs_brief(clubs) :
|
||||||
ook = u'\x1b[1;32mO\x1b[1;0m'
|
ook = u'\x1b[1;32mO\x1b[1;0m'
|
||||||
nok = u'\x1b[1;31mn\x1b[1;0m'
|
nok = u'\x1b[1;31mn\x1b[1;0m'
|
||||||
# Paiement
|
# Paiement
|
||||||
if ann_scol in c.paiement():
|
if c.paiement_ok():
|
||||||
if 'p' in c.controle(): paid = ook
|
# TODO
|
||||||
else: paid = ok
|
#if 'p' in c.controle(): paid = ook
|
||||||
|
#else: paid = ok
|
||||||
|
paid = ok
|
||||||
else : paid = nok
|
else : paid = nok
|
||||||
|
|
||||||
# Précablage
|
# Précablage
|
||||||
if ann_scol+1 in c.paiement() : paid = coul(paid,'f_vert')
|
# TODO
|
||||||
|
|
||||||
machines = ''
|
machines = ''
|
||||||
# Récupération des machines
|
# Récupération des machines
|
||||||
|
@ -927,7 +929,7 @@ def club_details(club) :
|
||||||
# État administratif
|
# État administratif
|
||||||
f += coul(u'État administratif : ','gras')
|
f += coul(u'État administratif : ','gras')
|
||||||
jour = True
|
jour = True
|
||||||
if club.adhesion() < time() and not club.paiement():
|
if club.adhesion() < time() and ann_scol not in club.paiement():
|
||||||
jour = False
|
jour = False
|
||||||
f += coul(u"Non adhérent." ,'violet')
|
f += coul(u"Non adhérent." ,'violet')
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue