--- a/www/prod_edit.php Fri Aug 05 20:11:11 2022 +0200
+++ b/www/prod_edit.php Sat Aug 06 18:44:22 2022 +0200
@@ -356,9 +356,7 @@
<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;">Kies ander schema:</td>
- <td style="padding: 3px;"><div id="mash_select"></div></td>
+ <td colspan="3" align="left" style="vertical-align: top; padding: 3px;"><input id="mash_name" readonly /></td>
</tr>
<tr>
<td style="vertical-align: top; float: right; padding: 3px;">Volume van de maisch L:</td>
@@ -376,26 +374,13 @@
<div style="overflow: hidden;">
<table style="width: 100%;">
<tr>
- <td colspan="6">
- <table style="width: 100%;">
- <tr>
- <td style="vertical-align: top; float: right; padding: 3px;">Bitterheidsindex:</td>
- <td style="padding: 3px;"><div style="float: left;" id="tgt_bu"></div><div style="float: left; margin-left: 10px;" id="wr_bu"></div></td>
- <td style="vertical-align: top; float: right; padding: 3px;">Richtgetal SO4:Cl:</td>
- <td style="padding: 3px;"><div style="float: left;" id="tgt_so4_cl"></div><div style="float: left; margin-left: 10px;" id="wrt_so4_cl"></div></td>
- <td style="vertical-align: top; float: right; padding: 3px;">Huidig SO4:Cl:</td>
- <td style="padding: 3px;"><div style="float: left;" id="got_so4_cl"></div><div style="float: left; margin-left: 10px;" id="wr_so4_cl"></div></td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td align="center" colspan="6">
+ <td align="center" colspan="9">
<div id='water_totals'>
<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>
@@ -404,10 +389,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>
@@ -416,10 +404,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>
@@ -428,10 +419,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 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>
@@ -440,10 +434,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>
@@ -452,10 +449,13 @@
<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 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>
@@ -464,80 +464,102 @@
<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>
+ <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>
</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>
+ <th style="text-align: center;" colspan="3">Brouwzouten</th>
+ <th colspan="3"></th>
+ <th style="text-align: center;" colspan="3">Spoelwater</th>
</tr>
<tr>
- <td style="vertical-align: top; float: right; padding: 3px;">Calciumchloride (CaCl2) gr:</td>
+ <td style="vertical-align: top; float: right; padding: 3px;">CaCl2 gr:</td>
<td style="padding: 3px;"><div id="wa_cacl2"></div></td>
- <td style="vertical-align: top; float: right; padding: 3px;"><div class='c_mashph'>Maish pH:</div></td>
- <td style="padding: 3px;"><div id="mash_ph" class='c_mashph'></div></td>
- <td style="vertical-align: top; float: right; padding: 3px;">Spoelwater voorraad L:</td>
- <td style="padding: 3px;"><div id="sparge_volume"></div></td>
+ <td style="padding: 3px;"><div id="ss_cacl2"></div></td>
+ <td style="vertical-align: top; float: right; padding: 3px;">Bitterheidsindex:</td>
+ <td style="padding: 3px;"><div style="float: left;" id="tgt_bu"></div></td>
+ <td style="padding: 3px;"><div style="float: left;" id="wr_bu"></div></td>
+ <td style="vertical-align: top; float: right; padding: 3px;">Auto bereken:</td>
+ <td style="padding: 3px;"><div id="calc_acid"></div></td>
+ <td></td>
</tr>
<tr>
- <td style="vertical-align: top; float: right; padding: 3px;">Gips (CaSO4) gr:</td>
+ <td style="vertical-align: top; float: right; padding: 3px;">CaSO4 gr:</td>
<td style="padding: 3px;"><div id="wa_caso4"></div></td>
- <td style="vertical-align: top; float: right; padding: 3px;">pH Automatisch:</td>
- <td style="padding: 3px;"><div id="calc_acid"></div></td>
- <td style="vertical-align: top; float: right; padding: 3px;">Spoelwater °C:</td>
- <td style="padding: 3px;"><div id="sparge_temp"></div></td>
+ <td style="padding: 3px;"><div id="ss_caso4"></div></td>
+ <td style="vertical-align: top; float: right; padding: 3px;">Richtgetal SO4:Cl:</td>
+ <td style="padding: 3px;"><div style="float: left;" id="tgt_so4_cl"></div></td>
+ <td style="padding: 3px;"><div style="float: left;" id="wrt_so4_cl"></div></td>
+ <td style="vertical-align: top; float: right; padding: 3px;"><div class='c_mashph'>Gewenst maish pH:</div></td>
+ <td style="padding: 3px;"><div id="mash_ph" class='c_mashph'></div></td>
+ <td></td>
</tr>
<tr>
- <td style="vertical-align: top; float: right; padding: 3px;">Epsom zout (MgSO4) gr:</td>
+ <td style="vertical-align: top; float: right; padding: 3px;">MgSO4 gr:</td>
<td style="padding: 3px;"><div id="wa_mgso4"></div></td>
+ <td style="padding: 3px;"><div id="ss_mgso4"></div></td>
+ <td style="vertical-align: top; float: right; padding: 3px;">Huidig SO4:Cl:</td>
+ <td style="padding: 3px;"><div style="float: left;" id="got_so4_cl"></div></td>
+ <td style="padding: 3px;"><div style="float: left;" id="wr_so4_cl"></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>
+ <td style="padding: 3px;"><input readonly="1" id="wa_acid_name" /></td>
+ <td style="padding: 3px;"><div style="float: left;" id="wa_acid_perc"></div></td>
</tr>
<tr>
- <td style="vertical-align: top; float: right; padding: 3px;">Keukenzout (NaCl) gr:</td>
+ <td style="vertical-align: top; float: right; padding: 3px;">NaCl gr:</td>
<td style="padding: 3px;"><div id="wa_nacl"></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>
+ <td style="padding: 3px;"><div 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>
</tr>
<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>
+ <td style="vertical-align: top; float: right; padding: 3px;">MgCl2 gr:</td>
+ <td style="padding: 3px;"><div id="wa_mgcl2"></div></td>
+ <td style="padding: 3px;"><div id="ss_mgcl2"></div></td>
+ <td colspan="3"></td>
+ <td style="vertical-align: top; float: right; padding: 3px;">Gewenst spoel pH:</td>
+ <td style="padding: 3px;"><div id="sparge_ph"></div></td>
+ <td></td>
</tr>
<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="vertical-align: top; float: right; padding: 3px;">NaHCO3 gr:</td>
+ <td style="padding: 3px;"><div id="wa_nahco3"></div></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>
</tr>
<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="vertical-align: top; float: right; padding: 3px;">CaCO3 gr:</td>
+ <td style="padding: 3px;"><div id="wa_caco3"></div></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>
</tr>
</table>
</div>
@@ -913,61 +935,6 @@
</div> <!-- Tabs -->
- <div id="popupMash">
- <div>Wijzig maisch stap detail.</div>
- <div style="overflow: hidden;">
- <table style="width: 100%;">
- <tr>
- <td align="right" style="vertical-align: top;">Stap naam:</td>
- <td style="padding: 3px;" colspan="3"><input id="wstep_name" /></td>
- </tr>
- <tr>
- <td align="right" style="vertical-align: top;">Stap type:</td>
- <td style="padding: 3px;" colspan="3"><div id="wstep_type" /></div></td>
- </tr>
- <tr>
- <td align="right" style="vertical-align: top;">Start temperatuur °C:</td>
- <td style="padding: 3px;" colspan="3"><div id="wstep_temp" /></div></td>
- </tr>
- <tr>
- <td align="right" style="vertical-align: top;">Eind temperatuur °C:</td>
- <td style="padding: 3px;" colspan="3"><div id="wend_temp"></div></td>
- </tr>
- <tr>
- <td align="right" style="vertical-align: top;">Stap tijd minuten:</td>
- <td style="padding: 3px;" colspan="3"><div id="wstep_time"></div></td>
- </tr>
- <tr>
- <td align="right" style="vertical-align: top;">Opwarm tijd minuten:</td>
- <td style="padding: 3px;" colspan="3"><div id="wramp_time"></div></td>
- </tr>
- <tr>
- <td align="right" style="vertical-align: top;"><div id="wstep_pmpt_amount">Infusie liters:</div></td>
- <td style="padding: 3px;" colspan="3"><div id="wstep_infuse_amount"></div></td>
- </tr>
- <tr>
- <td align="right" style="vertical-align: top;"><div id="wstep_pmpt_temp">Infusie temperatuur:</div></td>
- <td style="padding: 3px;" colspan="3"><div id="wstep_infuse_temp"></div></td>
- </tr>
- <tr>
- <td align="right" style="vertical-align: top;">Gemeten pH:</td>
- <td style="padding: 3px;" colspan="3"><div id="wstep_ph"></div></td>
- </tr>
- <tr>
- <td align="right" style="vertical-align: top;">Gemeten SG:</td>
- <td style="padding: 3px;"><div id="wstep_sg"></div></td>
- <td style="vertical-align: top; float: right; padding: 3px;">Afgelezen °Brix RI:</td>
- <td align="left" style="vertical-align: top;"><div id="wstep_brix"></div></td>
- </tr>
- <tr>
- <td style="padding-top: 30px;" colspan="4" align="center">
- <input id="MashReady" type="button" value="Sla op" />
- </td>
- </tr>
- </table>
- </div>
- </div>
-
<div id="volumeWindow">
<div>Bereken volume in de ketel</div>
<div style="overflow: hidden;">