Mercurial > bms / file diff

--- 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>