nanterre: reorder text value in individu_to_response (#15681)

This commit is contained in:
Thomas NOËL 2017-03-31 13:55:06 +02:00 committed by Benjamin Dauvergne
parent 89bf3ff99e
commit c07efd8465
1 changed files with 9 additions and 7 deletions

View File

@ -56,13 +56,15 @@ def individu_to_response(individu, add_text=False):
d['union'] = individu_to_response(individu.union)
d['union_statut'] = individu.union_statut
if add_text:
date_de_naissance = '/'.join(
reversed(isodate.parse_date(d['date_de_naissance']).isoformat().split('-')))
d['text'] = u'{} {} - {} {}'.format(
d['prenoms'], d['nom_d_usage'] or d['nom_de_naissance'],
date_de_naissance, d['genre'])
if d.get('email'):
d['text'] += ' - ' + d['email']
d['text'] = d['nom_de_naissance'] + ' '
if d.get('nom_d_usage'):
d['text'] += '(' + d['nom_d_usage'] + ') '
d['text'] += d['prenoms']
date = isodate.parse_date(d['date_de_naissance'])
d['text'] += ' - %02d/%02d/%04d - ' % (date.day, date.month, date.year)
d['text'] += d['genre']
if d.get('statut_legal'):
d['text'] += '/' + d['statut_legal']
return d