Rapport employés sans contrat, ajout des filtres

diff --git a/project/rh/templates/rh/rapports/employes_sans_contrat.html b/project/rh/templates/rh/rapports/employes_sans_contrat.html
index fa1ae86..e7775cd 100644 (file)
--- a/project/rh/templates/rh/rapports/employes_sans_contrat.html
+++ b/project/rh/templates/rh/rapports/employes_sans_contrat.html
@@ -32,7 +32,7 @@
     <td>{{ c.employe.prenom }}</td>
     <td>
         {% for d in c.dossiers %}
-        {{ d }}
+            <a href="{% url admin:rh_dossier_change d.id %}">{{ d }}</a>
         {% endfor %}
     </td>
 </tr>

diff --git a/project/rh/views.py b/project/rh/views.py
index 31a7dc4..11ebd7e 100644 (file)
--- a/project/rh/views.py
+++ b/project/rh/views.py
@@ -310,16 +310,18 @@ def rapports_employe_sans_contrat(request):
 
     employes = []
     for e in employes_query.all():
-        dossiers = e.rh_dossiers.filter(Q(date_fin=None) | Q(date_fin__gt=date.today())).all()
+        dossiers = rh.Dossier.objects.filter(employe=e). \
+                filter(Q(date_fin=None) | Q(date_fin__gt=date.today())). \
+                filter(**lookup_params).all()
         for d in dossiers:
             contrats = rh.Contrat.objects.filter(Q(dossier=d) & Q(date_fin__lt=date.today())).all()
             if contrats:
                 employes.append({'employe': e, 'dossiers': dossiers})
 
     headers = [
-        ("dossier__employe__id", u"# de l'employé"),
-        ("dossier__employe__nom", u"Nom"),
-        ("dossier__employe__prenom", u"Prénom"),
+        ("id", u"# de l'employé"),
+        ("nom", u"Nom"),
+        ("prenom", u"Prénom"),
         ("", u"Dossiers"),
     ]
     h = SortHeaders(request, headers, order_field_type="ot", order_field="o")