# HG changeset patch
# User Michiel Broek <mbroek@mbse.eu>
# Date 1542317769 -3600
# Node ID 22c277be7e7e187d7cf989d94ab6dbfab999feff
# Parent  107c12c3e49dddff99174961202120db12b03c3b
Don't count sugar for preboil gravity.

diff -r 107c12c3e49d -r 22c277be7e7e www/js/rec_edit.js
--- a/www/js/rec_edit.js	Thu Nov 15 22:22:51 2018 +0100
+++ b/www/js/rec_edit.js	Thu Nov 15 22:36:09 2018 +0100
@@ -45,6 +45,8 @@
 $(document).ready(function () {
 
 	var	preboil_sg = 0;
+	var	sugarsm = 0;	// Sugars after mash
+	var	sugarsf = 0;	// Sugars after boil
 	var     psugar = 0;     // Percentage real sugars
 	var     pcara = 0;      // Percentage cara/crystal malts
 
@@ -57,13 +59,12 @@
 
 	function calcFermentables() {
 		console.log("calcFermentables()");
-
-//		var rows = $('#fermentableGrid').jqxGrid('getrows');
+		sugarsf = 0;	// Sugar weight
+		sugarsm = 0;
+		psugar = 0;	// Percentage real sugars
+		pcara = 0;	// Percentage cara/crystal malts
 
 		var rows = $('#fermentableGrid').jqxGrid('getboundrows');
-		var	sugars = 0;	// Sugar weight
-		psugar = 0;	// Percentage real sugars
-		pcara = 0;	// Percentage cara/crystal malts
 		for (var i = 0; i < rows.length; i++) {
 			var row = rows[i];
 			if (row.f_type == "Sugar")
@@ -71,14 +72,15 @@
 			if (row.f_type == "Crystal")
 				pcara += row.f_percentage;
 			var d = row.f_amount * (row.f_yield / 100) * (1 - row.f_moisture / 100);
-			if (row.f_added == "Mash")
+			if (row.f_added == "Mash") {
 				d = parseFloat($("#efficiency").jqxNumberInput('decimal')) / 100 * d;
-			sugars += d;
-//			console.log("suikers: " + sugars + "  suiker%:" + psugar + "  cara%: " + pcara);
+				sugarsm += d;
+			}
+			sugarsf += d;
 			// colorw here too
 		}
-		$('#est_og').val(estimate_sg(sugars, parseFloat($("#batch_size").jqxNumberInput('decimal'))));
-		preboil_sg = estimate_sg(sugars, parseFloat($("#boil_size").jqxNumberInput('decimal')));
+		$('#est_og').val(estimate_sg(sugarsf, parseFloat($("#batch_size").jqxNumberInput('decimal'))));
+		preboil_sg = estimate_sg(sugarsm, parseFloat($("#boil_size").jqxNumberInput('decimal')));
 	};
 
 	function calcInit () {
@@ -88,7 +90,6 @@
 		$('#batch_size').on('change', function (event) { calcFermentables(); });
 		$('#boil_time').on('change', function (event) { calcFermentables(); });
 		$('#fermentableGrid').on('change', function (event) { calcFermentables(); });
-		// calcFermentables();
 	};
 
 	// Styles dropdown list