fix regresssion actif

diff --git a/project/rh/managers.py b/project/rh/managers.py
index f432041..48736fc 100644 (file)
--- a/project/rh/managers.py
+++ b/project/rh/managers.py
@@ -152,6 +152,8 @@ class PosteManager(SecurityManager):
     def ma_region_ou_service(self, user):
         return super(PosteManager, self).ma_region_ou_service(user)
 
+    def actifs(self, *args, **kwargs):
+        return self.get_query_set().actifs(*args, **kwargs)
 
 class DossierQuerySet(ActifsQuerySet):
     pass
@@ -165,6 +167,9 @@ class DossierManager(SecurityManager):
         return DossierQuerySet(self.model) \
                 .select_related('poste', 'employe')
 
+    def actifs(self, *args, **kwargs):
+        return self.get_query_set().actifs(*args, **kwargs)
+
     def sans_contrats_ou_echus(self, *args, **kwargs):
         app = self.model._meta.app_label
         sql = """

diff --git a/project/rh/test/rapport.py b/project/rh/test/rapport.py
index ab14bcb..2e5a4ba 100644 (file)
--- a/project/rh/test/rapport.py
+++ b/project/rh/test/rapport.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+import datetime
 from django.core.urlresolvers import reverse
 from project.rh.test.common import RhTest
 from project.rh import models as rh
@@ -143,8 +144,47 @@ class RapportMasseSalarialeTest(RhTest):
     """
     url = reverse('rhr_masse_salariale')
 
+    today = datetime.date.today()
+    annee_moins_2 = datetime.date(today.year - 2, 1, 1)
+    annee_moins_1 = datetime.date(today.year - 1, 1, 1)
+    annee_plus_2 = datetime.date(today.year + 2, 1, 1)
+    annee_plus_1 = datetime.date(today.year + 1, 1, 1)
+
+
     def setUp(self):
         super(RapportMasseSalarialeTest, self).setUp()
+        # 2 dossiers actifs
+        self.dossier_cnf_ngaoundere.date_debut = self.annee_moins_1
+        self.dossier_cnf_ngaoundere.date_fin = self.annee_plus_1
+        self.dossier_cnf_ngaoundere.save()
+
+        self.dossier_cnf_bangui.date_debut = self.annee_moins_1
+        self.dossier_cnf_bangui.date_fin = self.annee_plus_1
+        self.dossier_cnf_bangui.save()
+
+        # 1 dossier inactif
+        self.dossier_bap_bureau.date_debut = self.annee_moins_2
+        self.dossier_bap_bureau.date_fin = self.annee_moins_1
+        self.dossier_bap_bureau.save()
+
+        # 1 dossier futur
+        self.dossier_bap_ifi.date_debut = self.annee_plus_1
+        self.dossier_bap_ifi.date_fin = self.annee_plus_2
+        self.dossier_bap_ifi.save()
+
+    def test_filtrage(self):
+        """
+        Test la page avec des paramètres de filtrage.
+        """
+        self._test_drh()
+        self._test_acces_ok(self.url)
+        params = {'implantation': self.IMPLANTATION_ACGL_CNF_NGAOUNDERE.id,
+                'region': self.REGION_ACGL.id,
+                'annee': self.today.year,
+                }
+        resp = self.client.get(self.url, params)
+        self.assertEqual(resp.context['form'].is_valid(), True)
+        self.assertEqual(resp.status_code, 200)
 
     def test_anonyme(self):
         """
@@ -183,7 +223,6 @@ class RapportMasseSalarialeTest(RhTest):
         """
         self._test_drh()
         self._test_acces_ok(self.url)
-        # todo TEST rapport
 
     def test_drh2(self):
         """