Mercurial > bms / file diff

--- a/www/rec_edit.php	Wed Aug 03 20:58:18 2022 +0200
+++ b/www/rec_edit.php	Thu Aug 04 20:04:52 2022 +0200
@@ -194,7 +194,8 @@
  	   <table style="width: 100%;">
             <caption>Water overzicht</caption>
 	    <tr>
-             <td align="left" style="vertical-align: top; padding: 3px;">Water profiel</td>
+	     <td align="left" style="vertical-align: top; padding: 3px;">Water profiel</td>
+             <td style="width: 50px; padding: 3px;">Spoel</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>
@@ -203,10 +204,13 @@
              <td style="width: 77px; padding: 3px;">Na</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>
+	     <td style="width: 77px; padding: 3px;">pH</td>
+	     <td style="width: 77px; padding: 3px;">Hardheid</td>
+             <td style="width: 77px; padding: 3px;">RA</td>
 	    </tr>
 	    <tr>
-             <td><div id="w1_name"></div></td>
+	     <td><input readonly="1" id="w1_name" /></td>
+             <td><div style='margin-left: 10px;' id='w1_button'></div></td>
              <td><div id="w1_amount"></div></td>
              <td><div id="w1_calcium"></div></td>
              <td><div id="w1_magnesium"></div></td>
@@ -215,10 +219,13 @@
              <td><div id="w1_sodium"></div></td>
              <td><div id="w1_chloride"></div></td>
              <td><div id="w1_sulfate"></div></td>
-             <td><div id="w1_ph"></div></td>
+	     <td><div id="w1_ph"></div></td>
+	     <td><div id="w1_hardness"></div></td>
+             <td><div id="w1_ra"></div></td>
             </tr>
 	    <tr>
-             <td><div id="w2_name"></div></td>
+	     <td><input readonly="1" id="w2_name" /></td>
+             <td><div style='margin-left: 10px;' id='w2_button'></div></td>
              <td><div id="w2_amount"></div></td>
              <td><div id="w2_calcium"></div></td>
              <td><div id="w2_magnesium"></div></td>
@@ -227,10 +234,13 @@
              <td><div id="w2_sodium"></div></td>
              <td><div id="w2_chloride"></div></td>
              <td><div id="w2_sulfate"></div></td>
-             <td><div id="w2_ph"></div></td>
+	     <td><div id="w2_ph"></div></td>
+             <td><div id="w2_hardness"></div></td>
+             <td><div id="w2_ra"></div></td>
             </tr>
             <tr>
 	     <td style="vertical-align: top; padding: 3px; float: left;">Gemengd water:</td>
+             <td><div style='margin-left: 10px;' id='wg_button'></div></td>
              <td><div id="wg_amount"></div></td>
              <td><div id="wg_calcium"></div></td>
              <td><div id="wg_magnesium"></div></td>
@@ -239,10 +249,13 @@
              <td><div id="wg_sodium"></div></td>
              <td><div id="wg_chloride"></div></td>
 	     <td><div id="wg_sulfate"></div></td>
-             <td><div id="wg_ph"></div></td>
+	     <td><div id="wg_ph"></div></td>
+             <td><div id="wg_hardness"></div></td>
+             <td><div id="wg_ra"></div></td>
             </tr>
             <tr>
-	     <td style="vertical-align: top; padding: 3px; float: left;">Behandeld water:</td>
+	     <td style="vertical-align: top; padding: 3px; float: left;">Behandeld maisch water:</td>
+             <td></td>
              <td><div></div></td>
              <td><div id="wb_calcium"></div></td>
              <td><div id="wb_magnesium"></div></td>
@@ -251,11 +264,14 @@
              <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>
+	     <td><div id="wb_ph"></div></td>
+             <td><div id="wb_hardness"></div></td>
+             <td><div id="wb_ra"></div></td>
 	    </tr>
             <tr>
-             <td style="vertical-align: top; padding: 3px; float: left;">Resultaat:</td>
-             <td><div></div></td>
+	     <td style="vertical-align: top; padding: 3px; float: left;">Resultaat:</td>
+             <td></td>
+	     <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>
@@ -263,19 +279,24 @@
              <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>
+	     <td><div id="wr_ph"></div></td>
+             <td></td>
+             <td></td>
             </tr>
 	    <tr>
-             <td><div id="pr_name"></div></td>
-             <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_chloride"></div></td>
-             <td><div id="pr_sulfate"></div></td>
+	     <td style="vertical-align: top; padding: 3px; float: left;">Behandeld spoelwater:</td>
              <td></td>
+             <td><div id="sw_amount"></div></td>
+             <td><div id="sw_calcium"></div></td>
+             <td><div id="sw_magnesium"></div></td>
+             <td><div id="sw_bicarbonate"></div></td>
+	     <td><div id="sw_total_alkalinity"></div></td>
+             <td><div id="sw_sodium"></div></td>
+             <td><div id="sw_chloride"></div></td>
+             <td><div id="sw_sulfate"></div></td>
+	     <td><div id="sw_ph"></div></td>
+             <td><div id="sw_hardness"></div></td>
+             <td><div id="sw_ra"></div></td>
             </tr>
            </table>
 	  </div>
@@ -322,8 +343,10 @@
         <tr>
          <td style="vertical-align: top; float: right; padding: 3px;">NaCl gr:</td>
 	 <td style="padding: 3px;"><div id="wa_nacl"></div></td>
-         <td style="padding: 3px;"><div style="float: left;" id="ss_nacl"></div></td>
-	 <td colspan="3"></td>
+	 <td style="padding: 3px;"><div style="float: left;" id="ss_nacl"></div></td>
+	 <td style="vertical-align: top; float: right; padding: 3px;">Voor koken pH:</td>
+         <td style="padding: 3px;"><div id="preboil_ph"></div></td>
+	 <td></td>
 	 <td style="vertical-align: top; float: right; padding: 3px;">Zuur hoeveelheid:</td>
          <td style="padding: 3px;"><div style="float: left;" id="wa_acid"></div></td>
          <td></td>
@@ -340,8 +363,7 @@
 	<tr>
          <td style="vertical-align: top; float: right; padding: 3px;">NaHCO3 gr:</td>
 	 <td style="padding: 3px;"><div id="wa_nahco3"></div></td>
-	 <td></td>
-	 <td colspan="3"></td>
+	 <td colspan="4"></td>
          <td style="vertical-align: top; float: right; padding: 3px;">Aanzuren met:</td>
          <td style="padding: 3px;"><input readonly="1" id="sparge_acid_type" /></td>
 	 <td style="padding: 3px;"><div id="sparge_acid_perc"></div></td>
@@ -349,10 +371,7 @@
 	<tr>
          <td style="vertical-align: top; float: right; padding: 3px;">CaCO3 gr:</td>
 	 <td style="padding: 3px;"><div id="wa_caco3"></div></td>
-	 <td></td>
- <td style="vertical-align: top; float: right; padding: 3px;">Spoelwater bron:</td>
-         <td style="padding: 3px;"><div id="sparge_source"></div></td>
-         <td></td>
+	 <td colspan="4"></td>
          <td style="vertical-align: top; float: right; padding: 3px;">Zuur hoeveelheid:</td>
 	 <td style="padding: 3px;"><div id="sparge_acid_amount"></div></td>
          <td></td>
@@ -364,6 +383,5 @@
    </div> <!-- jqxTabs -->
 
 <?php
-confirm_delete();
 page_footer();
 ?>