X-Git-Url: http://git.auf.org/?p=auf_rh_dae.git;a=blobdiff_plain;f=project%2Frh%2Ftemplates%2Frh%2Frapports%2Femployes_sans_contrat.html;h=ea5c28d363e9df6b5d3b85744629c8d995932024;hp=d7b9c2d9227be49412f78139b9894a6defb7d606;hb=5db1c5a33e2be5560cc30b2af36256088bcbabd4;hpb=7c5645f014b5b7d660eec3c10526e5ec54989431

diff --git a/project/rh/templates/rh/rapports/employes_sans_contrat.html b/project/rh/templates/rh/rapports/employes_sans_contrat.html
index d7b9c2d..ea5c28d 100644
--- a/project/rh/templates/rh/rapports/employes_sans_contrat.html
+++ b/project/rh/templates/rh/rapports/employes_sans_contrat.html
@@ -2,49 +2,50 @@
 {% 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>{{ count }} contrats pour {{ count_employe }} employés</h2>{% endblock %}
+{% block count_elements %}
+<h2>{{ employes }} employés sans contrat ou contrat échu</h2>
+{% endblock %}
 
 {% block contentrapport %}
-
 <div id="changelist-filter">
-<h2>{% trans 'Filter' %}</h2>
-{% filter_region_dossier %}
-{% filter_implantation_dossier %}
+  <h2>{% trans 'Filter' %}</h2>
+  {% filter_region_contrat %}
+  {% filter_implantation_contrat %}
 </div>
 
 <table id="result_list" class="results">
-<thead>
-<tr>
-    {% table_header headers %}
-</tr>
-</thead>
-{% spaceless %}{% for c in employes.values %}
-<tr class="{% cycle 'row1' 'row2' %}">
-    <td>{{ c.employe.id }}</td>
-    <td>{{ c.employe.nom }}</td>
-    <td>{{ c.employe.prenom }}</td>
-    <td>
-        {% if c.dossiers|length > 1 %}
-        <ul>
-            {% for d in c.dossiers %}
-            <li><a href="{% url admin:rh_dossier_change d.id %}">{{ d }}</a></li>
-            {% endfor %}
-        </ul>
-        {% else %}
-            {% for d in c.dossiers %}
-                <a href="{% url admin:rh_dossier_change d.id %}">{{ d }}</a>
-            {% endfor %}
-        {% endif %}
-    </td>
-</tr>
-{% endfor %}{% endspaceless %}
+  <thead>
+    <tr>{% table_header headers %}</tr>
+  </thead>
+  <tbody>
+  {% spaceless %}   
+    {% for d in dossiers %}
+    <tr class="{% cycle 'row1' 'row2' %}">
+      <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>
+        {% 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 %}
+  </tbody>
 </table>
 
 {% endblock %}