Mercurial > bms / file diff

--- a/www/rec_edit.php	Mon Dec 17 22:24:32 2018 +0100
+++ b/www/rec_edit.php	Wed Dec 19 21:58:21 2018 +0100
@@ -12,8 +12,8 @@
       <li>Hoppen</li>
       <li>Diversen</li>
       <li>Gist</li>
+      <li>Maischen</li>
       <li>Water</li>
-      <li>Maischen</li>
      </ul>
 
      <div> <!-- tab algemeen -->
@@ -160,6 +160,25 @@
       </div>
      </div> <!-- tab gisten -->
 
+     <div> <!-- tab maischen -->
+      <div style="overflow: hidden;">
+       <table style="width: 100%;">
+        <tr>
+         <td style="vertical-align: top; float: right; padding: 3px;">Maischchema:</td>
+         <td align="left" style="vertical-align: top; padding: 3px;"><input id="mash_name" /></td>
+         <td style="vertical-align: top; float: right; padding: 3px;">Maish pH:</td>
+         <td style="padding: 3px;"><div id="mash_ph"></div></td>
+         <td style="vertical-align: top; float: right; padding: 3px;">Spoelwater temp:</td>
+         <td style="padding: 3px;"><div id="sparge_temp"></div></td>
+        </tr>
+        <tr>
+         <td align="right" style="vertical-align: top; padding: 3px;">Stappen:</td>
+         <td align="left" colspan="5" style="padding: 3px;"><div id="mashGrid">Graat</div></td>
+        </tr>
+       </table>
+      </div>
+     </div> <!-- tab maischen -->
+
      <div> <!-- tab water -->
       <div style="overflow: hidden;">
        <table style="width: 100%;">
@@ -172,18 +191,14 @@
          <td style="padding: 3px;"><div id="tgt_mash_ph"></div></td>
         </tr>
         <tr>
-         <td align="right" style="vertical-align: top;">Water:</td>
-	 <td align="left" colspan="5"><div id="waterGrid"></div></td>
-	</tr>
-        <tr>
          <td></td>
          <td align="left" colspan="5">
           <div id='water_totals'>
  	   <table style="width: 100%;">
             <caption>Water overzicht</caption>
-    	    <tr>
-	     <td></td>
-             <td style="width: 77px; padding: 3px;">Volume</td>
+	    <tr>
+             <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;">Na</td>
@@ -191,10 +206,32 @@
              <td style="width: 77px; padding: 3px;">Cl</td>
 	     <td style="width: 77px; padding: 3px;">SO4</td>
              <td style="width: 77px; padding: 3px;">pH</td>
- 	    </tr>
+	    </tr>
+	    <tr>
+             <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_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>
+            </tr>
+	    <tr>
+             <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_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>
+            </tr>
             <tr>
 	     <td style="vertical-align: top; padding: 3px; float: left;">Gemengd water:</td>
-             <td><div id="wg_volume"></div></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_sodium"></div></td>
@@ -215,6 +252,17 @@
              <td><div id="wb_ph"></div></td>
 	    </tr>
             <tr>
+             <td style="vertical-align: top; padding: 3px; float: left;">Resultaat:</td>
+             <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_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>
+            </tr>
+            <tr>
              <td style="vertical-align: top; padding: 3px; float: left;">Doel waterprofiel:</td>
              <td><div></div></td>
              <td><div id="pr_calcium"></div></td>
@@ -269,25 +317,6 @@
       </div>
      </div> <!-- tab water -->
 
-     <div> <!-- tab maischen -->
-      <div style="overflow: hidden;">
-       <table style="width: 100%;">
-	<tr>
-         <td style="vertical-align: top; float: right; padding: 3px;">Maischchema:</td>
-	 <td align="left" style="vertical-align: top; padding: 3px;"><input id="mash_name" /></td>
-         <td style="vertical-align: top; float: right; padding: 3px;">Maish pH:</td>
-	 <td style="padding: 3px;"><div id="mash_ph"></div></td>
-         <td style="vertical-align: top; float: right; padding: 3px;">Spoelwater temp:</td>
-         <td style="padding: 3px;"><div id="mash_sparge_temp"></div></td>
-        </tr>
-        <tr>
-         <td align="right" style="vertical-align: top; padding: 3px;">Stappen:</td>
-         <td align="left" colspan="5" style="padding: 3px;"><div id="mashGrid">Graat</div></td>
-        </tr>
-       </table>
-      </div>
-     </div> <!-- tab maischen -->
-
    </div> <!-- jqxTabs -->
 
 <?php