fix salary JS calculation, ordering classement

[auf_rh_dae.git] / project / assets / js / dae-poste.js

diff --git a/project/assets/js/dae-poste.js b/project/assets/js/dae-poste.js
index c17c938..cba1191 100644 (file)
--- a/project/assets/js/dae-poste.js
+++ b/project/assets/js/dae-poste.js
@@ -46,8 +46,8 @@ function charger_postes(implantation_id) {
 function charger_valeurs_point(implantation_id) {
     var params = {'implantation_id' : implantation_id};
     var chargement_vp = $.getJSON('/dae/liste_valeurs_point', params);
 function charger_valeurs_point(implantation_id) {
     var params = {'implantation_id' : implantation_id};
     var chargement_vp = $.getJSON('/dae/liste_valeurs_point', params);

-    var selected_min = $('#id_valeur_point_min').val()
-    var selected_max = $('#id_valeur_point_max').val()
+    var selected_min = null;
+    var selected_max = null;

     chargement_vp.success(function(data) {
         var items = [];
 
     chargement_vp.success(function(data) {
         var items = [];
 

@@ -62,8 +62,8 @@ function charger_valeurs_point(implantation_id) {
             options += '<option' + suggestion + ' value="' + this.id + '">' + this.label + '</option>';
         });
 
             options += '<option' + suggestion + ' value="' + this.id + '">' + this.label + '</option>';
         });
 

-        $('#id_valeur_point_min').html(options).val(selected_min);
-        $('#id_valeur_point_max').html(options).val(selected_max);
+        $('#id_valeur_point_min').html(options).val(selected_min).trigger('change');
+        $('#id_valeur_point_max').html(options).val(selected_max).trigger('change');

     });
 }
 
     });
 }
 

@@ -126,8 +126,7 @@ function recalculer_ligne(element) {
         if (valeur_point_text == "")
             valeur_point = 0;
         else
         if (valeur_point_text == "")
             valeur_point = 0;
         else

-            valeur_point = clean_float(valeur_point_text.split(" ")[0]);
-
+            valeur_point = clean_float(valeur_point_text.split(" ")[2]);

         if (salaire_manuel == false) {
             salaire = clean_float(valeur_point * coeff);
             salaire_input.val(salaire);
         if (salaire_manuel == false) {
             salaire = clean_float(valeur_point * coeff);
             salaire_input.val(salaire);