Nom des pages ajouter et listing des employes par unicode

diff --git a/project/rh/admin.py b/project/rh/admin.py
index 97eb355..6e02721 100644 (file)
--- a/project/rh/admin.py
+++ b/project/rh/admin.py
@@ -366,10 +366,10 @@ class DossierAdmin(DateRangeMixin, AUFMetadataAdminMixin, ProtectRegionMixin, ad
 
         style = ""
         view = u"""<a href="%s" title="Aperçu l'employé" onclick="return showAddAnotherPopup(this);"><img src="%simg/loupe.png" /></a>""" % (view_link, settings.STATIC_URL,)
-        return u"""%s<a href='%s' style="%s;">[%s] %s %s</a>""" % \
-        (view, edit_link, style, employe.id, employe.nom.upper(), employe.prenom.title())
+        return u"""%s<a href='%s' style="%s;">%s</a>""" % \
+        (view, edit_link, style, employe)
     _employe.allow_tags = True
-    _employe.short_description = u"Employé ([code] NOM Prénom)"
+    _employe.short_description = u"Employé (NOM Prénom [code])"
     _employe.admin_order_field = "employe__nom"
    
     def save_formset(self, request, form, formset, change):
@@ -424,10 +424,10 @@ class EmployeAdmin(DateRangeMixin, AUFMetadataAdminMixin, ProtectRegionMixin, ad
 
     def _nom(self, obj):
         edit_link = reverse('admin:rh_employe_change', args=(obj.id,))
-        return u"""<a href='%s'><strong>[%s] %s %s</strong></a>""" % \
-        (edit_link, obj.id, obj.nom.upper(), obj.prenom.title(),)
+        return u"""<a href='%s'><strong>%s</strong></a>""" % \
+        (edit_link, obj)
     _nom.allow_tags = True
-    _nom.short_description = u"Employé ([code] NOM Prénom)"
+    _nom.short_description = u"Employé (NOM Prénom [code])"
     _nom.admin_order_field = "nom"
 
     def _dossiers(self, obj):

diff --git a/project/rh/templates/admin/rh/dossier/change_form.html b/project/rh/templates/admin/rh/dossier/change_form.html
index 84908ac..222e7c8 100644 (file)
--- a/project/rh/templates/admin/rh/dossier/change_form.html
+++ b/project/rh/templates/admin/rh/dossier/change_form.html
@@ -3,6 +3,6 @@
   {% if original.pk %}
     <h1>{{ original }}</h1>
   {% else %}
-    <h1>Ajout Employé</h1>
+    <h1>Ajout dossier</h1>
   {% endif %}
 {% endblock %}

diff --git a/project/rh/templates/admin/rh/employe/change_form.html b/project/rh/templates/admin/rh/employe/change_form.html
index 84908ac..a6d0c4b 100644 (file)
--- a/project/rh/templates/admin/rh/employe/change_form.html
+++ b/project/rh/templates/admin/rh/employe/change_form.html
@@ -3,6 +3,6 @@
   {% if original.pk %}
     <h1>{{ original }}</h1>
   {% else %}
-    <h1>Ajout Employé</h1>
+    <h1>Ajout employé</h1>
   {% endif %}
 {% endblock %}

diff --git a/project/rh/templates/admin/rh/poste/change_form.html b/project/rh/templates/admin/rh/poste/change_form.html
index 84908ac..779e8d3 100644 (file)
--- a/project/rh/templates/admin/rh/poste/change_form.html
+++ b/project/rh/templates/admin/rh/poste/change_form.html
@@ -3,6 +3,6 @@
   {% if original.pk %}
     <h1>{{ original }}</h1>
   {% else %}
-    <h1>Ajout Employé</h1>
+    <h1>Ajout poste</h1>
   {% endif %}
 {% endblock %}