twaerk admin

diff --git a/project/dae/admin.py b/project/dae/admin.py
index e602046..e6c19cf 100644 (file)
--- a/project/dae/admin.py
+++ b/project/dae/admin.py
@@ -61,8 +61,9 @@ class StatutForm(forms.ModelForm):
         obj = super(StatutForm, self).save(*args, **kwargs)
         self.wf.content_object = obj
         self.wf.etat_final = obj.etat
-        commentaire = u"%s => %s : %s" % (self.wf.etat_initial,
-                self.wf.etat_final,
+        commentaire = u"%s => %s : %s" % (
+                self.wf.get_etat_label(self.wf.etat_initial),
+                self.wf.get_etat_label(self.wf.etat_final),
                 self.data['commentaire'])
         self.wf.texte = commentaire
         self.wf.save()
@@ -103,11 +104,13 @@ class StatutAdmin(VersionAdmin):
 
     def _etat(self, obj):
         return obj.get_etat_display()
-
+    _etat.short_description = "État"
+    _etat.admin_order_field = "etat"
 
 class DossierStatutAdmin(StatutAdmin):
     search_fields = ('employe__nom', 'employe__prenom', 'poste__nom', )
     list_display = ('_poste', '_implantation', 'employe', '_etat', )
+    list_filter = ('poste__implantation', )
     form = StatutDossierForm
 
     def _poste(self, obj):
@@ -115,11 +118,13 @@ class DossierStatutAdmin(StatutAdmin):
 
     def _implantation(self, obj):
         return obj.poste.implantation
-
+    _implantation.short_description = u"Implantation"
+    _implantation.admin_order_field = "poste__implantation"
 
 class PosteStatutAdmin(StatutAdmin):
     search_fields = ('nom', )
-    list_display = ('nom', 'implantation', '_etat', )
+    list_display = ('nom', 'implantation', )
+    list_filter = ('implantation', 'etat', )
     form = StatutPosteForm
 
 
@@ -127,6 +132,8 @@ class ImportAdmin(admin.ModelAdmin,):
 
     def _etat(self, obj):
         return obj.get_etat_display()
+    _etat.short_description = u"État"
+    _etat.admin_order_field = "etat"
 
     def has_delete_permission(self, request, obj=None):
         return False
@@ -148,7 +155,7 @@ class ImportAdmin(admin.ModelAdmin,):
 
 class ImportDossierAdmin(ImportAdmin):
     search_fields = ('employe__nom', 'employe__prenom', 'poste__nom', )
-    list_display = ('_poste', '_implantation', '_employe', '_dae',)
+    list_display = ('_poste', '_implantation', '_employe', '_dae', '_etat')
     list_filter = ('poste__implantation', 'etat', )
     actions = ['importer_dans_RH', ]
 
@@ -168,6 +175,8 @@ class ImportDossierAdmin(ImportAdmin):
 
     def _implantation(self, obj):
         return obj.poste.implantation
+    _implantation.short_description = u"Implantation"
+    _implantation.admin_order_field = "poste__implantation"
 
     def _dae(self, obj):
         url = reverse('embauche_consulter', args=(obj.id, ))
@@ -200,6 +209,8 @@ class ImportPosteAdmin(ImportAdmin):
 
     def _implantation(self, obj):
         return obj.implantation
+    _implantation.short_description = u"Implantation"
+    _implantation.admin_order_field = "implantation"
 
     def _dae(self, obj):
         url = reverse('poste_consulter', args=("dae-%s" % obj.id, ))