entrouvert
/
zoo
17
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' into nanterre-recette

This commit is contained in:
Thomas NOËL 2018-02-08 11:40:08 +01:00
parent bfe3f6f889 177a31b659
commit cac348eb79
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test_nanterre_synchronize_federations.py
View File

@ -23,7 +23,7 @@ def test_synchronize_federations(settings, app, nanterre_classic_family, admin):
response = response.click(u'Synchroniser les fédérations')
response = response.click(u'Nouvel import')
response.form.set('app_id', 'technocarte')
content = '\n'.join(map(str, [f['kevin'].id + 1000, f['marie'].id + 1000, '1222']))
content = '\n'.join(map(str, [f['kevin'].id + 1000, f['marie'].id + 1000, '99999']))
response.form.set('csv_uploaded', Upload('federations.csv', content, 'application/octet-stream'))
response = response.form.submit().follow()
assert len(response.pyquery('table#result-list tbody tr')) == 1

4
zoo/zoo_nanterre/utils.py
View File

@ -279,10 +279,10 @@ class PersonSearch(object):
year += 1900
else:
year += 2000
if len(birthdate) == 3:
if birthdate['day']:
before = after = datetime.date(
int(birthdate['year']), int(birthdate['month']), int(birthdate['day']))
elif len(birthdate) == 2:
elif birthdate['month']:
after = datetime.date(int(birthdate['year']), int(birthdate['month']), 1)
before = ((after + datetime.timedelta(days=31)).replace(day=1)
- datetime.timedelta(days=1))