Rapport des postes sans contrats: fixed les filtres

diff --git a/project/rh/templates/rh/rapports/employes_sans_contrat.html b/project/rh/templates/rh/rapports/employes_sans_contrat.html
index e7775cd..8374520 100644 (file)
--- a/project/rh/templates/rh/rapports/employes_sans_contrat.html
+++ b/project/rh/templates/rh/rapports/employes_sans_contrat.html
@@ -15,8 +15,8 @@
 
 <div id="changelist-filter">
 <h2>{% trans 'Filter' %}</h2>
-{% filter_region_contrat %}
-{% filter_implantation_contrat %}
+{% filter_region_dossier %}
+{% filter_implantation_dossier %}
 </div>
 
 <table id="result_list" class="results">

diff --git a/project/rh/templatetags/rapports.py b/project/rh/templatetags/rapports.py
index 69ba5ea..cc7f828 100644 (file)
--- a/project/rh/templatetags/rapports.py
+++ b/project/rh/templatetags/rapports.py
@@ -39,6 +39,16 @@ def filter_region_contrat(context):
     return {'title': u"région",
             'choices': prepare_choices(Region.objects.values_list('id', 'nom'), 'dossier__poste__implantation__region', context, remove=['pays', 'nord_sud'])}
 
+@register.inclusion_tag('admin/filter.html', takes_context=True)
+def filter_region_dossier(context):
+    return {'title': u"région",
+            'choices': prepare_choices(Region.objects.values_list('id', 'nom'), 'poste__implantation__region', context, remove=['pays', 'nord_sud'])}
+
+@register.inclusion_tag('admin/filter.html', takes_context=True)
+def filter_implantation_dossier(context):
+    return {'title': u"implantation",
+            'choices': prepare_choices(Implantation.objects.values_list('id', 'nom'), 'poste__implantation', context)}
+
 
 @register.inclusion_tag('admin/filter.html', takes_context=True)
 def filter_implantation_contrat(context):

diff --git a/project/rh/views.py b/project/rh/views.py
index 11ebd7e..a758164 100644 (file)
--- a/project/rh/views.py
+++ b/project/rh/views.py
@@ -322,9 +322,9 @@ def rapports_employe_sans_contrat(request):
         ("id", u"# de l'employé"),
         ("nom", u"Nom"),
         ("prenom", u"Prénom"),
-        ("", u"Dossiers"),
+        ("dossier", u"Dossiers"),
     ]
-    h = SortHeaders(request, headers, order_field_type="ot", order_field="o")
+    h = SortHeaders(request, headers, order_field_type="ot", order_field="o", not_sortable=('dossier',))
 
     c = {
         'title': u'Rapport des employés sans contrat',