# HG changeset patch
# User Michiel Broek <mbroek@mbse.eu>
# Date 1561036889 -7200
# Node ID 3df93a77cd1dfb2fe8c7f540ca64840911e44c04
# Parent  99a7f2a6976edcf8c04940acc65ae0b843503bf7
Added bottle and kegs priming water fields and calculations.

diff -r 99a7f2a6976e -r 3df93a77cd1d www/js/prod_edit.js
--- a/www/js/prod_edit.js	Thu Jun 20 13:55:12 2019 +0200
+++ b/www/js/prod_edit.js	Thu Jun 20 15:21:29 2019 +0200
@@ -1870,7 +1870,13 @@
 		}
 		$("#bottle_priming_amount").val(Math.round(dataRecord.bottle_priming_amount * 10) / 10);
                 $("#bottle_priming_total").val(dataRecord.bottle_priming_total);
-                $("#bottle_abv").val(Math.round((ABV + dataRecord.bottle_priming_amount * 0.47 / 7.907) * 10) / 10);
+		var pabv = ABV + dataRecord.bottle_priming_amount * 0.47 / 7.907;
+		var pvol = dataRecord.bottle_amount - (pabv * dataRecord.bottle_amount) / 100;
+		var talc = dataRecord.bottle_amount - pvol;
+                var tvol = pvol + dataRecord.bottle_priming_water;
+                var babv = Math.round(talc / (tvol + talc) * 10000) / 100;
+		//console.log("bottle pabv:"+pabv+" pvol:"+pvol+" wvol:"+dataRecord.bottle_priming_water+" tvol:"+tvol+" talc:"+talc+" abv:"+babv);
+                $("#bottle_abv").val(babv);
 		$("#bottle_pressure").val(GetPressure(dataRecord.bottle_carbonation, TSec, dataRecord.bottle_carbonation_temp));
 
 		// Kegs
@@ -1892,10 +1898,20 @@
 					$("#fermentableGrid").jqxGrid('setcellvalue', i, 'f_amount', dataRecord.keg_priming_total / 1000);
 				}
 			}
+			$("#keg_priming_amount").val(Math.round(dataRecord.keg_priming_amount * 10) / 10);
+			$("#keg_priming_total").val(dataRecord.keg_priming_total);
+			var pabv = ABV + dataRecord.keg_priming_amount * 0.47 / 7.907;
+			var pvol = dataRecord.keg_amount - (pabv * dataRecord.keg_amount) / 100;
+			var talc = dataRecord.keg_amount - pvol;
+			var tvol = pvol + dataRecord.keg_priming_water;
+			var kabv = Math.round(talc / (tvol + talc) * 10000) / 100;
+			//console.log("kegs  pabv:"+pabv+" pvol:"+pvol+" wvol:"+dataRecord.keg_priming_water+" tvol:"+tvol+" talc:"+talc+" abv:"+kabv);
+			$("#keg_abv").val(kabv);
+		} else {
+			$("#keg_priming_amount").val(0);
+			$("#keg_priming_total").val(0);
+			$("#keg_abv").val(ABV);
 		}
-		$("#keg_priming_amount").val(Math.round(dataRecord.keg_priming_amount * 10) / 10);
-		$("#keg_priming_total").val(dataRecord.keg_priming_total);
-		$("#keg_abv").val(Math.round((ABV + dataRecord.keg_priming_amount * 0.47 / 7.907) * 10) / 10);
 	}
 
 	function calcStage() {
@@ -2055,7 +2071,13 @@
 			$("#fg").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
 			$("#final_brix").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
 			$("#package_date").jqxDateTimeInput({ disabled: true });
+			$("#package_volume").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
+			$("#package_infuse_amount").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
+			$("#package_infuse_abv").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
+			$("#package_infuse_notes").jqxInput({ disabled: true });
 			$("#bottle_amount").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
+			$("#bottle_priming_water").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
+			$("#keg_priming_water").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
 			$("#keg_amount").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
 			$("#bottle_carbonation").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
 			$("#keg_carbonation").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
@@ -2441,6 +2463,10 @@
 			$('#keg_amount').val(parseFloat(dataRecord.keg_amount));
 			calcCarbonation();
 		});
+		$("#bottle_priming_water").on('change', function (event) {
+			dataRecord.bottle_priming_water = parseFloat(event.args.value);
+			calcCarbonation();
+		});
 		$('#keg_amount').on('change', function (event) {
 			var vnew = parseFloat(event.args.value);
 			var vtot = dataRecord.package_volume + dataRecord.package_infuse_amount;
@@ -2453,6 +2479,10 @@
 			$('#keg_amount').val(parseFloat(dataRecord.keg_amount));
 			calcCarbonation();
 		});
+		$("#keg_priming_water").on('change', function (event) {
+			dataRecord.keg_priming_water = parseFloat(event.args.value);
+			calcCarbonation();
+		});
 		$('#bottle_carbonation').on('change', function (event) {
 			dataRecord.bottle_carbonation = parseFloat(event.args.value);
 			calcCarbonation();