Mercurial > bms / changeset

--- a/www/js/prod_view.js	Thu Jun 13 17:12:00 2024 +0200
+++ b/www/js/prod_view.js	Fri Jun 14 10:29:21 2024 +0200
@@ -2114,6 +2114,9 @@
  }
 
  function GetOptSO4Clratio() {
+   if (parseFloat($('#tw_sulfate').jqxNumberInput('decimal')) > 0 && parseFloat($('#tw_chloride').jqxNumberInput('decimal')) > 0) {
+    return (parseFloat($('#tw_sulfate').jqxNumberInput('decimal')) / parseFloat($('#tw_chloride').jqxNumberInput('decimal')));
+   }
    var BUGU = GetBUGU();
    return (1.0 / (-1.2 * BUGU + 1.4));
  }
@@ -2501,17 +2504,6 @@
    $('#wrt_so4_cl').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Zeer bitter</span>");
   else
    $('#wrt_so4_cl').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Te bitter</span>");
-  if (chloride > 0)
-   RA = sulfate / chloride;
-  else
-   RA = 10;
-  $('#got_so4_cl').val(Round(RA, 1));
-  Res = 'normaal';
-  if (RA < (0.8 * OptSO4Clratio))
-   Res = 'laag';
-  else if (RA > (1.2 * OptSO4Clratio))
-   Res = 'hoog';
-  setRangeIndicator('so4_cl', Res);
 
   $('#tw_bicarbonate').val(Round(Bicarbonate(dataRecord.tw_total_alkalinity, dataRecord.tw_ph)));
   $('#tw_hardness').val(Round(Hardness(dataRecord.tw_calcium, dataRecord.tw_magnesium), 1));
@@ -2552,6 +2544,18 @@
   $('#fw_hardness').val(Round(Hardness(calcium, magnesium), 1));
   $('#fw_ra').val(Round(ResidualAlkalinity(total_alkalinity, calcium, magnesium), 1));
 
+  if (chloride > 0)
+   RA = sulfate / chloride;
+  else
+   RA = 10;
+  $('#got_so4_cl').val(Round(RA, 1));
+  Res = 'normaal';
+  if (RA < (0.8 * OptSO4Clratio))
+   Res = 'laag';
+  else if (RA > (1.2 * OptSO4Clratio))
+   Res = 'hoog';
+  setRangeIndicator('so4_cl', Res);
+
   if (calcium < 40) {
    setRangeIndicator('calcium', 'laag');
   } else if (calcium > 150) {