Petites amliorations d'affichage.
darcs-hash:20040907093248-41617-6c7d1abb697c44c126a68bed14ecff4b3970b828.gz
This commit is contained in:
parent
51d023c6c4
commit
41fda80ee0
1 changed files with 13 additions and 11 deletions
|
@ -282,34 +282,36 @@ def adher_details(adher) :
|
|||
|
||||
# Telephone
|
||||
tel = adher.tel()
|
||||
try :
|
||||
tel = u'%s %s %s %s %s' % ( tel[:2], tel[2:4], tel[4:6], tel[6:8], tel[8:] )
|
||||
except :
|
||||
None
|
||||
f += coul(u'Numéro de téléphone : ','gras') + "%s\n" % tel.ljust(12)
|
||||
if tel != 'inconnu' :
|
||||
try :
|
||||
tel = u'%s %s %s %s %s' % ( tel[:2], tel[2:4], tel[4:6], tel[6:8], tel[8:] )
|
||||
except :
|
||||
pass
|
||||
f += coul(u'Numéro de téléphone : ','gras') + "%s\n" % tel.ljust(12)
|
||||
|
||||
# Adresse
|
||||
chbre = adher.chbre()
|
||||
if chbre == 'EXT' :
|
||||
# Adhérent extérieur
|
||||
f += coul(u'Adresse : ','gras')
|
||||
addr = adher.adresse()
|
||||
f += addr[0] + u'\n'
|
||||
if addr[1] != ' ' : f += u' ' + addr[1] + u'\n'
|
||||
f+= u' ' + addr[2] + u' ' + addr[3]
|
||||
if addr[0] :
|
||||
f += coul(u'Adresse : ','gras')
|
||||
f += addr[0] + u'\n'
|
||||
if addr[1] != ' ' : f += u' ' + addr[1] + u'\n'
|
||||
f+= u' ' + addr[2] + u' ' + addr[3] + '\n'
|
||||
else :
|
||||
# Chambre + prise (d'après annuaire)
|
||||
f += coul(u'Chambre : ','gras') + u"%s " % chbre
|
||||
prise = adher.prise()
|
||||
if prise :
|
||||
f += u'(prise %s)' % prise
|
||||
f += '\n'
|
||||
f += '\n'
|
||||
|
||||
# Etudes
|
||||
if adher.etudes(1).isdigit() :
|
||||
f += coul(u'Etudes : ','gras')+ "%s %s%s\n" % \
|
||||
( adher.etudes(0), adher.etudes(1), adher.etudes(2) )
|
||||
else :
|
||||
elif adher.etudes(0) :
|
||||
f += coul(u'Etudes : ','gras')+ "%s %s %s\n" % \
|
||||
( adher.etudes(0), adher.etudes(1), adher.etudes(2) )
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue