pas de filtrage sur les DAE

diff --git a/project/dae/admin.py b/project/dae/admin.py
index 3ce5d21..e0e9578 100644 (file)
--- a/project/dae/admin.py
+++ b/project/dae/admin.py
@@ -99,6 +99,12 @@ class DossierStatutAdmin(VersionAdmin):
 
 class ImportAdmin(admin.ModelAdmin,):
 
+    list_filter = ('etat', )
+
+    def _etat(self, obj):
+        return obj.get_etat_display()
+
+
     def has_delete_permission(self, request, obj=None):
         return False
 
@@ -118,7 +124,7 @@ class ImportAdmin(admin.ModelAdmin,):
 
 
 class ImportDossierAdmin(ImportAdmin):
-    list_display = ('_poste', '_employe', '_dae', )
+    list_display = ('_poste', '_employe', '_dae', '_etat',)
     actions = ['importer_dans_RH', ]
 
     def _employe(self, obj):
@@ -169,7 +175,7 @@ class ImportPosteAdmin(ImportAdmin):
         return obj.implantation
 
     def _dae(self, obj):
-        url = reverse('poste_consulter', args=(obj.id, ))
+        url = reverse('poste_consulter', args=("dae-%s" % obj.id, ))
         return "<a href='%s'>voir le poste dans DAE</a>" % url
     _dae.allow_tags = True
 

diff --git a/project/dae/managers.py b/project/dae/managers.py
index dabe062..b9fd19a 100644 (file)
--- a/project/dae/managers.py
+++ b/project/dae/managers.py
@@ -61,7 +61,7 @@ class DossierFinaliseManager(models.Manager):
     def get_query_set(self):
         from dae.models import ImportDossier
         dae_importees = [str(i.dae_id) for i in ImportDossier.objects.all()]
-        qs = super(DossierFinaliseManager, self).get_query_set().filter(etat=DOSSIER_ETAT_FINALISE,)
+        qs = super(DossierFinaliseManager, self).get_query_set().all()
         if len(dae_importees) > 0:
             qs = qs.extra(where=['id NOT IN (%s)' % ", ".join(dae_importees)])
         return qs
@@ -75,7 +75,7 @@ class PosteFinaliseManager(models.Manager):
         from dae.models import ImportPoste
         dae_importees = [str(i.dae_id) for i in ImportPoste.objects.all()]
 
-        qs = super(PosteFinaliseManager, self).get_query_set().filter(etat=POSTE_ETAT_FINALISE,)
+        qs = super(PosteFinaliseManager, self).get_query_set().all()
         if len(dae_importees) > 0:
             qs = qs.extra(where=['id NOT IN (%s)' % ", ".join(dae_importees)])
         return qs