# HG changeset patch
# User Michiel Broek <mbroek@mbse.eu>
# Date 1551710014 -3600
# Node ID 454851b335addd132ec6aee1c1544df8b2e335f6
# Parent  82c3bb9a40c272ba7e17d1e3d21499efe54fc4e6
Better handling of efficience and est_og changes.

diff -r 82c3bb9a40c2 -r 454851b335ad www/js/prod_edit.js
--- a/www/js/prod_edit.js	Mon Mar 04 14:20:48 2019 +0100
+++ b/www/js/prod_edit.js	Mon Mar 04 15:33:34 2019 +0100
@@ -2131,23 +2131,29 @@
 			var old_evap = parseFloat(dataRecord.boil_size) - parseFloat(dataRecord.batch_size);
 			var new_evap = old_evap * (parseFloat(event.args.value) / dataRecord.boil_time);
 			var new_boil = parseFloat(dataRecord.batch_size) + new_evap;
-			var factor = new_boil / dataRecord.boil_size;
+			//var factor = new_boil / dataRecord.boil_size;
 			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();
 			calcIBUs();
+			calcYeast();
 		});
 		$('#efficiency').on('change', function (event) {
-			console.log("efficiency change:"+event.args.value);
+			var estog = parseFloat($("#est_og").jqxNumberInput('decimal'));
+			dataRecord.efficiency = parseFloat(event.args.value);
+			console.log("efficiency change:"+dataRecord.efficiency+" est_og:"+estog);
+			calcFermentablesFromOG(estog);     // Keep the OG
 			calcFermentables();
 			calcIBUs();
+			calcYeast();
 		});
 		$('#est_og').on('change', function (event) {
-			console.log("est_og change:"+event.args.value);
-			$('#est_og2').val(event.args.value);
-			calcFermentablesFromOG(event.args.value);       // Adjust fermentables amounts
+			dataRecord.est_og = parseFloat(event.args.value);
+			console.log("est_og change:"+dataRecord.est_og);
+			$('#est_og2').val(dataRecord.est_og);
+			calcFermentablesFromOG(dataRecord.est_og);	// Adjust fermentables amounts
 			calcFermentables();                             // Update the recipe details
 			calcIBUs();                                     // and the IBU's.
 			calcYeast();
diff -r 82c3bb9a40c2 -r 454851b335ad www/js/rec_edit.js
--- a/www/js/rec_edit.js	Mon Mar 04 14:20:48 2019 +0100
+++ b/www/js/rec_edit.js	Mon Mar 04 15:33:34 2019 +0100
@@ -1325,13 +1325,17 @@
 			calcIBUs();
 		});
 		$('#efficiency').on('change', function (event) {
-			console.log("efficiency change:"+event.args.value);
+			var estog = parseFloat($("#est_og").jqxNumberInput('decimal'));
+			dataRecord.efficiency = parseFloat(event.args.value);
+			console.log("efficiency change:"+dataRecord.efficiency);
+			calcFermentablesFromOG(estog);     // Keep the OG
 			calcFermentables();
 			calcIBUs();
 		});
 		$('#est_og').on('change', function (event) {
-			console.log("est_og change:"+event.args.value);
-			calcFermentablesFromOG(event.args.value);       // Adjust fermentables amounts
+			dataRecord.est_og = parseFloat(event.args.value);
+			console.log("est_og change:"+dataRecord.est_og);
+			calcFermentablesFromOG(dataRecord.est_og);      // Adjust fermentables amounts
 			calcFermentables();                             // Update the recipe details
 			calcIBUs();                                     // and the IBU's.
 		});