ergo UI : uniformiastion colonnes des changelists

[auf_rh_dae.git] / project / rh / templates / rh / rapports / employes_sans_contrat.html

diff --git a/project/rh/templates/rh/rapports/employes_sans_contrat.html b/project/rh/templates/rh/rapports/employes_sans_contrat.html
index 43aae60..ea5c28d 100644 (file)
--- a/project/rh/templates/rh/rapports/employes_sans_contrat.html
+++ b/project/rh/templates/rh/rapports/employes_sans_contrat.html
@@ -2,15 +2,16 @@
 {% load adminmedia rapports i18n change_list %}
 
 {% block extrastyle %}
-<script type="text/javascript" src="/admin/jsi18n"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}/admin/js/core.js"></script>
-{{ block.super }}
+  <script type="text/javascript" src="/admin/jsi18n"></script>
+  <script type="text/javascript" src="{{ STATIC_URL }}/admin/js/core.js"></script>
+  <script type="text/javascript" src="{{ STATIC_URL }}admin/js/admin/RelatedObjectLookups.js"></script>
+  {{ block.super }}
 {% endblock %}
 
 {% block nomrapport %}Rapport Contrats{% endblock %}
 
 {% block count_elements %}
-<h2>{{ employes.count }} employés sans contrat</h2>
+<h2>{{ employes }} employés sans contrat ou contrat échu</h2>
 {% endblock %}
 
 {% block contentrapport %}
@@ -25,35 +26,22 @@
     <tr>{% table_header headers %}</tr>
   </thead>
   <tbody>
-  {% spaceless %}
-    {% for e in employes %}
+  {% spaceless %}   
+    {% for d in dossiers %}
     <tr class="{% cycle 'row1' 'row2' %}">
-      <td>{{ e.id }}</td>
-      <td>{{ e.nom|upper }} {{ e.prenom }}</td>
+      <td style="text-align:right">{{ d.employe.id }}</td>
+      <td>{{ d.employe.nom|upper }} {{ d.employe.prenom }}</td>
+      <td>{% include 'rh/include/rapports_dossier_poste.html' %}</td>
       <td>
-        {% for d in e.rh_dossiers.all %}
-          {% if d in dossiers_sans_contrat %}
-            <a href="{% url admin:rh_dossier_change d.id %}">Dossier</a> : {{ d.poste.nom }}
-            {% if not forloop.last %}<br />{% endif %}
-          {% endif %}
-        {% endfor %}
-      </td>
-      <td>
-        {% for d in e.rh_dossiers.all %}
-          {% if d in dossiers_sans_contrat %}
-            {{ d.date_debut|default_if_none:"" }}
-            {% if not forloop.last %}<br />{% endif %}
-          {% endif %}
-        {% endfor %}
-      </td>
-      <td>
-        {% for d in e.rh_dossiers.all %}
-          {% if d in dossiers_sans_contrat %}
-            {{ d.date_fin|default_if_none:"" }}
-            {% if not forloop.last %}<br />{% endif %}
-          {% endif %}
-        {% endfor %}
+        {% with d.dernier_contrat as contrat %}
+          {% include 'rh/include/rapports_contrat.html' %}
+        {% endwith %}
       </td>
+      <td>{{ d.dernier_contrat.date_debut|default_if_none:"" }}</td>
+      <td>{{ d.dernier_contrat.date_fin|default_if_none:"" }}</td>
+      <td>{{ d.get_statut_residence_display }}</td>
+      <td>{{ d.poste.implantation.region.code }}</td>
+      <td>{{ d.poste.implantation.nom }}</td>
     </tr>
     {% endfor %}
   {% endspaceless %}