Mercurial > bms / changeset

--- a/www/js/prod_edit.js	Mon Feb 11 15:26:29 2019 +0100
+++ b/www/js/prod_edit.js	Mon Feb 11 16:03:59 2019 +0100
@@ -483,6 +483,7 @@
 			$("#w1_amount").val(dataRecord.w1_amount);
 			$("#w2_amount").val(dataRecord.w2_amount);
 		}
+		$('#wg_amount').val(mash_infuse);
 	};
 
 
@@ -3941,6 +3942,16 @@
 			if (row.step_type == 0) // Infusion
 				mash_infuse += parseFloat(row.step_infuse_amount);
 		}
+		if (dataRecord.w2_amount == 0) {
+			dataRecord.w1_amount = mash_infuse;
+			$("#w1_amount").val(mash_infuse);
+		} else {
+			dataRecord.w1_amount = (dataRecord.w1_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse;
+			dataRecord.w2_amount = (dataRecord.w2_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse;
+			$("#w1_amount").val(dataRecord.w1_amount);
+			$("#w2_amount").val(dataRecord.w2_amount);
+		}
+		$('#wg_amount').val(mash_infuse);
 	});
 
 	// Tab 8, Water

--- a/www/js/rec_edit.js	Mon Feb 11 15:26:29 2019 +0100
+++ b/www/js/rec_edit.js	Mon Feb 11 16:03:59 2019 +0100
@@ -427,6 +427,7 @@
 			$("#w1_amount").val(dataRecord.w1_amount);
 			$("#w2_amount").val(dataRecord.w2_amount);
 		}
+		$('#wg_amount').val(mash_infuse);
 	};
 
 /*	function GetBUGUMin() {
@@ -3334,6 +3335,16 @@
 			if (row.step_type == 0) // Infusion
 				mash_infuse += parseFloat(row.step_infuse_amount);
 		}
+		if (dataRecord.w2_amount == 0) {
+			dataRecord.w1_amount = mash_infuse;
+			$("#w1_amount").val(mash_infuse);
+		} else {
+			dataRecord.w1_amount = (dataRecord.w1_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse;
+			dataRecord.w2_amount = (dataRecord.w2_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse;
+			$("#w1_amount").val(dataRecord.w1_amount);
+			$("#w2_amount").val(dataRecord.w2_amount);
+		}
+		$('#wg_amount').val(mash_infuse);
 	});
 
 	// Tab 7, Water