type remun #1542

[auf_rh_dae.git] / project / rh / lib.py

diff --git a/project/rh/lib.py b/project/rh/lib.py
index fc351c8..ff72388 100644 (file)
--- a/project/rh/lib.py
+++ b/project/rh/lib.py
@@ -104,7 +104,7 @@ class AyantDroitAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
     L'ajout d'un nouvel ayantdroit se fait dans l'admin de l'employé.
     """
     search_fields = ('nom', 'prenom', 'employe__nom', 'employe__prenom', )
-    list_display = ('_ayantdroit', '_employe', )
+    list_display = ('_employe', 'lien_parente', '_ayantdroit', )
     inlines = (AyantDroitCommentaireInline,)
     readonly_fields = AUFMetadataAdminMixin.readonly_fields + ('employe',)
     fieldsets = AUFMetadataAdminMixin.fieldsets + (
@@ -150,7 +150,12 @@ class CommentaireAdmin(admin.ModelAdmin):
 
 
 class ContratAdmin(admin.ModelAdmin):
-    pass
+    search_fields = ('dossier__employe__nom', 'dossier__employe__prenom', )
+    list_display = ('id', 'dossier', '_poste', )
+
+    def _poste(self, obj):
+        return obj.dossier.poste
+    _poste.short_description = "Poste"
 
 
 class DeviseAdmin(admin.ModelAdmin):
@@ -253,6 +258,7 @@ class FamilleEmploiAdmin(admin.ModelAdmin):
 
 
 class OrganismeBstgAdmin(admin.ModelAdmin):
+    list_display = ('nom', 'type', 'pays', )
     inlines = (DossierROInline,)
 
 
@@ -333,18 +339,21 @@ class StatutAdmin(admin.ModelAdmin):
 
 
 class TauxChangeAdmin(admin.ModelAdmin):
-    pass
-
+    list_display = ('taux', 'devise', 'annee', )
+    list_filter = ('devise', )
 
 class TypeContratAdmin(admin.ModelAdmin):
     inlines = (ContratInline,)
 
 
 class TypePosteAdmin(admin.ModelAdmin):
+    list_display = ('nom', 'famille_emploi', )
+    list_filter = ('famille_emploi', )
     inlines = (PosteInline,)
 
 
 class TypeRemunerationAdmin(admin.ModelAdmin):
+    list_display = ('nom', 'type_paiement', 'nature_remuneration', )
     inlines = (RemunerationROInline,)