# HG changeset patch
# User Michiel Broek <mbroek@mbse.eu>
# Date 1625087371 -7200
# Node ID e95744b6b31d078ca40bb4d3b7086483dabfdfd3
# Parent  12a795e8b5685441b6df3687bcc329c26d2c5c9e
Added HCO3 to the water summary. Changed some water chemicals limits to new insights.

diff -r 12a795e8b568 -r e95744b6b31d www/css/style.css
--- a/www/css/style.css	Wed Jun 30 09:19:53 2021 +0200
+++ b/www/css/style.css	Wed Jun 30 23:09:31 2021 +0200
@@ -25,7 +25,8 @@
 #water_totals {
     width: 960px;
     background: #353536;
-    margin-top: 15px;
+    margin-top: 10px;
+    margin-bottom: 10px;
     border: 1px solid;
     border-color: #59b4d4;
     border-radius: 5px 5px 5px 5px;
diff -r 12a795e8b568 -r e95744b6b31d www/js/prod_edit.js
--- a/www/js/prod_edit.js	Wed Jun 30 09:19:53 2021 +0200
+++ b/www/js/prod_edit.js	Wed Jun 30 23:09:31 2021 +0200
@@ -694,6 +694,7 @@
    $('#w1_sodium').val(dataRecord.w1_sodium);
    $('#w1_magnesium').val(dataRecord.w1_magnesium);
    $('#w1_total_alkalinity').val(dataRecord.w1_total_alkalinity);
+   $('#w1_bicarbonate').val(dataRecord.w1_total_alkalinity * 1.22);
    $('#w1_ph').val(dataRecord.w1_ph);
    $('#w1_cost').val(dataRecord.w1_cost);
    $('#w2_name').val(dataRecord.w2_name);
@@ -704,6 +705,7 @@
    $('#w2_sodium').val(dataRecord.w2_sodium);
    $('#w2_magnesium').val(dataRecord.w2_magnesium);
    $('#w2_total_alkalinity').val(dataRecord.w2_total_alkalinity);
+   $('#w2_bicarbonate').val(dataRecord.w2_total_alkalinity * 1.22);
    $('#w2_ph').val(dataRecord.w2_ph);
    $('#w2_cost').val(dataRecord.w2_cost);
    $('#wg_amount').val(dataRecord.wg_amount);
@@ -3272,6 +3274,7 @@
   $('#wg_calcium').val(Round(calcium, 1));
   $('#wg_magnesium').val(Round(magnesium, 1));
   $('#wg_sodium').val(Round(sodium, 1));
+  $('#wg_bicarbonate').val(Round(bicarbonate, 1));
   $('#wg_total_alkalinity').val(Round(total_alkalinity, 1));
   $('#wg_chloride').val(Round(chloride, 1));
   $('#wg_sulfate').val(Round(sulfate, 1));
@@ -3444,6 +3447,7 @@
   $('#wb_sodium').val(Round(sodium, 1));
   $('#wb_sulfate').val(Round(sulfate, 1));
   $('#wb_chloride').val(Round(chloride, 1));
+  $('#wb_bicarbonate').val(Round(bicarbonate, 1));
   $('#wb_total_alkalinity').val(Round(total_alkalinity, 1));
 
   if (calcium < 40) {
@@ -3453,9 +3457,9 @@
   } else {
    setRangeIndicator('calcium', 'normaal');
   }
-  if (magnesium < 10) {
+  if (magnesium < 5) {
    setRangeIndicator('magnesium', 'laag');
-  } else if (magnesium > 30) {
+  } else if (magnesium > 40) {
    setRangeIndicator('magnesium', 'hoog');
   } else {
    setRangeIndicator('magnesium', 'normaal');
@@ -3469,18 +3473,23 @@
   // John Palmer. So the Cl/SO4 ratio calculation will work.
   if (chloride <= 50) {
    setRangeIndicator('chloride', 'laag');
-  } else if (chloride <= 100) {
+  } else if (chloride <= 150) {
    setRangeIndicator('chloride', 'normaal');
   } else {
    setRangeIndicator('chloride', 'hoog');
   }
   if (sulfate <= 50) {
    setRangeIndicator('sulfate', 'laag');
-  } else if (sulfate <= 350) {
+  } else if (sulfate <= 400) {
    setRangeIndicator('sulfate', 'normaal');
   } else {
    setRangeIndicator('sulfate', 'hoog');
   }
+  // (cloride + sulfate) > 500 is too high
+  if ((chloride + sulfate) > 500) {
+   setRangeIndicator('chloride', 'hoog');
+   setRangeIndicator('sulfate', 'hoog');
+  }
   if (ph < 5.2) {
    setRangeIndicator('ph', 'laag');
   } else if (ph > 5.6) {
@@ -3488,6 +3497,11 @@
   } else {
    setRangeIndicator('ph', 'normaal');
   }
+  if (bicarbonate > 250) {
+   setRangeIndicator('bicarbonate', 'hoog');
+  } else {
+   setRangeIndicator('bicarbonate', 'normaal');
+  }
   calcSparge();
   calcMiscs();
   calcSupplies();
@@ -5878,7 +5892,7 @@
   theme: theme,
   source: waterlist,
   displayMember: 'name',
-  width: 250,
+  width: 200,
   height: 27,
   dropDownWidth: 400,
   dropDownHeight: 400
@@ -5899,6 +5913,7 @@
    $('#w1_magnesium').val(datarecord.magnesium);
    dataRecord.w1_magnesium = datarecord.magnesium;
    $('#w1_total_alkalinity').val(datarecord.total_alkalinity);
+   $('#w1_bicarbonate').val(datarecord.total_alkalinity * 1.22);
    dataRecord.w1_total_alkalinity = datarecord.total_alkalinity;
    $('#w1_ph').val(datarecord.ph);
    dataRecord.w1_ph = datarecord.ph;
@@ -5907,7 +5922,7 @@
    calcWater();
   }
  });
- $('#w1_amount,#w1_calcium,#w1_magnesium,#w1_sodium,#w1_total_alkalinity,#w1_chloride,#w1_sulfate').jqxNumberInput(Show1wat);
+ $('#w1_amount,#w1_calcium,#w1_magnesium,#w1_sodium,#w1_bicarbonate,#w1_total_alkalinity,#w1_chloride,#w1_sulfate').jqxNumberInput(Show1wat);
  $('#w1_ph').jqxNumberInput(Show2wat);
  // Water source 2
  $('#w2_name').jqxDropDownList({
@@ -5915,7 +5930,7 @@
   theme: theme,
   source: water2list,
   displayMember: 'name',
-  width: 250,
+  width: 200,
   height: 27,
   dropDownWidth: 400,
   dropDownHeight: 400
@@ -5942,6 +5957,7 @@
    $('#w2_magnesium').val(datarecord.magnesium);
    dataRecord.w2_magnesium = datarecord.magnesium;
    $('#w2_total_alkalinity').val(datarecord.total_alkalinity);
+   $('#w2_bicarbonate').val(datarecord.total_alkalinity * 1.22);
    dataRecord.w2_total_alkalinity = datarecord.total_alkalinity;
    $('#w2_ph').val(datarecord.ph);
    dataRecord.w2_ph = datarecord.ph;
@@ -5956,18 +5972,19 @@
   inputMode: 'simple', spinMode: 'simple', theme: theme, width: 94, height: 23, min: 0, max: 0, decimalDigits: 1,
   spinButtons: true, spinButtonsStep: 0.1, readOnly: true
  });
- $('#w2_calcium,#w2_magnesium,#w2_sodium,#w2_total_alkalinity,#w2_chloride,#w2_sulfate').jqxNumberInput(Show1wat);
+ $('#w2_calcium,#w2_magnesium,#w2_sodium,#w2_bicarbonate,#w2_total_alkalinity,#w2_chloride,#w2_sulfate').jqxNumberInput(Show1wat);
  $('#w2_ph').jqxNumberInput(Show2wat);
  // Water mixed
- $('#wg_amount,#wg_calcium,#wg_magnesium,#wg_sodium,#wg_total_alkalinity,#wg_chloride,#wg_sulfate').jqxNumberInput(Show1wat);
+ $('#wg_amount,#wg_calcium,#wg_magnesium,#wg_sodium,#wg_bicarbonate,#wg_total_alkalinity,#wg_chloride,#wg_sulfate').jqxNumberInput(Show1wat);
  $('#wg_ph').jqxNumberInput(Show2wat);
  // Water treated
  $('#wb_calcium').jqxTooltip({ content: 'De ideale hoeveelheid Calcium is tussen 40 en 150.'});
- $('#wb_magnesium').jqxTooltip({ content: 'De ideale hoeveelheid Magnesium is tusse 10 en 30.'});
+ $('#wb_magnesium').jqxTooltip({ content: 'De ideale hoeveelheid Magnesium is tussen 5 en 40.'});
  $('#wb_sodium').jqxTooltip({ content: 'De ideale hoeveelheid Natrium is lager dan 150.'});
- $('#wb_chloride').jqxTooltip({ content: 'De ideale hoeveelheid Chloride is tussen 50 en 100.'});
- $('#wb_sulfate').jqxTooltip({ content: 'De ideale hoeveelheid Sulfaat is tussen 50 en 350.'});
- $('#wb_calcium,#wb_magnesium,#wb_sodium,#wb_total_alkalinity,#wb_chloride,#wb_sulfate').jqxNumberInput(Show1wat);
+ $('#wb_chloride').jqxTooltip({ content: 'De ideale hoeveelheid Chloride is tussen 50 en 150. Samen met Sulfaat minder dan 500.'});
+ $('#wb_sulfate').jqxTooltip({ content: 'De ideale hoeveelheid Sulfaat is tussen 50 en 400. Samen met Chloride minder dan 500.'});
+ $('#wb_bicarbonate').jqxTooltip({ content: '0 tot 50 lichte bieren, 50 tot 150 amber bieren, 150 tot 250 donkere bieren.'});
+ $('#wb_calcium,#wb_magnesium,#wb_sodium,#wb_bicarbonate,#wb_total_alkalinity,#wb_chloride,#wb_sulfate').jqxNumberInput(Show1wat);
  $('#wb_ph').jqxNumberInput(Show2wat);
  // Water target profile
  $('#pr_name').jqxDropDownList({
@@ -5975,7 +5992,7 @@
   theme: theme,
   source: waterprofiles,
   displayMember: 'name',
-  width: 250,
+  width: 200,
   height: 27,
   dropDownWidth: 400,
   dropDownHeight: 300
@@ -5990,10 +6007,11 @@
    $('#pr_sodium').val(datarecord.sodium);
    $('#pr_magnesium').val(datarecord.magnesium);
    $('#pr_total_alkalinity').val(datarecord.total_alkalinity);
+   $('#pr_bicarbonate').val(datarecord.total_alkalinity * 1.22);
    calcWater();
   }
  });
- $('#pr_calcium,#pr_magnesium,#pr_sodium,#pr_total_alkalinity,#pr_chloride,#pr_sulfate').jqxNumberInput(Show1wat);
+ $('#pr_calcium,#pr_magnesium,#pr_sodium,#pr_bicarbonate,#pr_total_alkalinity,#pr_chloride,#pr_sulfate').jqxNumberInput(Show1wat);
 
  // Water agents
  $('#wa_cacl2').jqxTooltip({ content: 'Voor het maken van een ander waterprofiel. Voegt calcium en chloride toe. Voor het verbeteren van zoetere bieren.' });
diff -r 12a795e8b568 -r e95744b6b31d www/prod_edit.php
--- a/www/prod_edit.php	Wed Jun 30 09:19:53 2021 +0200
+++ b/www/prod_edit.php	Wed Jun 30 23:09:31 2021 +0200
@@ -396,8 +396,7 @@
         </td>
        </tr>
        <tr>
-        <td></td>
-        <td align="left" colspan="5">
+        <td align="center" colspan="6">
          <div id='water_totals'>
           <table style="width: 100%;">
            <caption>Water overzicht</caption>
@@ -405,9 +404,10 @@
             <td align="left" style="vertical-align: top; padding: 3px;">Water profiel</td>
             <td style="width: 97px; padding: 3px;">Volume</td>
             <td style="width: 77px; padding: 3px;">Ca</td>
-            <td style="width: 77px; padding: 3px;">Mg</td>
+	    <td style="width: 77px; padding: 3px;">Mg</td>
+            <td style="width: 77px; padding: 3px;">HCO3</td>
+	    <td style="width: 77px; padding: 3px;">CaCO3</td>
             <td style="width: 77px; padding: 3px;">Na</td>
-            <td style="width: 77px; padding: 3px;">CaCO3</td>
             <td style="width: 77px; padding: 3px;">Cl</td>
             <td style="width: 77px; padding: 3px;">SO4</td>
             <td style="width: 77px; padding: 3px;">pH</td>
@@ -416,9 +416,10 @@
             <td><div id="w1_name"></div></td>
             <td><div id="w1_amount"></div></td>
             <td><div id="w1_calcium"></div></td>
-            <td><div id="w1_magnesium"></div></td>
+	    <td><div id="w1_magnesium"></div></td>
+	    <td><div id="w1_bicarbonate"></div></td>
+            <td><div id="w1_total_alkalinity"></div></td>
             <td><div id="w1_sodium"></div></td>
-            <td><div id="w1_total_alkalinity"></div></td>
             <td><div id="w1_chloride"></div></td>
             <td><div id="w1_sulfate"></div></td>
             <td><div id="w1_ph"></div></td>
@@ -427,9 +428,10 @@
             <td><div id="w2_name"></div></td>
             <td><div id="w2_amount"></div></td>
             <td><div id="w2_calcium"></div></td>
-            <td><div id="w2_magnesium"></div></td>
+	    <td><div id="w2_magnesium"></div></td>
+            <td><div id="w2_bicarbonate"></div></td>
+	    <td><div id="w2_total_alkalinity"></div></td>
             <td><div id="w2_sodium"></div></td>
-            <td><div id="w2_total_alkalinity"></div></td>
             <td><div id="w2_chloride"></div></td>
             <td><div id="w2_sulfate"></div></td>
             <td><div id="w2_ph"></div></td>
@@ -438,9 +440,10 @@
             <td style="vertical-align: top; padding: 3px; float: left;">Gemengd water:</td>
             <td><div id="wg_amount"></div></td>
             <td><div id="wg_calcium"></div></td>
-            <td><div id="wg_magnesium"></div></td>
+	    <td><div id="wg_magnesium"></div></td>
+            <td><div id="wg_bicarbonate"></div></td>
+	    <td><div id="wg_total_alkalinity"></div></td>
             <td><div id="wg_sodium"></div></td>
-            <td><div id="wg_total_alkalinity"></div></td>
             <td><div id="wg_chloride"></div></td>
             <td><div id="wg_sulfate"></div></td>
             <td><div id="wg_ph"></div></td>
@@ -449,9 +452,10 @@
             <td style="vertical-align: top; padding: 3px; float: left;">Behandeld water:</td>
             <td><div></div></td>
             <td><div id="wb_calcium"></div></td>
-            <td><div id="wb_magnesium"></div></td>
+	    <td><div id="wb_magnesium"></div></td>
+            <td><div id="wb_bicarbonate"></div></td>
+	    <td><div id="wb_total_alkalinity"></div></td>
             <td><div id="wb_sodium"></div></td>
-            <td><div id="wb_total_alkalinity"></div></td>
             <td><div id="wb_chloride"></div></td>
             <td><div id="wb_sulfate"></div></td>
             <td><div id="wb_ph"></div></td>
@@ -461,8 +465,9 @@
             <td><div></div></td>
             <td><div id="wr_calcium"></div></td>
             <td><div id="wr_magnesium"></div></td>
+            <td><div id="wr_bicarbonate"></div></td>
+	    <td><div id="wr_total_alkalinity"></div></td>
             <td><div id="wr_sodium"></div></td>
-            <td><div id="wr_total_alkalinity"></div></td>
             <td><div id="wr_chloride"></div></td>
             <td><div id="wr_sulfate"></div></td>
             <td><div id="wr_ph"></div></td>
@@ -472,8 +477,9 @@
             <td><div></div></td>
             <td><div id="pr_calcium"></div></td>
             <td><div id="pr_magnesium"></div></td>
+            <td><div id="pr_bicarbonate"></div></td>
+	    <td><div id="pr_total_alkalinity"></div></td>
             <td><div id="pr_sodium"></div></td>
-            <td><div id="pr_total_alkalinity"></div></td>
             <td><div id="pr_chloride"></div></td>
             <td><div id="pr_sulfate"></div></td>
             <td></td>