Correction des conflits

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

diff --git a/project/recrutement/models.py b/project/recrutement/models.py
index bd7f559..a126996 100755 (executable)
--- a/project/recrutement/models.py
+++ b/project/recrutement/models.py
@@ -44,7 +44,7 @@ class ProxyPoste(Poste):
         return '%s [%s]' % (self.nom, self.id)
 
 class OffreEmploi(Metadata):
-    objects = OffreEmploiManager()
+    #objects = OffreEmploiManager()
     nom = models.CharField(max_length=255)
     resume = models.TextField(verbose_name="Résumé")
     description = tinymce_models.HTMLField()
@@ -159,26 +159,36 @@ class CandidatPiece(models.Model):
     def __unicode__(self):
         return '%s' % (self.nom)
 
-class UserProfile(models.Model):
+class Evaluateur(models.Model):
     user = models.ForeignKey(User, unique=True,
             verbose_name="permission")
     candidats = models.ManyToManyField(Candidat, verbose_name='candidats', 
                 blank=True, null=True,related_name="evaluateurs")
+
+    class Meta:
+        verbose_name = "évaluateur"
+
+    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="permission")
     regions = models.ManyToManyField(ref.Region, 
                            verbose_name="Régions", )
 
     class Meta:
-        verbose_name = "évaluateur"
+        verbose_name = "administrateur régional"
+        verbose_name_plural = "administrateurs régionaux"
 
     def __unicode__(self):
         return '%s %s' % (self.user.first_name, self.user.last_name)
 
-UserProfile.profile = property(lambda u: UserProfile.objects.get_or_create(user=u)[0])
 
 class CandidatEvaluation(models.Model):
     candidat = models.ForeignKey(Candidat, db_column='candidat', 
                 related_name='+',) 
-    evaluateur = models.ForeignKey(UserProfile, db_column='evaluateur', 
+    evaluateur = models.ForeignKey(Evaluateur, db_column='evaluateur', 
                     related_name='+', verbose_name='Évaluateur') 
     note = models.IntegerField(choices=NOTES, blank=True, null=True)
     commentaire = models.TextField(null=True, blank=True)