From 64721a83581d3f9fb65ea51a7fe434eb8b2d4ce9 Mon Sep 17 00:00:00 2001 From: PA Parent Date: Tue, 6 Dec 2011 15:43:24 -0500 Subject: [PATCH] =?utf8?q?Dossiers=20et=20Employ=C3=A9s=20inactifs=20s=C3=A9?= =?utf8?q?par=C3=A9s?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- buildout.cfg | 2 +- project/dashboard.py | 4 ++++ project/rh/admin.py | 2 ++ project/rh/lib.py | 23 +++++++++++++++++++---- project/rh/models.py | 16 ++++++++++++++++ 5 files changed, 42 insertions(+), 5 deletions(-) diff --git a/buildout.cfg b/buildout.cfg index a79b2bf..9788a97 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -49,7 +49,7 @@ django = 1.2.5 south = 0.7 auf.django.skin = 0.15dev auf.django.auth = 0.5.5dev -auf.django.metadata = 0.2dev +auf.django.metadata = 0.3dev django-reversion = 1.3.3 auf.django.workflow = 0.14dev django-ajax-selects = 1.1.4 diff --git a/project/dashboard.py b/project/dashboard.py index 6f9bc0a..70a860c 100644 --- a/project/dashboard.py +++ b/project/dashboard.py @@ -34,7 +34,9 @@ class CustomIndexDashboard(Dashboard): 'project.recrutement.models.*', 'project.rh.models.AyantDroit', 'project.rh.models.Dossier', + 'project.rh.models.DossierInactif', 'project.rh.models.Employe', + 'project.rh.models.EmployeInactif', 'project.rh.models.Poste', ), )) @@ -113,7 +115,9 @@ class CustomAppIndexDashboard(AppIndexDashboard): models=( 'project.rh.models.AyantDroit', 'project.rh.models.Dossier', + 'project.rh.models.DossierInactif', 'project.rh.models.Employe', + 'project.rh.models.EmployeInactif', 'project.rh.models.Poste', ), )) diff --git a/project/rh/admin.py b/project/rh/admin.py index 174dd98..b7d941d 100644 --- a/project/rh/admin.py +++ b/project/rh/admin.py @@ -27,9 +27,11 @@ admin.site.register(Classement, ClassementAdmin) #admin.site.register(Contrat, ContratAdmin) admin.site.register(Devise, DeviseAdmin) admin.site.register(Dossier, DossierAdmin) +admin.site.register(DossierInactif, DossierInactifAdmin) #admin.site.register(DossierCommentaire, DossierCommentaireAdmin) #admin.site.register(DossierPiece, DossierPieceAdmin) admin.site.register(Employe, EmployeAdmin) +admin.site.register(EmployeInactif, EmployeInactifAdmin) #admin.site.register(EmployeCommentaire, EmployeCommentaireAdmin) #admin.site.register(EmployePiece, EmployePieceAdmin) #admin.site.register(Evenement, EvenementAdmin) diff --git a/project/rh/lib.py b/project/rh/lib.py index 9cb2e14..2208e79 100644 --- a/project/rh/lib.py +++ b/project/rh/lib.py @@ -267,6 +267,9 @@ class DossierAdmin(AUFMetadataAdminMixin, ProtectRegionMixin, admin.ModelAdmin,) add_form_template = 'admin/change_form.html' + def queryset(self, request): + return self.model.actifs.all() + class Media: js = ('js/dossier.js',) @@ -325,6 +328,11 @@ class DossierAdmin(AUFMetadataAdminMixin, ProtectRegionMixin, admin.ModelAdmin,) return super(DossierAdmin, self).render_change_form(request, context, *args, **kwargs) +class DossierInactifAdmin(DossierAdmin): + def queryset(self, request): + return self.model.inactifs.all() + + class DossierPieceAdmin(admin.ModelAdmin): pass @@ -335,17 +343,16 @@ class DossierCommentaireAdmin(admin.ModelAdmin): class EmployeAdmin(AUFMetadataAdminMixin, ProtectRegionMixin, admin.ModelAdmin): alphabet_filter = 'nom' - search_fields = ('id', 'nom', 'prenom', 'nom_affichage', 'actif', ) - list_filter = ('actif', ) + search_fields = ('id', 'nom', 'prenom', 'nom_affichage', ) ordering = ('nom', ) actions = ('desactiver', ) - list_display = ('id', 'nom', 'prenom', 'actif', ) + list_display = ('id', 'nom', 'prenom', ) list_display_links = ('id', 'nom',) inlines = (AyantDroitInline, DossierROInline, EmployePieceInline, EmployeCommentaireInline) - fieldsets = AUFMetadataAdminMixin.fieldsets + ( + fieldsets = AUFMetadataAdminMixin.fieldsets + ( ('Identification', { 'fields': (('nom', 'prenom'), ('nom_affichage', 'genre'), 'nationalite', 'date_naissance', ) }), @@ -359,6 +366,9 @@ class EmployeAdmin(AUFMetadataAdminMixin, ProtectRegionMixin, admin.ModelAdmin): add_form_template = 'admin/change_form.html' + def queryset(self, request): + return self.model.actifs.all() + def save_formset(self, request, form, formset, change): instances = formset.save(commit=False) for instance in instances: @@ -401,6 +411,11 @@ class EmployeAdmin(AUFMetadataAdminMixin, ProtectRegionMixin, admin.ModelAdmin): return super(EmployeAdmin, self).render_change_form(request, context, *args, **kwargs) +class EmployeInactifAdmin(EmployeAdmin): + def queryset(self, request): + return self.model.inactifs.all() + + class EmployeCommentaireAdmin(admin.ModelAdmin): pass diff --git a/project/rh/models.py b/project/rh/models.py index 0ba887d..18003e2 100644 --- a/project/rh/models.py +++ b/project/rh/models.py @@ -416,6 +416,14 @@ class Employe(AUFMetadata): return regions +class EmployeInactif(Employe): + class Meta: + proxy = True + ordering = ['nom_affichage','nom','prenom'] + verbose_name = u"Employé inactif" + verbose_name_plural = u"Employés inactifs" + + class EmployePiece(models.Model): """Documents relatifs à un employé. Ex.: CV... @@ -604,6 +612,14 @@ class Dossier(Dossier_): __doc__ = Dossier_.__doc__ +class DossierInactif(Dossier): + class Meta: + proxy = True + ordering = ['employe__nom', ] + verbose_name = u"Dossier inactif" + verbose_name_plural = u"Dossiers inactifs" + + class DossierPiece(models.Model): """Documents relatifs au Dossier (à l'occupation de ce poste par employé). Ex.: Lettre de motivation. -- 1.7.10.4