fix calcul JS remun

diff --git a/project/media/js/dae-embauche.js b/project/media/js/dae-embauche.js
index 3321cf1..1cf6482 100644 (file)
--- a/project/media/js/dae-embauche.js
+++ b/project/media/js/dae-embauche.js
@@ -30,7 +30,30 @@ function round2(n) {
     return Math.round(n * 100) / 100;
 }
 
+function remun_line(input) {
+  var idParts = input.attr('id').split('-'),
+      name = idParts[0],
+      id = idParts[1];
+
+  var montant_mensuel = $('#montant_mois-' + id);
+  var montant_annuel = $('#montant-' + id);
+  
+  if (input.attr('id') == montant_mensuel.attr('id')) value = (montant_mensuel.val() * 12);
+  if (input.attr('id') == montant_annuel.attr('id')) value = (montant_annuel.val());
+
+  montant_mensuel.val(round2(value / 12));
+  montant_annuel.val(round2(value));
+
+  var taux = $('#taux_devise-' + id).val();
+  $('#montant_euro_mois-' + id).text(clean_float(round2(value / 12 * taux)));
+  $('#montant_euro-' + id).text(clean_float(round2(value * taux)));
+}
+
 function remun_totaux() {
+    $('#global-cost input[id^="montant"]').each(function() {
+        remun_line($(this));
+    });
+
     var total_cout = 0;
     $("tr.cout td.cumulable").each(function() {
         total_cout += clean_float($(this).html());
@@ -48,22 +71,6 @@ function remun_totaux() {
 
 }
 
-$('#global-cost input[id^="montant"]').live('keyup', function() {
-    var value = $(this).val(),
-        idParts = $(this).attr('id').split('-'),
-        name = idParts[0],
-        id = idParts[1];
-    if (name == 'montant') {
-        $('#montant_mois-' + id).val(round2(value / 12));
-    } else {
-        value = value * 12;
-        $('#montant-' + id).val(round2(value));
-    }
-    var taux = $('#taux_devise-' + id).val();
-    $('#montant_euro_mois-' + id).text(clean_float(round2(value / taux / 12)));
-    $('#montant_euro-' + id).text(clean_float(round2(value / taux)));
-    remun_totaux();
-});
 
 activateDossierDropDowns();
 
@@ -113,6 +120,11 @@ $(document).ready(function() {
     });
     contrat_mois();
 
+    /* totaux remu */
+    $('#global-cost input').change(function() {
+        remun_line($(this));
+    });
+
     /* Ajouter une ligne aux couts globals */
     $('#type-remun').change(function() {
         if ($(this).val() != '') {