admin contrat

diff --git a/project/rh/lib.py b/project/rh/lib.py
index 1d7098b..dbd9e6b 100644 (file)
--- a/project/rh/lib.py
+++ b/project/rh/lib.py
@@ -152,7 +152,7 @@ class CommentaireAdmin(admin.ModelAdmin):
 class ContratAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
     alphabet_filter = 'dossier__employe__nom'
     search_fields = ('dossier__employe__nom', 'dossier__employe__prenom', 'dossier__poste__nom', 'dossier__poste__nom_feminin', )
 class ContratAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
     alphabet_filter = 'dossier__employe__nom'
     search_fields = ('dossier__employe__nom', 'dossier__employe__prenom', 'dossier__poste__nom', 'dossier__poste__nom_feminin', )

-    list_display = ('id', 'dossier', '_poste', )
+    list_display = ('id', '_employe', '_poste', 'date_debut', 'date_fin', '_implantation', )

     fieldsets = AUFMetadataAdminMixin.fieldsets + (
         (None, {
             'fields': ('dossier', 'type_contrat', 'date_debut', 'date_fin', )
     fieldsets = AUFMetadataAdminMixin.fieldsets + (
         (None, {
             'fields': ('dossier', 'type_contrat', 'date_debut', 'date_fin', )

@@ -163,10 +163,17 @@ class ContratAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
         if key in ('dossier__employe__nom__istartswith',  ):
             return True
 
         if key in ('dossier__employe__nom__istartswith',  ):
             return True
 

+    def _employe(self, obj):
+        return unicode(obj.dossier.employe)
+    _employe.short_description = "Employé"
+

     def _poste(self, obj):
     def _poste(self, obj):

-        return obj.dossier.poste
+        return obj.dossier.poste.nom

     _poste.short_description = "Poste"
 
     _poste.short_description = "Poste"
 

+    def _implantation(self, obj):
+        return obj.dossier.poste.implantation
+    _poste.short_description = "Implantation"

 
 class DeviseAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
     fieldsets = AUFMetadataAdminMixin.fieldsets + (
 
 class DeviseAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
     fieldsets = AUFMetadataAdminMixin.fieldsets + (