[#3168] empl sans contrat affichage

diff --git a/project/rh/templates/rh/rapports/employes_sans_contrat.html b/project/rh/templates/rh/rapports/employes_sans_contrat.html
index dd25878..27369b4 100644 (file)
--- a/project/rh/templates/rh/rapports/employes_sans_contrat.html
+++ b/project/rh/templates/rh/rapports/employes_sans_contrat.html
@@ -9,42 +9,44 @@
 
 {% block nomrapport %}Rapport Contrats{% endblock %}
 
-{% block count_elements %}<h2>{{ count }} contrats pour {{ count_employe }} employés</h2>{% endblock %}
+{% block count_elements %}
+<h2>{{ count }} employés sans contrat</h2>
+{% endblock %}
 
 {% block contentrapport %}
-
 <div id="changelist-filter">
-<h2>{% trans 'Filter' %}</h2>
-{% filter_region_contrat %}
-{% filter_implantation_contrat %}
+  <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>
+  <thead>
+    <tr>{% table_header headers %}</tr>
+  </thead>
+  <tbody>
+  {% spaceless %}
+    {% for c in employes.values %}
+    <tr class="{% cycle 'row1' 'row2' %}">
+      <td>{{ c.employe.id }}</td>
+      <td>{{ c.employe.nom|upper }}</td>
+      <td>{{ c.employe.prenom }}</td>
+      <td>
         {% if c.dossiers|length > 1 %}
-        <ul>
-            {% for d in c.dossiers %}
+          <ul>
+          {% for d in c.dossiers %}
             <li><a href="{% url admin:rh_dossier_change d.id %}">{{ d }}</a></li>
-            {% endfor %}
-        </ul>
+          {% endfor %}
+          </ul>
         {% else %}
-            {% for d in c.dossiers %}
-                <a href="{% url admin:rh_dossier_change d.id %}">{{ d }}</a>
-            {% endfor %}
+          {% for d in c.dossiers %}
+              <a href="{% url admin:rh_dossier_change d.id %}">{{ d }}</a>
+          {% endfor %}
         {% endif %}
-    </td>
-</tr>
-{% endfor %}{% endspaceless %}
+      </td>
+    </tr>
+    {% endfor %}
+  {% endspaceless %}
+  </tbody>
 </table>
-
 {% endblock %}

diff --git a/project/rh/urls.py b/project/rh/urls.py
index 64ea0b0..6e88324 100644 (file)
--- a/project/rh/urls.py
+++ b/project/rh/urls.py
@@ -6,7 +6,7 @@ urlpatterns = patterns(
     'project.rh.views',
     url(r'^admin/rh/rapports/postes$', 'rapports_poste', name='rhr_postes'),
     url(r'^admin/rh/rapports/employes_sans_contrats$',
-        'rapports_employe_sans_contrat', name='rhr_employe_sans_contrat'),
+        'rapports_employes_sans_contrat', name='rhr_employe_sans_contrat'),
     url(r'^admin/rh/rapports/contrats$', 'rapports_contrat',
         name='rhr_contrats'),
     url(r'^admin/rh/rapports/remuneration$', 'rapports_remuneration',

diff --git a/project/rh/views.py b/project/rh/views.py
index bd0b6db..e719233 100644 (file)
--- a/project/rh/views.py
+++ b/project/rh/views.py
@@ -439,8 +439,9 @@ def rapports_remuneration(request):
 
 @login_required
 @drh_or_admin_required
-def rapports_employe_sans_contrat(request):
+def rapports_employes_sans_contrat(request):
 
+    # tri : TODO fonctionne pas
     lookup_params = dict(request.GET.items())
     if 'ot' in lookup_params:
         del lookup_params['ot']
@@ -460,6 +461,7 @@ def rapports_employe_sans_contrat(request):
             ('-' if request.GET.get('ot') == "desc" else '') + request.GET['o']
         )
 
+    # données
     employes = {}
 
     dossiers_en_cours = rh.Dossier.objects.filter(
@@ -477,6 +479,7 @@ def rapports_employe_sans_contrat(request):
             }
         employes[c.dossier.employe.id]['dossiers'] += [c.dossier]
 
+    # affichage
     headers = [
         ("id", u"# de l'employé"),
         ("nom", u"Nom"),