1592: Modeles- Remplacer Evaluateur par User

diff --git a/project/recrutement/admin.py b/project/recrutement/admin.py
index f36ccf9..d2bf0aa 100644 (file)
--- a/project/recrutement/admin.py
+++ b/project/recrutement/admin.py
@@ -29,22 +29,22 @@ class OffreEmploiAdmin(VersionAdmin):
         modèles de Region, il existe plusieurs boucles, ce qui conduit à la 
         génération d'une requête infinie.
         """
-        user_email = request.user.email
-        user = get_object_or_404(Employe, courriel=user_email)
-        user_implantation = user.implantation
-        implantation_region = get_object_or_404(Implantation, 
-                                id=user_implantation.id)
-        user_region = get_object_or_404(Region, 
-                        id=implantation_region.region.id)
+  #      user_email = request.user.email
+  #      user = get_object_or_404(Employe, courriel=user_email)
+  #      user_implantation = user.implantation
+  #      implantation_region = get_object_or_404(Implantation, 
+  #                              id=user_implantation.id)
+  #      user_region = get_object_or_404(Region, 
+  #                      id=implantation_region.region.id)
         qs = self.model._default_manager.get_query_set()
-        return qs.select_related('offre_emploi').filter(region=user_region.id)
+        return qs.select_related('offre_emploi')#.filter(region=user_region.id)
 
 class CandidatPieceInline(admin.TabularInline):
     model = CandidatPiece
     extra = 1
 
 class EvaluateurInline(admin.TabularInline):
-    model = Evaluateur.candidats.through
+    model = User.candidats.through
     extra = 1
 
 class CandidatAdmin(VersionAdmin):
@@ -122,7 +122,7 @@ class CandidatPieceAdmin(admin.ModelAdmin):
 
 class EvaluateurAdmin(VersionAdmin):
     fieldsets = (
-        (None, {'fields': ('nom', 'prenom')}),
+       # (None, {'fields': ('first_name', 'last_name', 'email', 'is_staff', 'is_superuser')}),
         (None, {'fields': ('candidats',)}),
     )
 
@@ -143,5 +143,5 @@ class CandidatEvaluationAdmin(VersionAdmin):
 admin.site.register(OffreEmploi, OffreEmploiAdmin)
 admin.site.register(Candidat, CandidatAdmin)
 admin.site.register(CandidatPiece, CandidatPieceAdmin)
-admin.site.register(Evaluateur, EvaluateurAdmin)
+admin.site.register(User, EvaluateurAdmin)
 admin.site.register(CandidatEvaluation, CandidatEvaluationAdmin)

diff --git a/project/recrutement/forms.py b/project/recrutement/forms.py
index 6cae230..dddb60c 100644 (file)
--- a/project/recrutement/forms.py
+++ b/project/recrutement/forms.py
@@ -26,7 +26,7 @@ class CandidatEvaluationForm(ModelForm):
 
 class EvaluateurForm(forms.Form):
     evaluateurs = forms.ModelMultipleChoiceField(queryset=
-                    recr.Evaluateur.objects.all())
+                    recr.User.objects.all())
 
     def __init__(self, *args, **kwargs):
         self.candidats = kwargs.pop('candidats')

diff --git a/project/recrutement/models.py b/project/recrutement/models.py
index 8fae960..50f1ce5 100755 (executable)
--- a/project/recrutement/models.py
+++ b/project/recrutement/models.py
@@ -118,19 +118,19 @@ class CandidatPiece(models.Model):
     def __unicode__(self):
         return '%s' % (self.nom)
 
-class Evaluateur(models.Model):
-    candidats = models.ManyToManyField(Candidat, verbose_name='Candidats',
-                    related_name="evaluateurs", blank=True, null=True,)
-    nom = models.CharField(max_length=255)
-    prenom = models.CharField(max_length=255)
+class User(models.Model):
+    user = models.ForeignKey("auth.User", unique=True)
+    candidats = models.ManyToManyField(Candidat, verbose_name='Candidats', blank=True, null=True,)
+    region = models.ForeignKey(ref.Region, db_column='region')
 
-    def __unicode__(self):
-        return '%s %s' % (self.prenom, self.nom)
+#User.profile = property(lambda u: UserProfile.objects.get_or_create(user=u)[0])
+#    def __unicode__(self):
+#        return '%s %s' % (self.prenom, self.nom)
 
 class CandidatEvaluation(models.Model):
     candidat = models.ForeignKey(Candidat, db_column='candidat', 
                 related_name='+') 
-    evaluateur = models.ForeignKey(Evaluateur, db_column='evaluateur', 
+    evaluateur = models.ForeignKey(User, db_column='evaluateur', 
                     related_name='+') 
     note = models.IntegerField(choices=NOTES, blank=True, null=True)
     commentaire = models.TextField(null=True, blank=True)

diff --git a/project/recrutement/views.py b/project/recrutement/views.py
index 7e69b0f..c3b9265 100755 (executable)
--- a/project/recrutement/views.py
+++ b/project/recrutement/views.py
@@ -5,6 +5,7 @@ from django.contrib import messages
 from django.template import Context, RequestContext
 from django.shortcuts import render_to_response, redirect
 from django.template import RequestContext
+from django.contrib.auth.models import User
 
 from forms import *
 from models import *