petites modifs modeles et admin

diff --git a/project/rh/admin.py b/project/rh/admin.py
index 4dab53f..2d8a912 100644 (file)
--- a/project/rh/admin.py
+++ b/project/rh/admin.py
@@ -67,8 +67,16 @@ class AyantDroitCommentaireAdmin(admin.ModelAdmin):
     pass
 
 class DossierAdmin(admin.ModelAdmin):
-    pass
-
+    list_display = ('_employe', '_poste')
+    
+    def _poste(self, dossier):
+        return unicode(dossier.poste.nom)
+    _poste.short_description = u'Poste'
+        
+    def _employe(self, dossier):
+        return unicode(dossier.employe)
+    _employe.short_description = u'Employé'
+    
 class DossierPieceAdmin(admin.ModelAdmin):
     pass
 

diff --git a/project/rh/models.py b/project/rh/models.py
index 1ca4265..501cf03 100644 (file)
--- a/project/rh/models.py
+++ b/project/rh/models.py
@@ -296,7 +296,7 @@ class Employe(Metadata):
                             null=True, blank=True)
 
     class Meta:
-        ordering = ['nom_affichage','nom']
+        ordering = ['nom_affichage','nom','prenom']
         
     def __unicode__(self):
         # TODO : gérer nom d'affichage
@@ -440,10 +440,10 @@ class Dossier_(Metadata):
     
     class Meta:
         abstract = True
-        ordering = ['poste__nom', 'employe__nom_affichage']
+        ordering = ['employe__nom_affichage', 'employe__nom', 'poste__nom']
         
     def __unicode__(self):
-        return u'%s - %s' % (self.poste.nom, self.employe)
+        return u'%s - %s' % (self.employe, self.poste.nom)
 
 
 class Dossier(Dossier_):