Mercurial > bms / file diff

--- a/www/js/prod_edit.js	Sun Aug 25 14:04:25 2019 +0200
+++ b/www/js/prod_edit.js	Mon Aug 26 16:01:27 2019 +0200
@@ -1764,16 +1764,23 @@
 	}
 
 function calcFermentation(){
-if(dataRecord.brew_fermenter_sg<1.020)return;
-var obrix=sg_to_brix(dataRecord.brew_fermenter_sg);
-if ((dataRecord.primary_end_sg>0.990)&&(dataRecord.primary_end_sg<dataRecord.brew_fermenter_sg)){
-var primary_svg=Round(100*(dataRecord.brew_fermenter_sg-dataRecord.primary_end_sg)/(dataRecord.brew_fermenter_sg-1),1);
-$("#primary_svg").val(primary_svg);
-if((dataRecord.fg>0.990)&&(dataRecord.fg<dataRecord.brew_fermenter_sg)){
-var final_svg=Round(100*(dataRecord.brew_fermenter_sg-dataRecord.fg)/(dataRecord.brew_fermenter_sg-1),1);
-$("#final_svg").val(final_svg);
-var ABV=Round(abvol(dataRecord.brew_fermenter_sg,dataRecord.fg),2);
-$("#final_abv").val(ABV);}}}
+	if(dataRecord.brew_fermenter_sg<1.020)return;
+	var obrix=sg_to_brix(dataRecord.brew_fermenter_sg);
+	if ((dataRecord.primary_end_sg>0.990)&&(dataRecord.primary_end_sg<dataRecord.brew_fermenter_sg)){
+		var primary_svg=Round(100*(dataRecord.brew_fermenter_sg-dataRecord.primary_end_sg)/(dataRecord.brew_fermenter_sg-1),1);
+		$("#primary_svg").val(primary_svg);
+		if((dataRecord.secondary_end_sg>0.990)&&(dataRecord.secondary_end_sg<dataRecord.brew_fermenter_sg)){
+			var secondary_svg=Round(100*(dataRecord.brew_fermenter_sg-dataRecord.secondary_end_sg)/(dataRecord.brew_fermenter_sg-1),1);
+			$("#secondary_svg").val(secondary_svg);
+			if((dataRecord.fg>0.990)&&(dataRecord.fg<dataRecord.brew_fermenter_sg)){
+				var final_svg=Round(100*(dataRecord.brew_fermenter_sg-dataRecord.fg)/(dataRecord.brew_fermenter_sg-1),1);
+				$("#final_svg").val(final_svg);
+				var ABV=Round(abvol(dataRecord.brew_fermenter_sg,dataRecord.fg),2);
+				$("#final_abv").val(ABV);
+			}
+		}
+	}
+}
 
 	function ResCO2(CO2, T) {
 		//var resco2 = 0.000849151 * T * T - 0.0587512 * T + 1.71137; // brouwhulp
@@ -2053,6 +2060,7 @@
 		}
 		if (dataRecord.stage >= 6) {	// Packaged
 			$("#secondary_temp").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
+			$("#secondary_end_sg").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
 			$("#secondary_end_date").jqxDateTimeInput({ disabled: true });
 			$("#tertiary_temp").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
 			$("#fg").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
@@ -2528,6 +2536,17 @@
 				calcFermentation();
 			}
 		});
+		$("#secondary_end_sg").on('change',function (event){dataRecord.secondary_end_sg=parseFloat(event.args.value);calcFermentation();});
+		$("#secondary_end_brix").on('change', function (event) {
+                        if(dataRecord.brew_fermenter_sg>=1.020){
+                                OBrix=sg_to_brix(dataRecord.brew_fermenter_sg);
+                                FBrix=parseFloat(event.args.value);
+var FG=Round(1.0031-0.002318474*OBrix-0.000007775*(OBrix*OBrix)-0.000000034*Math.pow(OBrix,3)+0.00574*(FBrix)+0.00003344*(FBrix*FBrix)+0.000000086*Math.pow(FBrix,3),4);
+                                //console.log("OBrix:"+OBrix+" FBrix:"+FBrix+" FG:"+FG);
+                                if(FBrix>0.05){$("#secondary_end_sg").val(FG);dataRecord.secondary_end_sg=FG;}
+                                calcFermentation();
+                        }
+                });
 		$("#final_brix").on('change',function (event){
 			if(dataRecord.brew_fermenter_sg>=1.020){
 				OBrix=sg_to_brix(dataRecord.brew_fermenter_sg);
@@ -2739,6 +2758,7 @@
 			primary_end_sg: parseFloat($("#primary_end_sg").jqxNumberInput('decimal')),
 			primary_end_date: $("#primary_end_date").val(),
 			secondary_temp: parseFloat($("#secondary_temp").jqxNumberInput('decimal')),
+			secondary_end_sg: parseFloat($("#secondary_end_sg").jqxNumberInput('decimal')),
 			secondary_end_date: $("#secondary_end_date").val(),
 			tertiary_temp: parseFloat($("#tertiary_temp").jqxNumberInput('decimal')),
 			package_date: $("#package_date").val(),
@@ -2967,6 +2987,7 @@
 			{ name: 'primary_end_sg', type: 'float' },
 			{ name: 'primary_end_date', type: 'string' },
 			{ name: 'secondary_temp', type: 'float' },
+			{ name: 'secondary_end_sg', type: 'float' },
 			{ name: 'secondary_end_date', type: 'string' },
 			{ name: 'tertiary_temp', type: 'float' },
 			{ name: 'package_date', type: 'string' },
@@ -3178,6 +3199,7 @@
 			$("#primary_end_sg").val(dataRecord.primary_end_sg);
 			$("#primary_end_date").val(dataRecord.primary_end_date);
 			$("#secondary_temp").val(dataRecord.secondary_temp);
+			$("#secondary_end_sg").val(dataRecord.secondary_end_sg);
 			$("#secondary_end_date").val(dataRecord.secondary_end_date);
 			$("#tertiary_temp").val(dataRecord.tertiary_temp);
 			$("#package_date").val(dataRecord.package_date);
@@ -5774,6 +5796,12 @@
 	$("#primary_end_date").jqxDateTimeInput( Dateopts );
 	$('#primary_end_date').on('close', function (event) { calcStage(); });
 	$("#secondary_temp").jqxNumberInput( YeastT );
+	$("#secondary_end_sg").jqxTooltip({ content: 'Het gemeten SG aan het eind van de navergisting.' });
+        $("#secondary_end_sg").jqxNumberInput( SGopts );
+        $("#secondary_end_brix").jqxTooltip({ content: 'Hulpfinctie: de afgelezen &deg;Brix RI waarde met een refractometer.' });
+        $("#secondary_end_brix").jqxNumberInput( Spin1dec );
+        $("#secondary_svg").jqxTooltip({ content: 'De schijnbare vergisting graad behaald na de nagisting.' });
+        $("#secondary_svg").jqxNumberInput( Show1dec );
 	$("#secondary_end_date").jqxTooltip({ content: 'De eind datum van de navergisting en het begin van het lageren.' });
 	$("#secondary_end_date").jqxDateTimeInput( Dateopts );
 	$('#secondary_end_date').on('close', function (event) { calcStage(); });