Mercurial > bms / file diff

--- a/www/js/prod_edit.js	Mon May 13 16:26:28 2019 +0200
+++ b/www/js/prod_edit.js	Wed May 15 16:44:09 2019 +0200
@@ -142,6 +142,7 @@
 		var mvol = 0;		// mash volume
 		var colort = 0;		// Colors srm * vol totals
 		var colorh = 0;		// Colors ebc * vol * kt
+		var colorn = 0;		// Colors ebc * pt * pct
 		var my_100 = false;
 		var mashtime = 0;	// Total mash time
 		var mashtemp = 0;	// Average mash temperature
@@ -194,6 +195,7 @@
 			}
 			colort += row.f_amount * ebc_to_srm(row.f_color);
 			colorh += row.f_amount * row.f_color * get_kt(row.f_color);
+			colorn += (row.f_percentage / 100) * row.f_color;	// For 8.6 Pt wort.
 			// Check supplies.
 			if ((((dataRecord.inventory_reduced <= 2) && (row.f_added <= 1)) ||  // Mash or boil
                              ((dataRecord.inventory_reduced <= 3) && (row.f_added == 2)) ||  // Primary
@@ -260,7 +262,9 @@
 				dataRecord.brew_fermenter_sg = Math.round(plato_to_sg(pt) * 10000) / 10000;
 				$("#brew_fermenter_sg").val(dataRecord.brew_fermenter_sg);
 				// color
-				if (dataRecord.color_method == 3) {
+				if (dataRecord.color_method == 4) {
+					dataRecord.brew_fermenter_color = Math.round(((pt / 8.6) * colorn) + (dataRecord.boil_time / 60));
+				} else if (dataRecord.color_method == 3) {
 					dataRecord.brew_fermenter_color = Math.round((4.46 * bv * sr) /  (aboil_volume + top) * colorh);
 				} else {
 					var cw = colort / (aboil_volume + top) * 8.34436;
@@ -280,7 +284,9 @@
 		}
 
 		// Color of the wort
-		if (dataRecord.color_method == 3) {	// Hans Halberstadt
+		if (dataRecord.color_method == 4) {
+			var color = Math.round(((sg_to_plato(dataRecord.est_og) / 8.6) * colorn) + (dataRecord.boil_time / 60));
+                } else if (dataRecord.color_method == 3) {	// Hans Halberstadt
 			var color = Math.round((4.46 * bv * sr) /  parseFloat(dataRecord.batch_size) * colorh);
 		} else {
 			var cw = colort / parseFloat(dataRecord.batch_size) * 8.34436;