diff -r a1bcebc61ddd -r 544d7d0183b2 www/js/prod_edit.js
--- a/www/js/prod_edit.js	Fri May 31 22:58:03 2019 +0200
+++ b/www/js/prod_edit.js	Sun Jun 02 12:48:54 2019 +0200
@@ -2548,12 +2548,15 @@
 			brew_date_start: $("#brew_date_start").val(),
 			brew_mash_ph: parseFloat($("#brew_mash_ph").jqxNumberInput('decimal')),
 			brew_mash_sg: parseFloat($("#brew_mash_sg").jqxNumberInput('decimal')),
+			brew_mash_efficiency: parseFloat($("#brew_mash_efficiency").jqxNumberInput('decimal')),
 			brew_sparge_temperature: parseFloat($("#brew_sparge_temperature").jqxNumberInput('decimal')),
 			brew_sparge_volume: parseFloat($("#brew_sparge_volume").jqxNumberInput('decimal')),
+			brew_sparge_est: parseFloat($("#brew_sparge_est").jqxNumberInput('decimal')),
 			brew_sparge_ph: parseFloat($("#brew_sparge_ph").jqxNumberInput('decimal')),
 			brew_preboil_volume: parseFloat($("#brew_preboil_volume").jqxNumberInput('decimal')),
 			brew_preboil_sg: parseFloat($("#brew_preboil_sg").jqxNumberInput('decimal')),
 			brew_preboil_ph: parseFloat($("#brew_preboil_ph").jqxNumberInput('decimal')),
+			brew_preboil_efficiency: parseFloat($("#brew_preboil_efficiency").jqxNumberInput('decimal')),
 			brew_aboil_volume: parseFloat($("#brew_aboil_volume").jqxNumberInput('decimal')),
 			brew_aboil_sg: parseFloat($("#brew_aboil_sg").jqxNumberInput('decimal')),
 			brew_aboil_ph: parseFloat($("#brew_aboil_ph").jqxNumberInput('decimal')),
@@ -2669,6 +2672,21 @@
 			w2_total_alkalinity: parseFloat($("#w2_total_alkalinity").jqxNumberInput('decimal')),
 			w2_ph: parseFloat($("#w2_ph").jqxNumberInput('decimal')),
 			w2_cost: dataRecord.w2_cost,
+			wg_amount: parseFloat($("#wg_amount").jqxNumberInput('decimal')),
+                        wg_calcium: parseFloat($("#wg_calcium").jqxNumberInput('decimal')),
+                        wg_sulfate: parseFloat($("#wg_sulfate").jqxNumberInput('decimal')),
+                        wg_chloride: parseFloat($("#wg_chloride").jqxNumberInput('decimal')),
+                        wg_sodium: parseFloat($("#wg_sodium").jqxNumberInput('decimal')),
+                        wg_magnesium: parseFloat($("#wg_magnesium").jqxNumberInput('decimal')),
+                        wg_total_alkalinity: parseFloat($("#wg_total_alkalinity").jqxNumberInput('decimal')),
+                        wg_ph: parseFloat($("#wg_ph").jqxNumberInput('decimal')),
+                        wb_calcium: parseFloat($("#wb_calcium").jqxNumberInput('decimal')),
+                        wb_sulfate: parseFloat($("#wb_sulfate").jqxNumberInput('decimal')),
+                        wb_chloride: parseFloat($("#wb_chloride").jqxNumberInput('decimal')),
+                        wb_sodium: parseFloat($("#wb_sodium").jqxNumberInput('decimal')),
+                        wb_magnesium: parseFloat($("#wb_magnesium").jqxNumberInput('decimal')),
+                        wb_total_alkalinity: parseFloat($("#wb_total_alkalinity").jqxNumberInput('decimal')),
+                        wb_ph: parseFloat($("#wb_ph").jqxNumberInput('decimal')),
 			wa_acid_name: $("#wa_acid_name").val(),
 			wa_acid_perc: parseFloat($("#wa_acid_perc").jqxNumberInput('decimal')),
 			wa_base_name: $("#wa_base_name").val(),
@@ -2753,12 +2771,15 @@
 			{ name: 'brew_date_start', type: 'string' },
 			{ name: 'brew_mash_ph', type: 'float' },
 			{ name: 'brew_mash_sg', type: 'float' },
+			{ name: 'brew_mash_efficiency', type: 'float' },
 			{ name: 'brew_sparge_temperature', type: 'float' },
 			{ name: 'brew_sparge_volume', type: 'float' },
+			{ name: 'brew_sparge_est', type: 'float' },
 			{ name: 'brew_sparge_ph', type: 'float' },
 			{ name: 'brew_preboil_volume', type: 'float' },
 			{ name: 'brew_preboil_sg', type: 'float' },
 			{ name: 'brew_preboil_ph', type: 'float' },
+			{ name: 'brew_preboil_efficiency', type: 'float' },
 			{ name: 'brew_aboil_volume', type: 'float' },
 			{ name: 'brew_aboil_sg', type: 'float' },
 			{ name: 'brew_aboil_ph', type: 'float' },
@@ -2874,6 +2895,21 @@
 			{ name: 'w2_total_alkalinity', type: 'float' },
 			{ name: 'w2_ph', type: 'float' },
 			{ name: 'w2_cost', type: 'float' },
+			{ name: 'wg_amount', type: 'float' },
+                        { name: 'wg_calcium', type: 'float' },
+                        { name: 'wg_sulfate', type: 'float' },
+                        { name: 'wg_chloride', type: 'float' },
+                        { name: 'wg_sodium', type: 'float' },
+                        { name: 'wg_magnesium', type: 'float' },
+                        { name: 'wg_total_alkalinity', type: 'float' },
+                        { name: 'wg_ph', type: 'float' },
+                        { name: 'wb_calcium', type: 'float' },
+                        { name: 'wb_sulfate', type: 'float' },
+                        { name: 'wb_chloride', type: 'float' },
+                        { name: 'wb_sodium', type: 'float' },
+                        { name: 'wb_magnesium', type: 'float' },
+                        { name: 'wb_total_alkalinity', type: 'float' },
+                        { name: 'wb_ph', type: 'float' },
 			{ name: 'wa_acid_name', type: 'int' },
 			{ name: 'wa_acid_perc', type: 'int' },
 			{ name: 'wa_base_name', type: 'int' },
@@ -2930,10 +2966,11 @@
 			$("#brew_date_start").val(dataRecord.brew_date_start);
 			$("#brew_mash_ph").val(dataRecord.brew_mash_ph);
 			$("#brew_mash_sg").val(dataRecord.brew_mash_sg);
-			// brew_mash_efficiency to calculate on th fly.
+			$("#brew_mash_efficiency").val(dataRecord.brew_mash_efficiency);
 			// Header Spoelen en filteren
 			$("#brew_sparge_temperature").val(dataRecord.brew_sparge_temperature);
 			$("#brew_sparge_volume").val(dataRecord.brew_sparge_volume);
+			$("#brew_sparge_est").val(dataRecord.brew_sparge_est);
 			$("#brew_sparge_ph").val(dataRecord.brew_sparge_ph);
 			// Header Beluchten
 			$("#brew_aeration_type").val(dataRecord.brew_aeration_type);
@@ -2943,7 +2980,7 @@
 			$("#brew_preboil_ph").val(dataRecord.brew_preboil_ph);
 			$("#brew_preboil_sg").val(dataRecord.brew_preboil_sg);
 			$("#brew_preboil_volume").val(dataRecord.brew_preboil_volume);
-			//$("#brew_preboil_efficiency").val(dataRecord.brew_preboil_efficiency);
+			$("#brew_preboil_efficiency").val(dataRecord.brew_preboil_efficiency);
 			// Header Koelen en whirlpoolen
 			$("#brew_whirlpool9").val(dataRecord.brew_whirlpool9);
 			$("#brew_whirlpool7").val(dataRecord.brew_whirlpool7);
@@ -3074,6 +3111,21 @@
 			$("#w2_total_alkalinity").val(dataRecord.w2_total_alkalinity);
 			$("#w2_ph").val(dataRecord.w2_ph);
 			$("#w2_cost").val(dataRecord.w2_cost);
+			$("#wg_amount").val(dataRecord.wg_amount);
+                        $("#wg_calcium").val(dataRecord.wg_calcium);
+                        $("#wg_sulfate").val(dataRecord.wg_sulfate);
+                        $("#wg_chloride").val(dataRecord.wg_chloride);
+                        $("#wg_sodium").val(dataRecord.wg_sodium);
+                        $("#wg_magnesium").val(dataRecord.wg_magnesium);
+                        $("#wg_total_alkalinity").val(dataRecord.wg_total_alkalinity);
+                        $("#wg_ph").val(dataRecord.wg_ph);
+                        $("#wb_calcium").val(dataRecord.wb_calcium);
+                        $("#wb_sulfate").val(dataRecord.wb_sulfate);
+                        $("#wb_chloride").val(dataRecord.wb_chloride);
+                        $("#wb_sodium").val(dataRecord.wb_sodium);
+                        $("#wb_magnesium").val(dataRecord.wb_magnesium);
+                        $("#wb_total_alkalinity").val(dataRecord.wb_total_alkalinity);
+                        $("#wb_ph").val(dataRecord.wb_ph);
 			$("#wa_acid_name").val(dataRecord.wa_acid_name);
 			$("#wa_acid_perc").val(dataRecord.wa_acid_perc);
 			$("#wa_base_name").val(dataRecord.wa_base_name);
@@ -5239,13 +5291,11 @@
 	$("#wb_magnesium").jqxNumberInput( Show1wat );
 	$("#wb_sodium").jqxTooltip({ content: 'De ideale hoeveelheid Natrium is lager dan 150.'});
 	$("#wb_sodium").jqxNumberInput( Show1wat );
-
 	$("#wb_total_alkalinity").jqxNumberInput( Show1wat );
 	$("#wb_chloride").jqxTooltip({ content: 'De ideale hoeveelheid Chloride is tussen 50 en 100.'});
 	$("#wb_chloride").jqxNumberInput( Show1wat );
 	$("#wb_sulfate").jqxTooltip({ content: 'De ideale hoeveelheid Sulfaat is tussen 50 en 350.'});
 	$("#wb_sulfate").jqxNumberInput( Show1wat );
-
 	$("#wb_ph").jqxNumberInput( Show1wat );
 	// Water target profile
 	$("#pr_name").jqxDropDownList({