Masse salariale: correction bug de filtre

diff --git a/project/rh/templates/rh/rapports/masse_salariale.html b/project/rh/templates/rh/rapports/masse_salariale.html
index 8910afd..38ff53a 100644 (file)
--- a/project/rh/templates/rh/rapports/masse_salariale.html
+++ b/project/rh/templates/rh/rapports/masse_salariale.html
@@ -9,10 +9,6 @@
 <script type="text/javascript" src="{{ STATIC_URL }}js/jquery-1.5.1.min.js"></script>
 <script type="text/javascript" src="{% admin_media_prefix %}js/jquery-stickytableheaders.js"></script>
 
-{% comment %} datepicker dates selections {% endcomment %}
-<script type="text/javascript" src="/admin/jsi18n"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}/admin/js/core.js"></script>
-{{ form.media }}
 {% include "admin/rh/annee_select.js" %}
 <style>
     #changelist .actions .filter {width: auto; float: left;}
@@ -22,21 +18,32 @@
 
 {% block contentrapport %}
 
-<div class="actions">
-
-    <div class="filter">{% filter_region "dossier__poste__" %}</div>
-    <div class="filter">{% filter_implantation "dossier__poste__" %}</div>
-    <div class="clear"></div>
-    {% comment %}
-    <label>Plage de dates:
-        {{ form.date_debut }} au {{ form.date_fin }}
-    </label>
-    {% endcomment %}
-    <label>Année
-        {{ form.date_debut }}
-    </label>
-  <a href="{{ request.url }}?{{ query_string }}" id="plage_date_rechercher" class="button">Rechercher</a>
-</div>
+<form method="GET">
+    <div class="actions">
+        <div class="filter">
+            <h3>Region</h3>
+            {{ form.region }}
+        </div>
+        <div class="filter">
+            <h3>Implantation</h3>
+            {{ form.implantation }}
+        </div>
+        <div class="filter">
+            <h3>Année</h3>
+            {{ form.date_debut }}
+        </div>
+        <div class="filter" style="margin-left:20px">
+            <h3>&nbsp;</h3>
+            <button type="submit" class="button" title="Exécuter l'action sélectionnée">Rechercher</button>
+        </div>
+        <div class="clear"></div>
+        {% comment %}
+        <label>Plage de dates:
+            {{ form.date_debut }} au {{ form.date_fin }}
+        </label>
+        {% endcomment %}
+    </div>
+</form>
 <div class="clear"></div>
 
 

diff --git a/project/rh/views.py b/project/rh/views.py
index d9e5577..97c3da2 100644 (file)
--- a/project/rh/views.py
+++ b/project/rh/views.py
@@ -214,6 +214,18 @@ def rapports_masse_salariale(request):
                     ))
                 )
 
+        region = forms.CharField(
+                widget=forms.Select(choices=[('', '')] +
+                    [(i.id, i) for i in ref.Region.objects.all()]
+                )
+            )
+
+        implantation = forms.CharField(
+                widget=forms.Select(choices=[('', '')] +
+                    [(i.id, i) for i in ref.Implantation.objects.all()]
+                )
+            )
+
         #date_debut = forms.DateField(widget=adminwidgets.AdminDateWidget)
         #date_fin = forms.DateField(widget=adminwidgets.AdminDateWidget)
 
@@ -229,8 +241,8 @@ def rapports_masse_salariale(request):
         date_debut = "01-01-%s" % request.GET.get('date_debut', None)
         date_fin = "31-12-%s" % request.GET.get('date_debut', None)
 
-    implantation = request.GET.get('dossier__poste__implantation')
-    region = request.GET.get('dossier__poste__implantation__region')
+    implantation = request.GET.get('implantation')
+    region = request.GET.get('region')
 
     custom_filter = {}
     if implantation: