1819: Voir moyenne des notes d'un candidat lors de la visualisation d'un candidat

diff --git a/project/recrutement/api.py b/project/recrutement/api.py
index e8ca95a..0bd6cdf 100644 (file)
--- a/project/recrutement/api.py
+++ b/project/recrutement/api.py
@@ -9,7 +9,7 @@ from auf.django.emploi import models as emploi
 from auf.django.emploi import forms as emploiForms
 from project.recrutement.models import Evaluateur, CandidatEvaluation, \
                                 CourrielTemplate
-from project.recrutement.views import *
+from project.recrutement.views import send_templated_email
 
 STATUS_OK = 200
 
@@ -76,10 +76,9 @@ class API:
                 piecesForm.instance = offre
                 piecesForm.save() 
          
-                """courriel_template = CourrielTemplate.objects.\
-                            get(id=1)
+                courriel_template = CourrielTemplate.objects.get(id=1)
                 send_templated_email(cand, courriel_template)
-                """
+                
                 evaluateurs = offre_emploi.evaluateurs.all()
                 for evaluateur in evaluateurs:                
                     candidat_evaluation = CandidatEvaluation()

diff --git a/project/recrutement/models.py b/project/recrutement/models.py
index 3b30f2b..911cd8b 100755 (executable)
--- a/project/recrutement/models.py
+++ b/project/recrutement/models.py
@@ -48,6 +48,17 @@ class Candidat(emploi.Candidat):
     class Meta:
         proxy = True
 
+    def moyenne_notes(self):
+        evaluations = CandidatEvaluation.objects.filter(candidat=self)
+        notes = [evaluation.note for evaluation in evaluations.all() \
+                    if evaluation.note is not None]
+
+        if len(notes) > 0 and offre_emploi.date_limite <= datetime.date.today():
+            moyenne_votes = float(sum(notes)) / len(notes)
+        else:
+            moyenne_votes = "Non disponible"
+        return moyenne_votes
+
 class OffreEmploi(emploi.OffreEmploi):
     class Meta:
         proxy = True

diff --git a/project/recrutement/views.py b/project/recrutement/views.py
index 65753e5..58d7f9b 100755 (executable)
--- a/project/recrutement/views.py
+++ b/project/recrutement/views.py
@@ -12,7 +12,6 @@ from django.core.mail import EmailMultiAlternatives
 from forms import *
 from models import *
 from recrutement.workflow import grp_evaluateurs_recrutement
-from views import *
 
 def index(request):
     return render_to_response('recrutement/index.html', {},