1503: Évaluation des candidatures

diff --git a/project/recrutement/forms.py b/project/recrutement/forms.py
index c1a178c..b960bd5 100644 (file)
--- a/project/recrutement/forms.py
+++ b/project/recrutement/forms.py
@@ -15,13 +15,14 @@ from django.forms.models import BaseInlineFormSet
 class CandidatEvaluationForm(ModelForm):
     def __init__(self, *args, **kwargs):   
         self.candidat = kwargs.pop('candidat')    
+        self.evaluateur = kwargs.pop('evaluateur') 
         super(CandidatEvaluationForm, self).__init__(*args, **kwargs)
 
     def save(self):
         super(CandidatEvaluationForm, self).save()
 
     class Meta:
-        fields = ('note', 'commentaire', 'evaluateur')
+        fields = ('note', 'commentaire')
         model = recr.CandidatEvaluation  
 
 class EvaluateurForm(forms.Form):

diff --git a/project/recrutement/models.py b/project/recrutement/models.py
index 671ed86..d062401 100755 (executable)
--- a/project/recrutement/models.py
+++ b/project/recrutement/models.py
@@ -14,7 +14,7 @@ from project.rh import models as rh
 #NOTES
 NOTE_MIN = 1
 NOTE_RANGE = 1
-NOTE_MAX = 10
+NOTE_MAX = 11
 NOTES = [(i, i) for i in range(NOTE_MIN, NOTE_MAX, NOTE_RANGE)]
 
 # Abstracts

diff --git a/project/recrutement/templates/recrutement/affecter_evaluateurs.html b/project/recrutement/templates/recrutement/affecter_evaluateurs.html
index c9991ed..926d3bc 100644 (file)
--- a/project/recrutement/templates/recrutement/affecter_evaluateurs.html
+++ b/project/recrutement/templates/recrutement/affecter_evaluateurs.html
@@ -1,27 +1,31 @@
-{% extends 'base.html' %}
+{% extends 'admin/base_site.html' %}
+{% load i18n adminmedia form_utils_tags %}
 
-{% block title %}RH{% endblock %}
+{% block title %}RH - Recrutement{% endblock %}
 {% block titre %}Ressources humaines{% endblock %}
-{% block sous_titre %}Accueil{% endblock %}
-
-{% block main %}
-
+{% block sous_titre %}Affecter évaluateur{% endblock %}
 
+{% block content %}
 <div id="content-main">
     {% block object-tools %}{% endblock %}
 
 
 
     <div class="module">
-    <h2>Affectation évaluateurs</h2>
+        <h2>Affectation évaluateurs</h2>
+
+        <form action="" method="post">
+            <table>
+                <tr>
+                    <td>{{ form.evaluateurs.label }}</td>
+                    <td>{{ form.evaluateurs }}</td>
+                </tr>
+            </table>
+            <div class="submit-row">
+                <input type="submit" name="_save" class="default" value="Enregistrer">
+            </div>
+        </form>
     </div>
-    <form action="" method="post">
-        {{ form.as_p }}
-        <div class="submit-row">
-            <input type="submit" name="_save" class="default" value="Enregistrer">
-        </div>
-    </form>
-
 
 
 </div>

diff --git a/project/recrutement/templates/recrutement/evaluer_candidat.html b/project/recrutement/templates/recrutement/evaluer_candidat.html
index a5de9d9..9ab72ac 100644 (file)
--- a/project/recrutement/templates/recrutement/evaluer_candidat.html
+++ b/project/recrutement/templates/recrutement/evaluer_candidat.html
@@ -1,27 +1,35 @@
-{% extends 'base.html' %}
+{% extends 'admin/base_site.html' %}
+{% load i18n adminmedia form_utils_tags %}
 
-{% block title %}RH{% endblock %}
+{% block title %}RH - Recrutement{% endblock %}
 {% block titre %}Ressources humaines{% endblock %}
-{% block sous_titre %}Accueil{% endblock %}
-
-{% block main %}
-
+{% block sous_titre %}Évaluer candidat{% endblock %}
 
+{% block content %}
 <div id="content-main">
     {% block object-tools %}{% endblock %}
 
 
 
     <div class="module">
-    <h2>Noter et commenter un candidat</h2>
+        <h2>Noter et commenter un candidat</h2>
+
+        <form action="" method="post">
+            <table>
+                <tr>
+                    <td>{{ form.note.label }}</td>
+                    <td>{{ form.note }}</td>
+                </tr>
+                <tr>
+                    <td>{{ form.commentaire.label }}</td>
+                    <td>{{ form.commentaire }}</td>
+                </tr>
+            </table>
+            <div class="submit-row">
+                <input type="submit" name="_save" class="default" value="Enregistrer">
+            </div>
+        </form>
     </div>
-    <form action="" method="post">
-        {{ form.as_p }}
-        <div class="submit-row">
-            <input type="submit" name="_save" class="default" value="Enregistrer">
-        </div>
-    </form>
-
 
 
 </div>

diff --git a/project/recrutement/views.py b/project/recrutement/views.py
index a7b96ab..363d057 100755 (executable)
--- a/project/recrutement/views.py
+++ b/project/recrutement/views.py
@@ -16,12 +16,23 @@ def index(request):
                                 RequestContext(request))
 
 def evaluer_candidat(request):
-    candidat = get_object_or_404(Candidat, id__in=request.GET.get('id'))
+    candidat = get_object_or_404(Candidat, id=request.GET.get('id'))
+
+    try:
+        evaluateur = UserProfile.objects.get(user=request.user)
+    except UserProfile.DoesNotExist:
+        messages.add_message(request, messages.ERROR, 
+                        "Vous ne pouvez pas évaluer un candidat.")
+        return redirect("admin:recrutement_candidat_changelist")
+
     if request.method == "POST":
         candidat_evaluation = CandidatEvaluation()
         candidat_evaluation.candidat = candidat
+        candidat_evaluation.evaluateur = evaluateur
         form = CandidatEvaluationForm(request.POST, 
-                instance=candidat_evaluation, candidat=candidat) 
+                instance=candidat_evaluation, candidat=candidat,
+                         evaluateur=evaluateur) 
+        import pdb;pdb.set_trace()
         if form.is_valid():       
             form.save()    
             messages.add_message(request, messages.SUCCESS, 
@@ -29,7 +40,7 @@ def evaluer_candidat(request):
                                 au candidat.")
             return redirect("admin:recrutement_candidat_changelist")
     else:      
-        form = CandidatEvaluationForm(candidat=candidat)
+        form = CandidatEvaluationForm(candidat=candidat, evaluateur=evaluateur)
 
     c = {'form' : form}   
     return render_to_response("recrutement/evaluer_candidat.html", Context(c),