merge recrutement + bypass rh.Poste dependancy

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

diff --git a/project/recrutement/forms.py b/project/recrutement/forms.py
index b873d2b..6025a77 100644 (file)
--- a/project/recrutement/forms.py
+++ b/project/recrutement/forms.py
@@ -8,17 +8,18 @@ from datetime import timedelta
 from django.forms.widgets import CheckboxSelectMultiple
 from django.contrib.admin import widgets as admin_widgets   
 from form_utils.forms import BetterModelForm
-from django.forms import ModelForm
+from django.forms import ModelForm, ModelChoiceField, HiddenInput, CharField
 from django.forms.models import BaseInlineFormSet 
 from django.core.mail import send_mail
 
+from datamaster_modeles.models import Employe, Implantation, Region
 from tinymce.widgets import TinyMCE
 from captcha.fields import CaptchaField
 
 from recrutement import models as recr
 from auf.django.emploi import forms as emploi
-
-
+from project.rh import models as rh
+from project.dae.utils import get_employe_from_user as get_emp
 
 ################################################################################
 # EVALUATION
@@ -47,7 +48,6 @@ class EvaluateurForm(forms.Form):
     def save(self):
         candidats = recr.Candidat.objects.\
                             filter(offre_emploi__in=self.offres_emploi)
-        import pdb;pdb.set_trace()
         for candidat in candidats:
             for evaluateur in self.cleaned_data.get('evaluateurs', []):                
                 candidat_evaluation = recr.CandidatEvaluation()
@@ -65,7 +65,25 @@ class CandidatPieceForm(emploi.CandidatPieceForm):
 class PostulerOffreEmploiForm(emploi.PostulerOffreEmploiForm):
     pass
 
-"""class OffreEmploiForm(emploi.OffreEmploi):
+class OffreEmploiForm(ModelForm):
+    #poste = ModelChoiceField(queryset=rh.Poste.objects.all())
+
+    #class Meta:
+    #    model = recr.OffreEmploi  
+
+    #def __init__(self, *args, **kwargs):
+    #    super(OffreEmploiForm, self).__init__(*args, **kwargs)
+    #
+    #def save(self, *args, **kwargs):
+    #    kwargs2 = kwargs.copy()
+    #    kwargs2['commit'] = False
+    #    offre = super(OffreEmploiForm, self).save(*args, **kwargs2)
+    #    offre.poste = self.cleaned_data.get("poste").id
+    #    offre.poste_nom = self.cleaned_data.get("poste").nom
+    #    if 'commit' not in kwargs or kwargs['commit']:
+    #        offre.save()
+    #    return offre
+
     def clean(self):
         cleaned_data = self.cleaned_data
         date_limite = cleaned_data.get("date_limite")
@@ -73,10 +91,10 @@ class PostulerOffreEmploiForm(emploi.PostulerOffreEmploiForm):
 
         if date_limite and debut_affectation:
             if date_limite > debut_affectation:
-                raise forms.ValidationError("La date limite doit être \
-                        ultérieure à la date de début d'affectation.")
+                raise forms.ValidationError("La date limite ne peut pas être \
+                        supérieure à la date d'affection.")
         return cleaned_data
-"""
+
 ################################################################################
 # TEMPLATE COURRIEL
 ################################################################################