Mercurial > bms / changeset

--- a/www/js/prod_edit.js	Tue Feb 05 21:55:22 2019 +0100
+++ b/www/js/prod_edit.js	Tue Feb 05 23:09:52 2019 +0100
@@ -137,6 +137,7 @@
                 $('#est_og2').val(est_og);
 		$('#est_og3').val(est_og);
 		preboil_sg = estimate_sg(sugarsm, parseFloat(dataRecord.boil_size));
+		$('#est_pre_sg').val(preboil_sg);
 		var color = kw_to_ebc(dataRecord.color_method, colorw);
 		dataRecord.est_color = color;
                 $('#est_color').val(color);
@@ -1295,9 +1296,11 @@
 
 		$('#batch_size').on('change', function (event) {
 			console.log("batch_size change:"+event.args.value+" old:"+dataRecord.batch_size);
+			$("#est_a_vol").val(event.args.value * 1.04);
 			var new_boil = parseFloat(event.args.value) + dataRecord.boil_size - dataRecord.batch_size;
 			dataRecord.boil_size = new_boil;
 			$("#boil_size").val(Math.round(new_boil * 100) / 100);
+			$("#est_pre_vol").val(Math.round(new_boil * 1.04 * 100) / 100);
 			dataRecord.batch_size = parseFloat(event.args.value);
 			calcFermentablesFromOG(parseFloat($("#est_og").jqxNumberInput('decimal')));     // Keep the OG
 			calcFermentables();
@@ -1314,6 +1317,7 @@
 			var new_boil = parseFloat(dataRecord.batch_size) + new_evap;
 			dataRecord.boil_time = parseFloat(event.args.value);
 			dataRecord.boil_size = new_boil;
+			$("#est_pre_vol").val(Math.round(new_boil * 1.04 * 100) / 100);
 			$("#boil_size").val(Math.round(new_boil * 100) / 100);
 			calcFermentables();
 			calcSVG();
@@ -1484,6 +1488,7 @@
 			$("#eq_batch_size").val(datarecord.batch_size);
 			dataRecord.batch_size = datarecord.batch_size;
 			$("#batch_size").val(datarecord.batch_size);
+			$("#est_a_vol").val(datarecord.batch_size * 1.04);
 			$("#eq_tun_volume").val(datarecord.tun_volume);
 			dataRecord.eq_tun_weight = datarecord.tun_weight;
 			dataRecord.eq_tun_specific_heat = datarecord.tun_specific_heat;
@@ -1828,7 +1833,9 @@
 			$("#st_carb_max2").val(dataRecord.st_carb_max);
 			$("#type").val(dataRecord.type);
 			$("#batch_size").val(dataRecord.batch_size);
+			$("#est_a_vol").val(dataRecord.batch_size * 1.04);
 			$("#boil_size").val(dataRecord.boil_size);
+			$("#est_pre_vol").val(dataRecord.boil_size * 1.04);
 			$("#boil_time").val(dataRecord.boil_time);
 			$("#efficiency").val(dataRecord.efficiency);
 			$("#est_og").val(dataRecord.est_og);
@@ -3892,16 +3899,22 @@
 	$("#est_mash_sg").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 70, height: 23, decimalDigits: 3 });
 	$("#brew_preboil_sg").jqxTooltip({ content: 'Het gemeten SG in de kookketel na het spoelen en voor het koken.' });
 	$("#brew_preboil_sg").jqxNumberInput( SGopts );
+	$("#est_pre_sg").jqxTooltip({ content: 'Het berekende SG in de kookketel na het spoelen en voor het koken.' });
+	$("#est_pre_sg").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 70, height: 23, decimalDigits: 3 });
 	$("#brew_aboil_sg").jqxTooltip({ content: 'Het gemeten SG in de kookketel na het koken.' });
 	$("#brew_aboil_sg").jqxNumberInput( SGopts );
-	$("#est_og3").jqxTooltip({ content: 'Het geschatte SG in de kookketel na het koken.' });
+	$("#est_og3").jqxTooltip({ content: 'Het gewenste SG in de kookketel na het koken.' });
 	$("#est_og3").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 70, height: 23, decimalDigits: 3, readOnly: true });
 	$("#brew_mash_efficiency").jqxTooltip({ content: 'Het behaalde maisch rendement.' });
 	$("#brew_mash_efficiency").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 90, height: 23, decimalDigits: 1 });
 	$("#brew_preboil_volume").jqxTooltip({ content: 'Het volume van het wort voor het koken.' });
 	$("#brew_preboil_volume").jqxNumberInput( Spin1dec5 );
+	$("#est_pre_vol").jqxTooltip({ content: 'Het berekende volume van het wort voor het koken.' });
+	$("#est_pre_vol").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 70, height: 23, decimalDigits: 1 });
 	$("#brew_aboil_volume").jqxTooltip({ content: 'Het volume van het wort na het koken.' });
 	$("#brew_aboil_volume").jqxNumberInput( Spin1dec5 );
+	$("#est_a_vol").jqxTooltip({ content: 'Het gewenste volume na het koken.' });
+	$("#est_a_vol").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 70, height: 23, decimalDigits: 1 });
 	$("#brew_preboil_efficiency").jqxTooltip({ content: 'Het berekende rendement voor het koken.' });
 	$("#brew_preboil_efficiency").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 90, height: 23, decimalDigits: 1 });
 	$("#brew_aboil_efficiency").jqxTooltip({ content: 'Het bereikte rendement na het koken.' });

--- a/www/prod_edit.php	Tue Feb 05 21:55:22 2019 +0100
+++ b/www/prod_edit.php	Tue Feb 05 23:09:52 2019 +0100
@@ -446,7 +446,7 @@
        <td style="vertical-align: top; float: right;">Maisch SG:</td>
        <td><div style="float: left;" id="brew_mash_sg"></div><div style="float: left; margin-left: 15px;" id="est_mash_sg"></div></td>
        <td style="vertical-align: top; float: right;">SG voor koken:</td>
-       <td><div id="brew_preboil_sg"></div></td>
+       <td><div style="float: left;" id="brew_preboil_sg"></div><div style="float: left; margin-left: 15px;" id="est_pre_sg"></div></td>
        <td style="vertical-align: top; float: right;">SG na koken:</td>
        <td><div style="float: left;" id="brew_aboil_sg"></div><div style="float: left; margin-left: 15px;" id="est_og3"></div></td>
       </tr>
@@ -454,9 +454,9 @@
        <td style="vertical-align: top; float: right;">Maisch rendement:</td>
        <td><div id="brew_mash_efficiency"></div></td>
        <td style="vertical-align: top; float: right;">Volume voor koken:</td>
-       <td><div id="brew_preboil_volume"></div></td>
+       <td><div style="float: left;" id="brew_preboil_volume"></div><div style="float: left; margin-left: 15px;" id="est_pre_vol"></div></td>
        <td style="vertical-align: top; float: right;">Volume na koken:</td>
-       <td><div id="brew_aboil_volume"></div></td>
+       <td><div style="float: left;" id="brew_aboil_volume"></div><div style="float: left; margin-left: 15px;" id="est_a_vol"></div></td>
       </tr>
       <tr>
        <td colspan="2"> </td>