From eb579d40753c19bc4c6c74ca1a92badf01b3231b Mon Sep 17 00:00:00 2001 From: "nilovna.bascunan-vasquez" Date: Mon, 30 May 2011 15:25:37 -0400 Subject: [PATCH] =?utf8?q?1546:=20S=C3=A9lection=20des=20candidatures=20d'un?= =?utf8?q?=20appel=20et=20affectation=20d'un=20ou=20plusieurs=20=C3=A9valuat?= =?utf8?q?eurs=20=C3=A0=20ces=20candidatures.=20(Partie=201)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- project/recrutement/admin.py | 10 +++++++++- project/recrutement/models.py | 5 +++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/project/recrutement/admin.py b/project/recrutement/admin.py index b771e3c..39ebd59 100644 --- a/project/recrutement/admin.py +++ b/project/recrutement/admin.py @@ -16,6 +16,10 @@ class CandidatPieceInline(admin.TabularInline): model = CandidatPiece extra = 1 +class EvaluateurInline(admin.TabularInline): + model = Evaluateur.candidats.through + extra = 1 + class CandidatAdmin(admin.ModelAdmin): date_hierarchy = 'date_creation' list_display = ('nom', 'prenom', 'offre_emploi','statut', '_actions') @@ -38,6 +42,7 @@ class CandidatAdmin(admin.ModelAdmin): ) inlines = [ CandidatPieceInline, + EvaluateurInline, ] def queryset(self, request): @@ -69,7 +74,10 @@ class CandidatPieceAdmin(admin.ModelAdmin): return qs.select_related('candidat') class EvaluateurAdmin(admin.ModelAdmin): - pass + fieldsets = ( + (None, {'fields': ('nom', 'prenom')}), + (None, {'fields': ('candidats',)}), + ) class CandidatEvaluationAdmin(admin.ModelAdmin): pass diff --git a/project/recrutement/models.py b/project/recrutement/models.py index a8bb5fa..e0d2dec 100755 --- a/project/recrutement/models.py +++ b/project/recrutement/models.py @@ -113,6 +113,11 @@ class CandidatPiece(models.Model): class Evaluateur(models.Model): candidats = models.ManyToManyField(Candidat) + nom = models.CharField(max_length=255) + prenom = models.CharField(max_length=255) + + def __unicode__(self): + return '%s %s' % (self.prenom, self.nom) class CandidatEvaluation(models.Model): candidat = models.ForeignKey(Candidat, db_column='candidat', -- 1.7.10.4