Formattage de la date_modifciation dans le listing

diff --git a/project/rh/admin.py b/project/rh/admin.py
index 9ef8b18..68fdbc5 100644 (file)
--- a/project/rh/admin.py
+++ b/project/rh/admin.py
@@ -236,7 +236,7 @@ class PosteComparaisonInline(AUFMetadataInlineAdminMixin, admin.TabularInline):
 
 
 class ClassementAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
-    list_display = ('_classement', 'date_modification', 'user_modification', )
+    list_display = ('_classement', '_date_modification', 'user_modification', )
     fieldsets = AUFMetadataAdminMixin.fieldsets + (
         (None, {
             'fields': ('type', 'echelon', 'degre', 'coefficient',  )
@@ -247,18 +247,27 @@ class ClassementAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
         return unicode(obj)
     _classement.short_description = u"Classement"
 
+    def _date_modification(self, obj):
+        return date(obj.date_modification) if obj.date_modification is not None else "(aucune)"
+    _date_modification.short_description = u'date modification'
+    _date_modification.admin_order_field = 'date_modification'
+
 class CommentaireAdmin(admin.ModelAdmin):
     pass
 
 
 class DeviseAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
-    list_display = ('code', 'nom', 'date_modification', 'user_modification', )
+    list_display = ('code', 'nom', '_date_modification', 'user_modification', )
     fieldsets = AUFMetadataAdminMixin.fieldsets + (
         (None, {
             'fields': ('code', 'nom', ),
         }),
     )
 
+    def _date_modification(self, obj):
+        return date(obj.date_modification) if obj.date_modification is not None else "(aucune)"
+    _date_modification.short_description = u'date modification'
+    _date_modification.admin_order_field = 'date_modification'
 
 class DossierAdmin(DateRangeMixin, AUFMetadataAdminMixin, ProtectRegionMixin, admin.ModelAdmin, AjaxSelect,):
     alphabet_filter = 'employe__nom'
@@ -269,7 +278,7 @@ class DossierAdmin(DateRangeMixin, AUFMetadataAdminMixin, ProtectRegionMixin, ad
         '_employe',
         '_date_debut',
         '_date_fin',
-        'date_modification',
+        '_date_modification',
         'user_modification',
     )
     list_filter = (
@@ -347,6 +356,12 @@ class DossierAdmin(DateRangeMixin, AUFMetadataAdminMixin, ProtectRegionMixin, ad
     _date_fin.short_description = u'Occupation fin'
     _date_fin.admin_order_field = 'date_fin'
 
+
+    def _date_modification(self, obj):
+        return date(obj.date_modification) if obj.date_modification is not None else "(aucune)"
+    _date_modification.short_description = u'date modification'
+    _date_modification.admin_order_field = 'date_modification'
+
     def _poste(self, dossier):
         link = u"""<a title="Aperçu du poste" onclick="return showAddAnotherPopup(this);" href='%s'><img src="%simg/loupe.png" /></a> <a href="%s" title="Modifier le poste">%s</a>""" % \
                 (reverse('poste_apercu', args=(dossier.poste.id,)),
@@ -395,7 +410,7 @@ class EmployeAdmin(DateRangeMixin, AUFMetadataAdminMixin, ProtectRegionMixin, ad
     search_fields = ('id', 'nom', 'prenom', 'nom_affichage', )
     ordering = ('nom', )
     form = EmployeAdminForm
-    list_display = ('_apercu', '_nom', '_dossiers', 'date_modification',  'user_modification', )
+    list_display = ('_apercu', '_nom', '_dossiers', '_date_modification',  'user_modification', )
     list_filter = ('rh_dossiers__poste__implantation__region',  'rh_dossiers__poste__implantation', 'nb_postes', 'rh_dossiers__date_debut', 'rh_dossiers__date_fin')
     date_borne_gauche = 'rh_dossiers__date_debut'
     date_borne_droite = 'rh_dossiers__date_fin'
@@ -430,6 +445,11 @@ class EmployeAdmin(DateRangeMixin, AUFMetadataAdminMixin, ProtectRegionMixin, ad
     _nom.short_description = u"Employé (NOM Prénom [code])"
     _nom.admin_order_field = "nom"
 
+    def _date_modification(self, obj):
+        return date(obj.date_modification) if obj.date_modification is not None else "(aucune)"
+    _date_modification.short_description = u'date modification'
+    _date_modification.admin_order_field = 'date_modification'
+
     def _dossiers(self, obj):
         l = []
         for d in obj.rh_dossiers.all().order_by('-date_debut'):
@@ -477,7 +497,7 @@ class EmployePieceAdmin(admin.ModelAdmin):
 
 
 class FamilleEmploiAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
-    list_display = ('nom', 'date_modification', 'user_modification', )
+    list_display = ('nom', '_date_modification', 'user_modification', )
     inlines = (TypePosteInline,)
     fieldsets = AUFMetadataAdminMixin.fieldsets + ( 
         (None, {
@@ -485,10 +505,14 @@ class FamilleEmploiAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
         }),
         )
 
+    def _date_modification(self, obj):
+        return date(obj.date_modification) if obj.date_modification is not None else "(aucune)"
+    _date_modification.short_description = u'date modification'
+    _date_modification.admin_order_field = 'date_modification'
 
 class OrganismeBstgAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
     search_fields = ('nom',)
-    list_display = ('nom', 'type', 'pays', 'date_modification', 'user_modification', )
+    list_display = ('nom', 'type', 'pays', '_date_modification', 'user_modification', )
     list_filter = ('type', )
     inlines = (DossierROInline,)
     fieldsets = AUFMetadataAdminMixin.fieldsets + ( 
@@ -497,6 +521,11 @@ class OrganismeBstgAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
         }),
         )
 
+    def _date_modification(self, obj):
+        return date(obj.date_modification) if obj.date_modification is not None else "(aucune)"
+    _date_modification.short_description = u'date modification'
+    _date_modification.admin_order_field = 'date_modification'
+
 
 class PosteAdmin(DateRangeMixin, AUFMetadataAdminMixin, ProtectRegionMixin, admin.ModelAdmin, AjaxSelect,):
     form =  make_ajax_form(rh.Poste, {
@@ -523,7 +552,7 @@ class PosteAdmin(DateRangeMixin, AUFMetadataAdminMixin, ProtectRegionMixin, admi
         '_service', 
         'date_debut', 
         'date_fin',
-        'date_modification',
+        '_date_modification',
         'user_modification',
         )
     list_filter = (
@@ -614,6 +643,11 @@ class PosteAdmin(DateRangeMixin, AUFMetadataAdminMixin, ProtectRegionMixin, admi
     _nom.short_description = u'Nom'
     _nom.admin_order_field = 'nom'
 
+    def _date_modification(self, obj):
+        return date(obj.date_modification)
+    _date_modification.short_description = u'date modification'
+    _date_modification.admin_order_field = 'date_modification'
+
     def _occupe_par(self, obj):
         """Formatte la méthode Poste.occupe_par() pour l'admin"""
         output = u"Vacant"
@@ -670,23 +704,34 @@ class ResponsableImplantationAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
     
 
 class ServiceAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
-    list_display = ('nom', 'date_modification', 'user_modification', )
+    list_display = ('nom', '_date_modification', 'user_modification', )
     fieldsets = AUFMetadataAdminMixin.fieldsets + ( 
         (None, {
             'fields': ('nom', ),
         }),
         )
 
+    def _date_modification(self, obj):
+        return date(obj.date_modification) if obj.date_modification is not None else "(aucune)"
+    _date_modification.short_description = u'date modification'
+    _date_modification.admin_order_field = 'date_modification'
+
+
 class StatutAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
-    list_display = ('code', 'nom', 'date_modification', 'user_modification', )
+    list_display = ('code', 'nom', '_date_modification', 'user_modification', )
     fieldsets = AUFMetadataAdminMixin.fieldsets + ( 
         (None, {
             'fields': ('code', 'nom', ),
         }),
         )
 
+    def _date_modification(self, obj):
+        return date(obj.date_modification) if obj.date_modification is not None else "(aucune)"
+    _date_modification.short_description = u'date modification'
+    _date_modification.admin_order_field = 'date_modification'
+
 class TauxChangeAdmin(admin.ModelAdmin):
-    list_display = ('taux', 'devise', 'annee', 'date_modification', 'user_modification', )
+    list_display = ('taux', 'devise', 'annee', '_date_modification', 'user_modification', )
     list_filter = ('devise', )
     fieldsets = AUFMetadataAdminMixin.fieldsets + ( 
         (None, {
@@ -694,18 +739,28 @@ class TauxChangeAdmin(admin.ModelAdmin):
         }),
         )
 
+    def _date_modification(self, obj):
+        return date(obj.date_modification) if obj.date_modification is not None else "(aucune)"
+    _date_modification.short_description = u'date modification'
+    _date_modification.admin_order_field = 'date_modification'
+
 class TypeContratAdmin(admin.ModelAdmin):
-    list_display = ('nom', 'nom_long', 'date_modification', 'user_modification', )
+    list_display = ('nom', 'nom_long', '_date_modification', 'user_modification', )
     fieldsets = AUFMetadataAdminMixin.fieldsets + ( 
         (None, {
             'fields': ('nom', 'nom_long', ),
         }),
         )
 
+    def _date_modification(self, obj):
+        return date(obj.date_modification) if obj.date_modification is not None else "(aucune)"
+    _date_modification.short_description = u'date modification'
+    _date_modification.admin_order_field = 'date_modification'
+
 
 class TypePosteAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
     search_fields = ('nom', 'nom_feminin', )
-    list_display = ('nom', 'famille_emploi', 'date_modification', 'user_modification', )
+    list_display = ('nom', 'famille_emploi', '_date_modification', 'user_modification', )
     list_filter = ('famille_emploi', )
     fieldsets = AUFMetadataAdminMixin.fieldsets + ( 
         (None, {
@@ -713,27 +768,42 @@ class TypePosteAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
         }),
         )
 
+    def _date_modification(self, obj):
+        return date(obj.date_modification) if obj.date_modification is not None else "(aucune)"
+    _date_modification.short_description = u'date modification'
+    _date_modification.admin_order_field = 'date_modification'
+
 
 class TypeRemunerationAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
-    list_display = ('nom', 'type_paiement', 'nature_remuneration', 'date_modification', 'user_modification', )
+    list_display = ('nom', 'type_paiement', 'nature_remuneration', '_date_modification', 'user_modification', )
     fieldsets = AUFMetadataAdminMixin.fieldsets + ( 
         (None, {
             'fields': ('nom', 'type_paiement', 'nature_remuneration', )
         }),
         )
 
+    def _date_modification(self, obj):
+        return date(obj.date_modification) if obj.date_modification is not None else "(aucune)"
+    _date_modification.short_description = u'date modification'
+    _date_modification.admin_order_field = 'date_modification'
+
 
 class TypeRevalorisationAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
-    list_display = ('nom', 'date_modification', 'user_modification', )
+    list_display = ('nom', '_date_modification', 'user_modification', )
     fieldsets = AUFMetadataAdminMixin.fieldsets + ( 
         (None, {
             'fields': ('nom', )
         }),
         )
 
+    def _date_modification(self, obj):
+        return date(obj.date_modification) if obj.date_modification is not None else "(aucune)"
+    _date_modification.short_description = u'date modification'
+    _date_modification.admin_order_field = 'date_modification'
+
 
 class ValeurPointAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
-    list_display = ('_devise_code', '_devise_nom', 'annee', 'valeur',  'date_modification', 'user_modification', )
+    list_display = ('_devise_code', '_devise_nom', 'annee', 'valeur',  '_date_modification', 'user_modification', )
     list_filter = ('annee', 'devise', )
     fieldsets = AUFMetadataAdminMixin.fieldsets + ( 
         (None, {
@@ -741,6 +811,11 @@ class ValeurPointAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
         }),
         )
 
+    def _date_modification(self, obj):
+        return date(obj.date_modification) if obj.date_modification is not None else "(aucune)"
+    _date_modification.short_description = u'date modification'
+    _date_modification.admin_order_field = 'date_modification'
+
     def _devise_code(self, obj):
         return obj.devise.code
     _devise_code.short_description = "Code de la devise"