round totaux

diff --git a/project/media/js/dae-embauche.js b/project/media/js/dae-embauche.js
index 8e35ceb..1b56f0b 100644 (file)
--- a/project/media/js/dae-embauche.js
+++ b/project/media/js/dae-embauche.js
@@ -59,15 +59,16 @@ function remun_line(input) {
   else {
     value = (montant_annuel.val());
   }
+  value = roundNumber(value, 2)
 
-  montant_mensuel.val(clean_float(value / 12));
-  montant_annuel.val(value);
+  montant_mensuel.val(roundNumber((value / 12), 2));
+  montant_annuel.val(roundNumber(value, 0));
 
   var devise = $('#' + prefix + '-devise').val();
   var taux = parseFloat(DEVISES[devise]);
   if (isNaN(taux)) taux = 0;
-  montant_mensuel_euros.text(clean_float(value / 12 * taux))
-  montant_annuel_euros.text(clean_float(value * taux))
+  montant_mensuel_euros.text(roundNumber((value / 12 * taux), 2))
+  montant_annuel_euros.text(roundNumber((value * taux), 0))
   
 }
 

diff --git a/project/media/js/dae.js b/project/media/js/dae.js
index 828dfe2..32ac142 100644 (file)
--- a/project/media/js/dae.js
+++ b/project/media/js/dae.js
@@ -10,6 +10,11 @@ function clean_float(value){
     return parseInt(output);
 }
 
+function roundNumber(num, dec) {
+    var result = Math.round(num*Math.pow(10,dec))/Math.pow(10,dec);
+    return result;
+}
+
 /* stocker le texte par défaut à afficher */
 var note_duree_indeterminee = "";