merge qbe in rh : conflits réglés

[auf_rh_dae.git] / project / recrutement / models.py

diff --git a/project/recrutement/models.py b/project/recrutement/models.py
index 2b4f2bd..42e7fb6 100755 (executable)
--- a/project/recrutement/models.py
+++ b/project/recrutement/models.py
@@ -7,7 +7,11 @@ from tinymce import models as tinymce_models
 from django.db import models
 import settings
 
 from django.db import models
 import settings
 

+from south.modelsinspector import add_introspection_rules
+add_introspection_rules([], ["^tinymce.models.HTMLField"])

 import datamaster_modeles.models as ref
 import datamaster_modeles.models as ref

+
+from project.rh import models as rh

 from recrutement.workflow import grp_evaluateurs_recrutement
 from auf.django.emploi import models as emploi
 from auf.django.emploi.models import TYPE_PIECE_CHOICES
 from recrutement.workflow import grp_evaluateurs_recrutement
 from auf.django.emploi import models as emploi
 from auf.django.emploi.models import TYPE_PIECE_CHOICES

@@ -48,6 +52,17 @@ class Candidat(emploi.Candidat):
     class Meta:
         proxy = True
 
     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:
+            moyenne_votes = float(sum(notes)) / len(notes)
+        else:
+            moyenne_votes = "Non disponible"
+        return moyenne_votes
+

 class OffreEmploi(emploi.OffreEmploi):
     class Meta:
         proxy = True
 class OffreEmploi(emploi.OffreEmploi):
     class Meta:
         proxy = True

@@ -100,19 +115,6 @@ class Evaluateur(models.Model):
     def __unicode__(self):
         return '%s %s' % (self.user.first_name, self.user.last_name)
 
     def __unicode__(self):
         return '%s %s' % (self.user.first_name, self.user.last_name)
 

-class AdministrateurRegional(models.Model):
-    user = models.ForeignKey(User, unique=True,
-            verbose_name=u"Administrateur régionnal")
-    regions = models.ManyToManyField(ref.Region, 
-                           verbose_name=u"Régions", )
-
-    class Meta:
-        verbose_name = u"administrateur régional"
-        verbose_name_plural = u"administrateurs régionaux"
-
-    def __unicode__(self):
-        return '%s %s' % (self.user.first_name, self.user.last_name)
-

 class CandidatEvaluation(models.Model):
     candidat = models.ForeignKey(emploi.Candidat, db_column='candidat', 
                 related_name='+',) 
 class CandidatEvaluation(models.Model):
     candidat = models.ForeignKey(emploi.Candidat, db_column='candidat', 
                 related_name='+',) 

@@ -127,6 +129,9 @@ class CandidatEvaluation(models.Model):
         verbose_name = u'évaluation du candidat'
         verbose_name_plural = u'évaluations des candidats'
 
         verbose_name = u'évaluation du candidat'
         verbose_name_plural = u'évaluations des candidats'
 

+    def __unicode__(self):
+        return u"Évaluation de %s" % self.candidat
+

 #### TEMPLATE COURRIEL
 TEMPLATE_CHOICES = (
     ('SEL', 'Sélectionné'),
 #### TEMPLATE COURRIEL
 TEMPLATE_CHOICES = (
     ('SEL', 'Sélectionné'),

@@ -141,11 +146,14 @@ class CourrielTemplate(models.Model):
     html = tinymce_models.HTMLField(verbose_name=u'Texte en HTML', 
                                     help_text=HELP_TEXT_TAGS_ACCEPTES,  )
 
     html = tinymce_models.HTMLField(verbose_name=u'Texte en HTML', 
                                     help_text=HELP_TEXT_TAGS_ACCEPTES,  )
 

+

     def __unicode__(self):
         return u'%s' % self.nom_modele
 
     class Meta:
         ordering = ['nom_modele',]
     def __unicode__(self):
         return u'%s' % self.nom_modele
 
     class Meta:
         ordering = ['nom_modele',]

+        verbose_name = "Modèle de courriel"
+        verbose_name_plural = "Modèles de courriel"

 
 class CandidatCourriel(models.Model):
     candidats = models.ManyToManyField(Candidat, verbose_name=u"Candidats", )
 
 class CandidatCourriel(models.Model):
     candidats = models.ManyToManyField(Candidat, verbose_name=u"Candidats", )

@@ -164,4 +172,3 @@ class CandidatCourriel(models.Model):
     class Meta:
         verbose_name = u"modèle de courriel"
         verbose_name_plural = u"modèles de courriel"
     class Meta:
         verbose_name = u"modèle de courriel"
         verbose_name_plural = u"modèles de courriel"

-