Mercurial > bms / file diff

--- a/www/js/rec_edit.js	Mon May 13 16:26:28 2019 +0200
+++ b/www/js/rec_edit.js	Wed May 15 16:44:09 2019 +0200
@@ -170,6 +170,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
@@ -222,6 +223,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.
 		}
 		to_100 = my_100;
 		if (to_100) {
@@ -239,7 +241,9 @@
 		preboil_sg = estimate_sg(sugarsm, parseFloat(dataRecord.boil_size));
 
 		// 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;