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-06 12:22:41 +01:00
parent 6958bfc3f8 fddf9193ea
commit bfe3f6f889
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zoo/zoo_nanterre/api_views.py
View File

@ -179,7 +179,7 @@ class SearchView(APIView):
email = request.GET.get('email', '').strip()
name_id = request.GET.get('NameID')
if prenom or nom:
search = search.search_name(prenom, nom)
search = search.search_name(u'%s %s' % (prenom, nom))
if date_de_naissance and search.match_birthdate(date_de_naissance):
search = search.search_birthdate(date_de_naissance)
if cle:

8
zoo/zoo_nanterre/duplicates.py
View File

@ -58,13 +58,9 @@ def find_duplicates(limit=None, base_limit=None, queryset=None, days=None, count
# search for duplicate based on the name
s = search.copy()
if first.content['nom_de_naissance']:
s = search.search_name(
first_name=first.content['prenoms'],
last_name=first.content['nom_de_naissance'])
s = search.search_name(u'%s %s' % (first.content['prenoms'], first.content['nom_de_naissance']))
if first.content['nom_d_usage']:
s = s.search_name(
first_name=first.content['prenoms'],
last_name=first.content['nom_d_usage'])
s = s.search_name(u'%s %s' % (first.content['prenoms'], first.content['nom_d_usage']))
if first.content.get('date_de_naissance'):
s = s.search_birthdate(
datetime.datetime.strptime(

6
zoo/zoo_nanterre/templates/zoo_nanterre/search.html
View File

@ -27,15 +27,15 @@
<div id="id_results">
{% for individu in results %}
<div class="individu individu-{{ individu.content.statut_legal }}-{{ individu.content.genre }}">
<span class="individu-score">{% widthratio individu.similarity 1.0 100 %} %</span>
{{forloop.counter}} <span class="individu-score">{% widthratio individu.similarity 1.0 100 %} %</span>
<span class="individu-prenoms">{{ individu.content.prenoms|title }}</span>
{% if individu.content.nom_d_usage %}
{% if individu.content.nom_de_naissance %}
<span class="individu-nom">{{ individu.content.nom_d_usage|upper }}</span>
{% if individu.content.nom_de_naissance and individu.content.nom_d_usage != individu.content.nom_de_naissance %}
<span class="individu-nom_de_naissance">(né{% if individu.content.genre == "femme" %}e{% endif %} {{ individu.content.nom_de_naissance}})</span>
{% endif %}
{% else %}
<span class="individu-nom">{{ individu.content.nom_d_usage|upper }}</span>
<span class="individu-nom">{{ individu.content.nom_de_naissance|upper }}</span>
{% endif %}
-
<span class="individu-age">{{ individu.age_label }}</span>