[#3188] genre dans apercu employé

diff --git a/project/rh/templates/rh/include/employe.html b/project/rh/templates/rh/include/employe.html
index cee91db..3c1131c 100644 (file)
--- a/project/rh/templates/rh/include/employe.html
+++ b/project/rh/templates/rh/include/employe.html
@@ -3,6 +3,7 @@
     {% include "rh/form-row.html" with label="Nom" value=employe.nom %}
     {% include "rh/form-row.html" with label="Prénom" value=employe.prenom %}
     {% include "rh/form-row.html" with label="Nom d'affichage" value=employe.nom_affichage|default:"" %}
+    {% include "rh/form-row.html" with label="Genre" value=employe.get_genre_display %}
     {% include "rh/form-row.html" with label="Nationalité" value=employe.nationalite %}
     {% include "rh/form-row.html" with label="Date de naissance" value=employe.date_naissance %}
     {% include "rh/form-row.html" with label="Situation familiale" value=employe.situation_famille.nom %}
@@ -24,7 +25,7 @@
 <fieldset class="module aligned">
     <h2>Ayants droit</h2>
     {% for ay in employe.ayantdroits.all %}
-        {% include "rh/form-row.html" with label=ay value=ay.lien_parente %}
+        {% include "rh/form-row.html" with label=ay value=ay.lien_parente|default_if_none:"Lien de parenté inconnu" %}
     {% endfor %}
 </fieldset>
 

diff --git a/project/rh/urls.py b/project/rh/urls.py
index c1eec7d..d4bfdf5 100644 (file)
--- a/project/rh/urls.py
+++ b/project/rh/urls.py
@@ -3,6 +3,7 @@
 from django.conf.urls.defaults import patterns, url
 
 urlpatterns = patterns('project.rh.views',
+    # rapports
     url(r'^admin/rh/rapports/employes_sans_contrats$',
         'rapports_employes_sans_contrat', name='rhr_employe_sans_contrat'),
     url(r'^admin/rh/rapports/contrats$', 'rapports_contrat',