1546: Sélection des candidatures d'un appel et affectation d'un ou plusieurs évaluate...

diff --git a/project/recrutement/admin.py b/project/recrutement/admin.py
index b771e3c..39ebd59 100644 (file)
--- a/project/recrutement/admin.py
+++ b/project/recrutement/admin.py
@@ -16,6 +16,10 @@ class CandidatPieceInline(admin.TabularInline):
     model = CandidatPiece
     extra = 1
 
     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')
 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,
     )
     inlines = [
         CandidatPieceInline,

+        EvaluateurInline,

     ]
 
     def queryset(self, request):
     ]
 
     def queryset(self, request):

@@ -69,7 +74,10 @@ class CandidatPieceAdmin(admin.ModelAdmin):
         return qs.select_related('candidat')
 
 class EvaluateurAdmin(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
 
 class CandidatEvaluationAdmin(admin.ModelAdmin):
     pass

diff --git a/project/recrutement/models.py b/project/recrutement/models.py
index a8bb5fa..e0d2dec 100755 (executable)
--- 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)
 
 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', 
 
 class CandidatEvaluation(models.Model):
     candidat = models.ForeignKey(Candidat, db_column='candidat',