rapport contrats

diff --git a/project/rh/templates/rh/rapports/contrats.html b/project/rh/templates/rh/rapports/contrats.html
index 881c5b8..8a5ca42 100644 (file)
--- a/project/rh/templates/rh/rapports/contrats.html
+++ b/project/rh/templates/rh/rapports/contrats.html
@@ -34,13 +34,22 @@
 </thead>
 {% spaceless %}{% for contrat in contrats %}
 <tr class="{% cycle 'row1' 'row2' %}">
-    <td style="text-align:right"><a href="{% url admin:rh_employe_change contrat.dossier.employe.id %}">{{ contrat.dossier.employe.id }}</a></td>
-    <td><a href="{% url admin:rh_employe_change contrat.dossier.employe.id %}">{{ contrat.dossier.employe.nom|upper }}</a></td>
-    <td><a href="{% url admin:rh_employe_change contrat.dossier.employe.id %}">{{ contrat.dossier.employe.prenom }}</a></td>
-    <td><a href="{% url admin:rh_poste_change contrat.dossier.poste.id %}">{{ contrat.dossier.poste }}</a></td>
-       <td>{{ contrat.type_contrat.nom }}</td>
-       <td>{{ contrat.date_debut }}</td>
-       <td>{{ contrat.date_fin|default:'' }}</td>
+    <td style="text-align:right"><a href="{% url employe_apercu contrat.dossier.employe.id %}">{{ contrat.dossier.employe.id }}</a></td>
+    <td><a href="{% url admin:rh_employe_change contrat.dossier.employe.id %}">
+            {{ contrat.dossier.employe.nom|upper }}
+            {{contrat.dossier.employe.prenom|title }}</a></td>
+    <td><a href="{% url admin:rh_poste_change contrat.dossier.poste.id %}">{{ contrat.dossier.poste.nom }}</a></td>
+    <td>{{ contrat.dossier.poste.implantation.region }}</td>
+    <td>{{ contrat.dossier.poste.implantation }}</td>
+    <td>
+        {% if contrat.fichier %}
+        <a href="{{ contrat.fichier.url }}">{{ contrat.type_contrat.nom }}</a>
+        {% else %}
+            {{ contrat.type_contrat.nom }}
+        {% endif %}
+    </td>
+    <td>{{ contrat.date_debut }}</td>
+    <td>{{ contrat.date_fin|default:'' }}</td>
 </tr>
 {% endfor %}{% endspaceless %}
 </table>

diff --git a/project/rh/templatetags/rapports.py b/project/rh/templatetags/rapports.py
index 465cb93..a7e1f70 100644 (file)
--- a/project/rh/templatetags/rapports.py
+++ b/project/rh/templatetags/rapports.py
@@ -76,7 +76,6 @@ def filter_echeance_contrat(context):
     return {'title': u"échéance",
             'choices': prepare_choices_date(field_name, context, links=(
                 ('Tous', {}),
-                ('échus', {'%s__lt' % field_name: today.strftime('%Y-%m-%d'),}),
                 ('moins de 3 mois', {'%s__gte' % field_name: today.strftime('%Y-%m-%d'),
                                     '%s__lte' % field_name: three_months.strftime('%Y-%m-%d')}),
                 ('3 à 6 mois', {'%s__gte' % field_name: three_months.strftime('%Y-%m-%d'),

diff --git a/project/rh/views.py b/project/rh/views.py
index 28b3ecf..2c0a71a 100644 (file)
--- a/project/rh/views.py
+++ b/project/rh/views.py
@@ -178,9 +178,10 @@ def rapports_contrat(request):
 
     headers = [
         ("dossier__employe__id", u"# de l'employé"),
-        ("dossier__employe__nom", u"Nom"),
-        ("dossier__employe__prenom", u"Prénom"),
+        ("dossier__employe__nom", u"Employé"),
         ("type_contrat__nom", u"Poste"),
+        ("dossier__poste__implantation__region", u"Région"),
+        ("dossier__poste__implantation", u"Implantation"),
         ("type_contrat__nom", u"Type de contrat"),
         ("date_debut", u"Date début"),
         ("date_fin", u"Date fin"),