Organigramme des employés: affichage des postes actifs seulement

diff --git a/project/rh/admin.py b/project/rh/admin.py
index 7462b98..0487e9a 100644 (file)
--- a/project/rh/admin.py
+++ b/project/rh/admin.py
@@ -593,7 +593,7 @@ class EmployeProxyAdmin(EmployeAdmin):
 
     def _organigramme(self, obj):
         l = []
 
     def _organigramme(self, obj):
         l = []

-        for d in obj.rh_dossiers.all().order_by('-date_debut'):
+        for d in rh.Dossier.objects.filter((Q(date_fin__gt=datetime.date.today()) | Q(date_fin=None)) & (Q(date_debut__lt=datetime.date.today()) | Q(date_debut=None)) ).filter(employe=obj.id).all():

             poste = u"""<a title="Aperçu du poste"
                            href="%s"
                            onclick="return showAddAnotherPopup(this);"
             poste = u"""<a title="Aperçu du poste"
                            href="%s"
                            onclick="return showAddAnotherPopup(this);"