[#3228] Ajouté une colonne "Statut de résidence" au rapport des contrats

diff --git a/project/rh/templates/rh/rapports/contrats.html b/project/rh/templates/rh/rapports/contrats.html
index 8a5ca42..1b61199 100644 (file)
--- a/project/rh/templates/rh/rapports/contrats.html
+++ b/project/rh/templates/rh/rapports/contrats.html
@@ -2,6 +2,11 @@
 {% load adminmedia rapports i18n change_list %}
 
 {% block extrastyle %}
+{{ block.super }}
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}/css/admin_custom.css">
+{% endblock %}
+
+{% block extrahead %}
 <script type="text/javascript" src="/admin/jsi18n"></script>
 <script type="text/javascript" src="{{ STATIC_URL }}/admin/js/core.js"></script>
 {{ block.super }}
@@ -48,6 +53,7 @@
             {{ contrat.type_contrat.nom }}
         {% endif %}
     </td>
+    <td>{{ contrat.dossier.get_statut_residence_display }}</td>
     <td>{{ contrat.date_debut }}</td>
     <td>{{ contrat.date_fin|default:'' }}</td>
 </tr>

diff --git a/project/rh/views.py b/project/rh/views.py
index 0f0cf1a..bd0b6db 100644 (file)
--- a/project/rh/views.py
+++ b/project/rh/views.py
@@ -176,13 +176,13 @@ def rapports_poste(request):
 @drh_or_admin_required
 def rapports_contrat(request):
     if 'HTTP_REFERER' in request.META.keys():
-                referer = request.META['HTTP_REFERER']
-                referer = "/".join(referer.split('/')[3:])
-                referer = "/%s" % referer.split('?')[0]
-                if referer != reverse('rhr_contrats'):
-                    params = request.GET.copy()
-                    params.update({'statut': 'Actif'})
-                    request.GET = params
+        referer = request.META['HTTP_REFERER']
+        referer = "/".join(referer.split('/')[3:])
+        referer = "/%s" % referer.split('?')[0]
+        if referer != reverse('rhr_contrats'):
+            params = request.GET.copy()
+            params.update({'statut': 'Actif'})
+            request.GET = params
 
     lookup_params = dict(request.GET.items())
     if 'ot' in lookup_params:
@@ -222,6 +222,7 @@ def rapports_contrat(request):
         ("dossier__poste__implantation__region", u"Région"),
         ("dossier__poste__implantation", u"Implantation"),
         ("type_contrat__nom", u"Type de contrat"),
+        ("dossier__statut_residence", u"Statut de résidence"),
         ("date_debut", u"Date début"),
         ("date_fin", u"Date fin"),
     ]