Mercurial > bms / file diff

--- a/www/js/prod_edit.js	Sat Sep 14 19:04:29 2019 +0200
+++ b/www/js/prod_edit.js	Mon Sep 16 16:12:15 2019 +0200
@@ -2089,7 +2089,7 @@
   ncells = Round(egrams * grate, 1),
   totcells = parseFloat(ncells) + start;
 
-  console.log('svol:' + svol + ' start:' + start + ' irate:' + irate + ' egrams:' + egrams + ' grate:' + grate + ' ncells:' + ncells);
+  //console.log('svol:' + svol + ' start:' + start + ' irate:' + irate + ' egrams:' + egrams + ' grate:' + grate + ' ncells:' + ncells);
   return {
    svol: svol,
    irate: irate,
@@ -2354,7 +2354,7 @@
 //    }
    }
   }
-  needed = pitchrate * volume * plato;
+  needed = Round(pitchrate * volume * plato, 1);
   console.log('calcYeast() pitchrate:' + pitchrate + ' start:' + initcells + ' needed:' + needed + ' volume:' + volume);
   $('#need_cells').val(needed);
   use_cells = initcells;
@@ -2714,7 +2714,8 @@
     pH += deltapH;
    pd = ProtonDeficit(pH);
   }
-  console.log('MashpH() n: ' + n + ' pH: ' + pH);
+  pH = Round(pH, 2);
+  //console.log('MashpH() n: ' + n + ' pH: ' + pH);
   return pH;
  }
 
@@ -2733,7 +2734,7 @@
 
  function calcWater() {
 
-  console.log('calcWater()');
+  //console.log('calcWater()');
   var liters = 0,
   calcium = 0,
   magnesium = 0,
@@ -2852,7 +2853,7 @@
   if (dataRecord.calc_acid) {
    TpH = parseFloat(dataRecord.mash_ph);
    protonDeficit = ProtonDeficit(TpH);
-   console.log('calc_acid tgt: ' + TpH + ' protonDeficit: ' + protonDeficit);
+   //console.log('calc_acid tgt: ' + TpH + ' protonDeficit: ' + protonDeficit);
    if (protonDeficit > 0) { // Add acid
     $('#wa_base').val(0);
     setWaterAgent(last_base, 0);
@@ -2864,10 +2865,10 @@
 
     if (parseFloat($('#wa_acid_perc').jqxNumberInput('decimal')) == 0)
      $('#wa_acid_perc').val(AcidPrc);
-    Acid = Acid * AcidPrc / (parseFloat($('#wa_acid_perc').jqxNumberInput('decimal')) / 100); // ml
-    console.log('Final ml: ' + Acid);
-    $('#wa_acid').val(Round(Acid, 2));
-    setWaterAgent(AcidTypeData[AT].nl, Round(Acid, 2));
+    Acid = Round(Acid * AcidPrc / (parseFloat($('#wa_acid_perc').jqxNumberInput('decimal')) / 100), 2); // ml
+    //console.log('Final ml: ' + Acid);
+    $('#wa_acid').val(Acid);
+    setWaterAgent(AcidTypeData[AT].nl, Acid);
 
     bicarbonate = bicarbonate - protonDeficit * frac / liters;
     total_alkalinity = bicarbonate * 50 / 61;