[#2398] Permettre de laisser la valeur du point vide.

diff --git a/project/dae/forms.py b/project/dae/forms.py
index 0238380..1296cc9 100644 (file)
--- a/project/dae/forms.py
+++ b/project/dae/forms.py
@@ -37,7 +37,7 @@ def _employe_choices(obj, request):
     # REGION
     else:
         q_dae_region_service = Q(poste__implantation__region=employe.implantation.region)
-        q_rh_region_service = Q(implantation1__region=employe.implantation.region) | Q(implantation2__region=employe.implantation.region) 
+        q_rh_region_service = Q(implantation1__region=employe.implantation.region) | Q(implantation2__region=employe.implantation.region)
     # TRAITEMENT DRH
     if grp_drh in request.user.groups.all():
         q_dae_region_service = Q()
@@ -79,7 +79,7 @@ DossierPieceForm = inlineformset_factory(dae.Dossier, dae.DossierPiece)
 FinancementForm = inlineformset_factory(dae.Poste, dae.PosteFinancement, extra=2)
 
 class DossierComparaisonForm(forms.ModelForm):
-    
+
     recherche = AutoCompleteSelectField('dossiers', required=False)
     poste = forms.CharField(max_length=255, widget=forms.TextInput(attrs={'size':'60'}))
 
@@ -92,7 +92,7 @@ DossierComparaisonFormSet = modelformset_factory(
 )
 
 class PosteComparaisonForm(forms.ModelForm):
-    
+
     recherche = AutoCompleteSelectField('postes', required=False)
 
     class Meta:
@@ -139,11 +139,11 @@ class PosteForm(forms.ModelForm):
     # La liste des choix est laissée vide. Voir __init__ pour la raison.
     poste = forms.ChoiceField(label="Nouveau poste ou évolution du poste",
                               choices=(), required=False)
-    
+
     valeur_point_min  = forms.ModelChoiceField(queryset=rh.ValeurPoint.actuelles.all(), required=False)
     valeur_point_max = forms.ModelChoiceField(queryset=rh.ValeurPoint.actuelles.all(), required=False)
-    
-    
+
+
     class Meta:
         model = dae.Poste
         exclude = ('actif', )
@@ -227,22 +227,11 @@ class PosteForm(forms.ModelForm):
         """
         cleaned_data  = self.cleaned_data
 
-        # Gestion de la mise à disposition
-        mise_a_disposition = cleaned_data.get("mise_a_disposition")
-        valeur_point_min = cleaned_data.get("valeur_point_min")
-        valeur_point_max = cleaned_data.get("valeur_point_max")
-        if mise_a_disposition is False and (valeur_point_min is None or valeur_point_max is None):
-            msg = u"Ce champ est obligatoire."
-            self._errors["valeur_point_min"] = self.error_class([msg])
-            self._errors["valeur_point_max"] = self.error_class([msg])
-            raise forms.ValidationError("Les valeurs de point sont vides")
-
         if cleaned_data.get("local") is False and cleaned_data.get("expatrie") is False:
             msg = "Le poste doit au moins être ouvert localement ou aux expatriés"
             self._errors["local"] = self.error_class([msg])
             self._errors["expatrie"] = ''
             raise forms.ValidationError(msg)
-            
 
         return cleaned_data
 

diff --git a/project/media/js/dae-poste.js b/project/media/js/dae-poste.js
index 526ace9..63ecb8c 100644 (file)
--- a/project/media/js/dae-poste.js
+++ b/project/media/js/dae-poste.js
@@ -48,13 +48,13 @@ function charger_valeurs_point(implantation_id) {
     chargement_vp.success(function(data) {
         var items = [];
 
-        var options = "";
+        var options = '<option value="">---------</option>';
         $.each(data, function() {
             var suggestion = "";
             if (this.suggestion) {
-                suggestion = " style='font-weight: bold; color: black;' "
+                suggestion = ' style="font-weight: bold; color: black;" '
             }
-            options += '<option ' + suggestion + ' value="' + this.id + '">' + this.label + '</option>';
+            options += '<option' + suggestion + ' value="' + this.id + '">' + this.label + '</option>';
         });
 
         $("#id_valeur_point_min").html(options);
@@ -123,7 +123,7 @@ function recalculer_ligne(element) {
             valeur_point = 0;
         else
             valeur_point = clean_float(valeur_point_text.split(" ")[0]);
-        
+
         if (salaire_manuel == false) {
             salaire = clean_float(valeur_point * coeff);
             salaire_input.val(salaire);
@@ -221,7 +221,7 @@ $(document).ready(function() {
         chargement_devise.error(function(data) {
             alert(data.responseText);
         });
-        
+
     });
 
     $('#id_devise_min, #id_devise_max').change(function(e) {
@@ -244,7 +244,7 @@ $(document).ready(function() {
         contrat_mois();
     });
     contrat_mois();
-    
+
     /* on charge les postes reliés à cette implantation */
     charger_postes($("#id_implantation :selected").val());
 
@@ -273,7 +273,7 @@ $(document).ready(function() {
         chargement_poste.error(function(data) {
             alert(data.responseText);
         });
-        
+
         /* on ne veut pas afficher la personne en-dessous */
         $(this).find('div').remove();
         input.val('');