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

Merge remote-tracking branch 'origin/master' into nanterre-recette

This commit is contained in:
Thomas NOËL 2018-02-02 18:09:12 +01:00
parent bf52ff175b b1bbc814f9
commit 6958bfc3f8
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
zoo/zoo_nanterre/utils.py
View File

@ -290,12 +290,20 @@ class PersonSearch(object):
after = datetime.date(int(birthdate['year']), 1, 1)
before = datetime.date(int(birthdate['year']), 12, 31)
if window_days:
after -= datetime.timedelta(days=window_days)
before += datetime.timedelta(days=window_days)
first_january_same_year = None
if before == after:
first_january_same_year = before.replace(month=1, day=1)
if window_days:
after -= datetime.timedelta(days=window_days)
before += datetime.timedelta(days=window_days)
query = Q(content__date_de_naissance__timestamp__gte=after)
query &= Q(content__date_de_naissance__timestamp__lte=before)
# always look for entities before 1903-01-01
query |= Q(content__date_de_naissance__timestamp__lte=datetime.date(1903, 1, 1))
# if search is exact look for first january of the same year
if first_january_same_year:
query |= Q(content__date_de_naissance__timestamp=first_january_same_year)
self.add_filter('birthdate', query)
return self