Mercurial > bms / file diff

--- a/www/rec_edit.php	Sun Jul 11 15:55:44 2021 +0200
+++ b/www/rec_edit.php	Wed Jul 14 20:51:45 2021 +0200
@@ -207,8 +207,7 @@
          </table>
         </td>
         <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>
@@ -216,9 +215,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>
@@ -228,8 +228,9 @@
              <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_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>
@@ -239,8 +240,9 @@
              <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_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>
@@ -250,8 +252,9 @@
              <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_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>
@@ -261,9 +264,10 @@
              <td><div></div></td>
              <td><div id="wb_calcium"></div></td>
              <td><div id="wb_magnesium"></div></td>
-             <td><div id="wb_sodium"></div></td>
+             <td><div id="wb_bicarbonate"></div></td>
              <td><div id="wb_total_alkalinity"></div></td>
-             <td><div id="wb_chloride"></div></td>
+             <td><div id="wb_sodium"></div></td>
+	     <td><div id="wb_chloride"></div></td>
 	     <td><div id="wb_sulfate"></div></td>
              <td><div id="wb_ph"></div></td>
 	    </tr>
@@ -272,9 +276,10 @@
              <td><div></div></td>
              <td><div id="wr_calcium"></div></td>
              <td><div id="wr_magnesium"></div></td>
-             <td><div id="wr_sodium"></div></td>
+             <td><div id="wr_bicarbonate"></div></td>
              <td><div id="wr_total_alkalinity"></div></td>
-             <td><div id="wr_chloride"></div></td>
+             <td><div id="wr_sodium"></div></td>
+	     <td><div id="wr_chloride"></div></td>
              <td><div id="wr_sulfate"></div></td>
              <td><div id="wr_ph"></div></td>
             </tr>
@@ -283,8 +288,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>
@@ -293,6 +299,11 @@
 	  </div>
          </td>
 	</tr>
+       <tr>
+        <th style="text-align: center;" colspan="2">Brouwzouten</th>
+        <th style="text-align: center;" colspan="2">Maischwater pH</th>
+        <th style="text-align: center;" colspan="2">Spoelwater</th>
+       </tr>
         <tr>
          <td style="vertical-align: top; float: right; padding: 3px;">Calciumchloride (CaCl2) gr:</td>
 	 <td style="padding: 3px;"><div id="wa_cacl2"></div></td>
@@ -312,31 +323,36 @@
         <tr>
          <td style="vertical-align: top; float: right; padding: 3px;">Epsom zout (MgSO4) gr:</td>
 	 <td style="padding: 3px;"><div id="wa_mgso4"></div></td>
-         <td style="vertical-align: top; float: right; padding: 3px;">Ontzuren met:</td>
-         <td style="padding: 3px;"><div style="float: left;" id="wa_base_name"></div><div style="float: left; margin-left: 15px;" id="wa_base"></div></td>
+         <td style="vertical-align: top; float: right; padding: 3px;">Aanzuren met:</td>
+         <td style="padding: 3px;"><div style="float: left;" id="wa_acid_name"></div><div style="float: left; margin-left: 15px;" id="wa_acid"></div><div style="float: left; margin-left: 15px;" id="wa_acid_perc"></div></td>
          <td style="vertical-align: top; float: right; padding: 3px;">Spoelwater bron:</td>
          <td style="padding: 3px;"><div id="sparge_source"></div></td>
 	</tr>
         <tr>
          <td style="vertical-align: top; float: right; padding: 3px;">Keukenzout (NaCl) gr:</td>
 	 <td style="padding: 3px;"><div id="wa_nacl"></div></td>
-         <td style="vertical-align: top; float: right; padding: 3px;">Aanzuren met:</td>
-	 <td style="padding: 3px;"><div style="float: left;" id="wa_acid_name"></div><div style="float: left; margin-left: 15px;" id="wa_acid"></div><div style="float: left; margin-left: 15px;" id="wa_acid_perc"></div></td>
+         <td colspan="2"></td>
          <td style="vertical-align: top; float: right; padding: 3px;">Spoelwater pH:</td>
          <td style="padding: 3px;"><div id="sparge_ph"></div></td>
 	</tr>
-        <tr>
-         <td colspan="4"></td>
+	<tr>
+         <td style="vertical-align: top; float: right; padding: 3px;">Magnesiumchloride (MgCl2) gr:</td>
+         <td style="padding: 3px;"><div id="wa_mgcl2"></div></td>
+         <td colspan="2"></td>
          <td style="vertical-align: top; float: right; padding: 3px;">Aanzuren met:</td>
 	 <td style="padding: 3px;"><div id="sparge_acid_type"></div></td>
         </tr>
-        <tr>
-         <td colspan="4"></td>
+	<tr>
+         <td style="vertical-align: top; float: right; padding: 3px;">Baksoda (NaHCO3) gr:</td>
+         <td style="padding: 3px;"><div id="wa_nahco3"></div></td>
+         <td colspan="2"></td>
          <td style="vertical-align: top; float: right; padding: 3px;">Sterkte %:</td>
          <td style="padding: 3px;"><div id="sparge_acid_perc"></div></td>
         </tr>
-        <tr>
-         <td colspan="4"></td>
+	<tr>
+         <td style="vertical-align: top; float: right; padding: 3px;">Kalk (CaCO3) gr:</td>
+         <td style="padding: 3px;"><div id="wa_caco3"></div></td>
+         <td colspan="2"></td>
          <td style="vertical-align: top; float: right; padding: 3px;">Benodigd:</td>
          <td style="padding: 3px;"><div id="sparge_acid_amount"></div></td>
         </tr>