rapports fixes

diff --git a/project/rh/lib.py b/project/rh/lib.py
index 80be156..b5203c2 100644 (file)
--- a/project/rh/lib.py
+++ b/project/rh/lib.py
@@ -1,3 +1,6 @@
+import datetime
+from django.db.models import Q
+from collections import defaultdict
 
 def calc_remun(dossier):
         thisyear = datetime.date.today().year

diff --git a/project/rh/templates/rh/rapports/remuneration.html b/project/rh/templates/rh/rapports/remuneration.html
index e34e6ae..3ad5e08 100644 (file)
--- a/project/rh/templates/rh/rapports/remuneration.html
+++ b/project/rh/templates/rh/rapports/remuneration.html
@@ -19,7 +19,7 @@
 </thead>
 {% spaceless %}{% for employe in employes %}
 <tr class="{% cycle 'row1' 'row2' %}">
-    <td style="text-align:right"><a href="{% url admin:rh_employe_change emploey.id %}">{{ employe.id }}</a></td>
+    <td style="text-align:right"><a href="{% url admin:rh_employe_change employe.id %}">{{ employe.id }}</a></td>
     <td><a href="{% url admin:rh_employe_change employe.id %}">{{ employe.nom|upper }}</td></a>
     <td><a href="{% url admin:rh_employe_change employe.id %}">{{ employe.prenom }}</a></td>
        <td align="right">{{ employe.Traitement|default:0|floatformat:2 }} &euro;</td>

diff --git a/project/rh/views.py b/project/rh/views.py
index 6cb9016..d00a28d 100644 (file)
--- a/project/rh/views.py
+++ b/project/rh/views.py
@@ -68,8 +68,6 @@ def employes_liste(request):
     """Liste des employés."""
     today = date.today()
     employes = rh.Employe.objects   \
-                    .filter(actif=True, supprime=False)   \
-                    .filter(dossiers__actif=True, dossiers__supprime=False) \
                     .exclude(dossiers__date_debut__gt=today) \
                     .exclude(dossiers__date_fin__lt=today) \
                     .order_by('nom')
@@ -117,15 +115,14 @@ def rapports_poste(request):
             comble = value
             del lookup_params[key]
 
-    #postes = rh.Poste.actifs.select_related('implantation', 'dossier').all()
-    postes = rh.Poste.actifs.select_related('implantation') \
-            .extra(select={'employe_id':'select group_concat(employe separator "|") from rh_dossier where poste=rh_poste.id and rh_dossier.actif = 1 and rh_dossier.date_fin is null %s' % \
+    postes = rh.Poste.objects.select_related('implantation') \
+            .extra(select={'employe_id':'select group_concat(employe separator "|") from rh_dossier where poste=rh_poste.id  and rh_dossier.date_fin is null %s' % \
                 ("%s" % (('order by employe %s' % ('asc' if 'ot' in request.GET and request.GET['ot'] == "asc" else "desc"))) if 'o' in request.GET and request.GET['o'] == "employe_id" else "") \
             }) \
-            .extra(select={'employe_nom':'select group_concat(rh_employe.nom separator "|") from rh_dossier inner join rh_employe on rh_dossier.employe = rh_employe.id where poste=rh_poste.id and rh_dossier.actif = 1 and rh_dossier.date_fin is  null %s' % \
+            .extra(select={'employe_nom':'select group_concat(rh_employe.nom separator "|") from rh_dossier inner join rh_employe on rh_dossier.employe = rh_employe.id where poste=rh_poste.id and rh_dossier.date_fin is  null %s' % \
                 ("%s" % (('order by rh_employe.nom %s' % ('asc' if 'ot' in request.GET and request.GET['ot'] == "asc" else "desc"))) if 'o' in request.GET and request.GET['o'] == "employe_nom" else "") \
             }) \
-            .extra(select={'employe_prenom':'select group_concat(rh_employe.prenom separator "|") from rh_dossier inner join rh_employe on rh_dossier.employe = rh_employe.id where poste=rh_poste.id and rh_dossier.actif = 1 and rh_dossier.date_fin is null %s' % \
+            .extra(select={'employe_prenom':'select group_concat(rh_employe.prenom separator "|") from rh_dossier inner join rh_employe on rh_dossier.employe = rh_employe.id where poste=rh_poste.id and rh_dossier.date_fin is null %s' % \
                 ("%s" % (('order by rh_employe.prenom %s' % ('asc' if 'ot' in request.GET and request.GET['ot'] == "asc" else "desc"))) if 'o' in request.GET and request.GET['o'] == "employe_prenom" else "") \
             })