bms: comparison www/js/rec_edit.js

comparison: www/js/rec_edit.js

www/js/rec_edit.js

changeset 230: 8edca0488e65
parent 229: cfd87d51a33c
child 232: daf2d9d6fa18

equal deleted inserted replaced

-:cfd87d51a33c
+:8edca0488e65
 		RA = 2 * parseFloat($("#wa_cacl2").jqxNumberInput('decimal')) * MMCl / MMCaCl2 +
 		     parseFloat($("#wa_nacl").jqxNumberInput('decimal')) * MMCl / MMNaCl;
 		chloride += 1000 * RA / liters;
 		// Einde noot.
-		if ($("#wa_acid_name").val() == "") {
+		if ($("#wa_acid_name").val() < 0 || $("#wa_acid_name").val() > 3) {
-			$("#wa_acid_name").val('Melkzuur');
+			console.log("fix wa_acid_name");
-			last_acid = 'Melkzuur';
+			$("#wa_acid_name").val(0);
-		}
+			dataRecord.wa_acid_name = 0;
-		if ($("#wa_base_name").val() == "") {
+		}
-			$("#wa_base_name").val('NaHCO3');
+		if (last_acid == '')
-			last_base = 'NaHCO3';
+			last_acid = AcidTypeData[$("#wa_acid_name").val()].nl;
-		}
+		if ($("#wa_base_name").val() < 0 || $("#wa_base_name").val() > 3) {
+			console.log("fix wa_base_name");
+			$("#wa_base_name").val(0);
+			dataRecord.wa_base_name = 0;
+		}
+		if (last_base == '')
+			last_base = BaseTypeData[$("#wa_base_name").val()].nl;
 		var AT = dataRecord.wa_acid_name; // parseFloat($("#wa_acid_name").jqxNumberInput('decimal'));
-		var BT = parseFloat($("#wa_base_name").jqxNumberInput('decimal'));
+		var BT = dataRecord.wa_base_name; //parseFloat($("#wa_base_name").jqxNumberInput('decimal'));
 		var result = GetAcidSpecs(AT);
 		var pK1 = result.pK1;
 		var pK2 = result.pK2;
 		var pK3 = result.pK3;
 				if (parseFloat($("#wa_acid_perc").jqxNumberInput('decimal')) == 0)
 					$("#wa_acid_perc").val(AcidPrc);
 				Acid = Acid * AcidPrc / (parseFloat($("#wa_acid_perc").jqxNumberInput('decimal')) / 100); // ml
 				console.log("Final ml: "+Acid);
 				$("#wa_acid").val(Math.round(Acid * 100) / 100);
-				setWaterAgent(AT, Math.round(Acid * 100) / 100);
+				setWaterAgent(AcidTypeData[AT].nl, Math.round(Acid * 100) / 100);
 				bicarbonate = bicarbonate - protonDeficit * frac / liters;
 				total_alkalinity = bicarbonate * 50 / 61;
 			} else if (protonDeficit < 0) { //Add base
 				$("#wa_acid").val(0);
 				var f3d = f2d * r2d;
 				switch (BT) {
 					case 0:	RA = -protonDeficit / (f1d - f3d); //Sodiumbicarbonate, mmol totaal
 						RA = RA * MMNaHCO3/1000; //gram
 						$("#wa_base").val(Math.round(RA * 100) / 100);
-						setWaterAgent(BT, Math.round(RA * 100) / 100);
+						setWaterAgent('NaHCO3', Math.round(RA * 100) / 100);
 						if (liters > 0) {
 							// Na
 							RA = parseFloat($("#wa_nacl").jqxNumberInput('decimal')) * MMNa / MMNaCl +
 							     parseFloat($("#wa_base").jqxNumberInput('decimal')) * MMNa / MMNaHCO3;
 							RA = 1000 * RA / liters;
 						}
 						break;
 					case 1:	RA = -protonDeficit / (2 * f1d + f2d); // Sodiumcarbonate, mmol totaal
 						RA = RA * MMNa2CO3/1000; //gram
 						$("#wa_base").val(Math.round(RA * 100) / 100);
-						setWaterAgent(BT, Math.round(RA * 100) / 100);
+						setWaterAgent('Na2CO3', Math.round(RA * 100) / 100);
 						if (liters > 0) {
 							RA = parseFloat($("#wa_nacl").jqxNumberInput('decimal')) * MMNa / MMNaCl +
 							     parseFloat($("#wa_base").jqxNumberInput('decimal')) * 2 * MMNa / MMNa2CO3;
 							RA = 1000 * RA / liters;
 							sodium = wg_sodium + RA;
 					case 2:	RA = -protonDeficit * (f1d - f3d); // Calciumcarbonate, mmol totaal
 						RA = RA * MMCaCO3/1000; //gram
 						//but only 1/3 is effective, so add 3 times as much
 						RA = 3 * RA;
 						$("#wa_base").val(Math.round(RA * 100) / 100);
-						setWaterAgent(BT, Math.round(RA * 100) / 100);
+						setWaterAgent('CaCO3', Math.round(RA * 100) / 100);
 						if (liters > 0) {
 							//Bicarbonate
 							RA = parseFloat($("#wa_base").jqxNumberInput('decimal')) / 3 * MMHCO3 / MMCaCO3;
 							RA = 1000 * RA / liters;
 							bicarbonate = wg_bicarbonate + RA;
 							RA = ResidualAlkalinity(wb_total_alkalinity, wb_calcium, wb_magnesium);
 						}
 						break;
 					case 3:	RA = -protonDeficit / 19.3; // Calciumhydroxide
 						$("#wa_base").val(Math.round(RA * 100) / 100);
-						setWaterAgent(BT, Math.round(RA * 100) / 100);
+						setWaterAgent('Ca(OH)2', Math.round(RA * 100) / 100);
 						if (liters > 0) {
 							// Bicarbonate
 							RA = -protonDeficit / liters;
 							total_alkalinity = wg_total_alkalinity + RA;
 							bicarbonate = total_alkalinity * 61 / 50;
 			RA = 1000 * RA / liters;
 			sulfate = wg_sulfate + RA;	// Not add to sulfate??
 		} else if ((AT == 1) && (liters > 0)) {	// Hydrochloric, Zoutzuur
 			RA = parseFloat($("#wa_cacl2").jqxNumberInput('decimal')) * MMCl / MMCaCl2 +
 			     parseFloat($("#wa_nacl").jqxNumberInput('decimal')) * MMCl / MMNaCl +
-			     Acidmg / 1000 * MMCl / (MMCL + 1);
+			     Acidmg / 1000 * MMCl / (MMCl + 1);
 			RA = 1000 * RA / liters;
 			chloride = wg_chloride + RA;
 		}
 		// 2:1 Sulfate to Chroride IPA's, Pale Ales.
 		// Code from BrewBuddy/Brouwhulp, who got it from http://www.brewery.org/brewery/library/Acidi0,00fWaterAJD0497.html
 		var TargetpH = dataRecord.sparge_ph;
 		var Source_pH = dataRecord.w1_ph;
 		var Source_alkalinity = dataRecord.w1_total_alkalinity;
 		// Select watersource or fallback to the first source.
-		if (dataRecord.sparge_source == 'Bron 2') {
+		if (dataRecord.sparge_source == 1) {	// Source 2
 			if (dataRecord.w2_ph > 0.0) {
 				Source_pH = dataRecord.w2_ph;
 				Source_alkalinity = dataRecord.w2_total_alkalinity;
 			} else {
-				dataRecord.sparge_source = 'Bron 1';
+				dataRecord.sparge_source = 0;	// Source 1
-				$("#sparge_source").val('Bron 1');
+				$("#sparge_source").val(0);
 			}
-		} else if (dataRecord.sparge_source == 'Gemengd') {
+		} else if (dataRecord.sparge_source == 2) {	// Mixed
 			if (dataRecord.w2_ph > 0.0) {
 				Source_pH = parseFloat($("#wg_ph").jqxNumberInput('decimal'));
 				Source_alkalinity = parseFloat($("#wg_total_alkalinity").jqxNumberInput('decimal'));
 			} else {
-				dataRecord.sparge_source = 'Bron 1';
+				dataRecord.sparge_source = 0;
-				$("#sparge_source").val('Bron 1');
+				$("#sparge_source").val(0);
 			}
 		}
 		console.log("calcSparge() target pH: "+TargetpH+" Source: "+Source_pH+" alkalinity: "+Source_alkalinity);
 		var f2g = r1g / dg;
 		var f3g = r1g * r2g / dg;
 		//Step 6. Use these to compute the milliequivalents acid required per liter (mEq/L)
 		var Acid = alkalinity * ((f1g-f1)+(f3-f3g)) + Math.pow(10, -TargetpH) - Math.pow(10, -Source_pH);  //mEq/l
+		if (dataRecord.sparge_acid_type < 0 || dataRecord.sparge_acid_type > 3) {
-		if ($("#sparge_acid_type").val() == NaN) {
+			dataRecord.sparge_acid_type = 0;
 			$("#sparge_acid_type").val(0);
-			dataRecord.sparge_acid_type = 0;
 		}
 		var AT = dataRecord.sparge_acid_type;
 		var result = GetAcidSpecs(AT);
 		var pK1 = result.pK1;
 		var pK2 = result.pK2;
 		$('#wa_nacl').on('change', function (event) {
 			setWaterAgent('NaCl', event.args.value);
 			calcWater();
 		});
 		$('#wa_base_name').on('change', function (event) {
-			setWaterAgent(last_base, 0);
+			if (event.args) {
-			last_base = event.args.item.value;
+				var index = event.args.index;
-			setWaterAgent(last_base, parseFloat($("#wa_base").jqxNumberInput('decimal')));
+				console.log("wa_base_name "+index);
-			calcWater();
+				setWaterAgent(last_base, 0);
+				last_base = BaseTypeData[index].nl;
+				setWaterAgent(last_base, parseFloat($("#wa_base").jqxNumberInput('decimal')));
+				dataRecord.wa_base_name = index;
+				calcWater();
+			}
 		});
 		$('#wa_base').on('change', function (event) {
-			setWaterAgent($("#wa_base_name").val(), parseFloat(event.args.value));
+			var name = BaseTypeData[$("#wa_base_name").val()].nl;
+			setWaterAgent(name, parseFloat(event.args.value));
 			calcWater();
 		});
 		$('#wa_acid_name').on('change', function (event) {
-			setWaterAgent(last_acid, 0);
+			if (event.args) {
-			last_acid = event.args.item.value;
+				var index = event.args.index;
-			setWaterAgent(last_acid, parseFloat($("#wa_acid").jqxNumberInput('decimal')));
+				console.log("wa_acid_name "+index);
-			calcWater();
+				setWaterAgent(last_acid, 0);
+				last_acid = AcidTypeData[index].nl;
+				setWaterAgent(last_acid, parseFloat($("#wa_acid").jqxNumberInput('decimal')));
+				dataRecord.wa_acid_name = index;
+				calcWater();
+			}
 		});
 		$('#wa_acid').on('change', function (event) {
-			setWaterAgent($("#wa_acid_name").val(), parseFloat(event.args.value));
+			var name = AcidTypeData[$("#wa_acid_name").val()].nl;
+			setWaterAgent(name, parseFloat(event.args.value));
 			calcWater();
 		});
 		$('#wa_acid_perc').on('change', function (event) { calcWater(); });
 		$('#color_method').on('change', function (event) {
 		$('#sparge_volume').on('change', function (event) {
 			dataRecord.sparge_volume = parseFloat(event.args.value);
 			calcSparge();
 		});
 		$('#sparge_source').on('change', function (event) {
-			dataRecord.sparge_source= event.args.item.value;
+			if (event.args) {
-			calcSparge();
+				var index = event.args.index;
+				dataRecord.sparge_source= index;
+				calcSparge();
+			}
 		});
 		$('#sparge_acid_type').on('change', function (event) {
-			dataRecord.sparge_acid_type = event.args.item.value;
+			if (event.args) {
-			console.log("new sparge_acid_type: "+dataRecord.sparge_acid_type);
+				var index = event.args.index;
-			calcSparge();
+				dataRecord.sparge_acid_type = index;
+				console.log("new sparge_acid_type: "+dataRecord.sparge_acid_type);
+				calcSparge();
+			}
 		});
 		$('#sparge_acid_perc').on('change', function (event) {
 			dataRecord.sparge_acid_perc = parseFloat(event.args.value);
 			calcSparge();
 		});
 			{ name: 'ibu_method', type: 'int' },
 			{ name: 'est_carb', type: 'float' },
 			{ name: 'sparge_temp', type: 'float' },
 			{ name: 'sparge_ph', type: 'float' },
 			{ name: 'sparge_volume', type: 'float' },
-			{ name: 'sparge_source', type: 'string' },
+			{ name: 'sparge_source', type: 'int' },
 			{ name: 'sparge_acid_type', type: 'int' },
 			{ name: 'sparge_acid_perc', type: 'float' },
 			{ name: 'sparge_acid_amount', type: 'float' },
 			{ name: 'mash_ph', type: 'float' },
 			{ name: 'mash_name', type: 'string' },
 				for (var i = 0; i < records.length; i++) {
 					var row = records[i];
 					data.push(row);
 					// Initial set water agent values.
 					switch (row.m_name) {
-						case 'CaCl2':		$("#wa_cacl2").val(row.m_weight);
+						case 'CaCl2':		$("#wa_cacl2").val(row.m_amount * 1000);
 									break;
-						case 'CaSO4':		$("#wa_caso4").val(row.m_weight);
+						case 'CaSO4':		$("#wa_caso4").val(row.m_amount * 1000);
 									break;
-						case 'MgSO4':		$("#wa_mgso4").val(row.m_weight);
+						case 'MgSO4':		$("#wa_mgso4").val(row.m_amount * 1000);
 									break;
-						case 'NaCl':		$("#wa_nacl").val(row.m_weight);
+						case 'NaCl':		$("#wa_nacl").val(row.m_amount * 1000);
 									break;
 						case 'Melkzuur':	$("#wa_acid_name").val(0);
-									$("#wa_acid").val(row.m_weight);
+									$("#wa_acid").val(row.m_amount * 1000);
 									$("#wa_acid_perc").val(80);
-									last_acid = 0;
+									last_acid = 'Melkzuur';
 									break;
 						case 'Zoutzuur':	$("#wa_acid_name").val(1);
-									$("#wa_acid").val(row.m_weight);
+									$("#wa_acid").val(row.m_amount * 1000);
 									$("#wa_acid_perc").val(80);
-									last_acid = 1;
+									last_acid = 'Zoutzuur';
 									break;
 						case 'Fosforzuur':	$("#wa_acid_name").val(2);
-									$("#wa_acid").val(row.m_weight);
+									$("#wa_acid").val(row.m_amount * 1000);
 									$("#wa_acid_perc").val(80);
-									last_acid = 2;
+									last_acid = 'Fosforzuur';
 									break;
 						case 'Zwavelzuur':	$("#wa_acid_name").val(3);
-									$("#wa_acid").val(row.m_weight);
+									$("#wa_acid").val(row.m_amount * 1000);
 									$("#wa_acid_perc").val(80);
-									last_acid = 3;
+									last_acid = 'Zwavelzuur';
 									break;
 						case 'NaHCO3':		$("#wa_base_name").val(0);
-									$("#wa_base").val(row.m_weight);
+									$("#wa_base").val(row.m_amount * 1000);
-									last_base = 0;
+									last_base = 'NaHCO3';
 									break;
 						case 'Na2CO3':		$("#wa_base_name").val(1);
-									$("#wa_base").val(row.m_weight);
+									$("#wa_base").val(row.m_amount * 1000);
-									last_base = 1;
+									last_base = 'Na2CO3';
 									break;
 						case 'CaCO3':		$("#wa_base_name").val(2);
-									$("#wa_base").val(row.m_weight);
+									$("#wa_base").val(row.m_amount * 1000);
-									last_base = 2;
+									last_base = 'CaCO3';
 									break;
 						case 'Ca(OH)2':		$("#wa_base_name").val(3);
-									$("#wa_base").val(row.m_weight);
+									$("#wa_base").val(row.m_amount * 1000);
-									last_base = 3;
+									last_base = 'Ca(OH)2';
 									break;
 					}
 				}
 				return data;
 			},
 	$("#pr_chloride").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 74, height: 23, decimalDigits: 1, readOnly: true });
 	$("#pr_sulfate").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 74, height: 23, decimalDigits: 1, readOnly: true });
 	// Water agents
 	$("#wa_cacl2").jqxTooltip({ content: 'Voor het maken van een ander waterprofiel. Voegt calcium en chloride toe. Voor het verbeteren van zoetere bieren.'});
-	$("#wa_cacl2").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 100, height: 23, min: 0, max: 1000, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.1, symbol: ' gr', symbolPosition: 'right' });
+	$("#wa_cacl2").jqxNumberInput( Spin1dec1 );
 	$("#wa_caso4").jqxTooltip({ content: 'Gips. Voor het maken van een ander waterprofiel. Voegt calcium en sulfaat toe. Voor het verbeteren van bittere bieren.'});
-	$("#wa_caso4").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 100, height: 23, min: 0, max: 1000, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.1, symbol: ' gr', symbolPosition: 'right' });
+	$("#wa_caso4").jqxNumberInput( Spin1dec1 );
 	$("#wa_mgso4").jqxTooltip({ content: 'Epsom zout. Voor het maken van een ander waterprofiel. Voegt magnesium en sulfaat toe. Gebruik spaarzaam!'});
-	$("#wa_mgso4").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 100, height: 23, min: 0, max: 1000, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.1, symbol: ' gr', symbolPosition: 'right' });
+	$("#wa_mgso4").jqxNumberInput( Spin1dec1 );
 	$("#wa_nacl").jqxTooltip({ content: 'Keukenzout. Voor het maken van een ander waterprofiel. Voegt natrium en chloride toe. Voor het accentueren van zoetheid. Bij hoge dosering wordt het bier ziltig.'});
-	$("#wa_nacl").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 100, height: 23, min: 0, max: 1000, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.1, symbol: ' gr', symbolPosition: 'right' });
+	$("#wa_nacl").jqxNumberInput( Spin1dec1 );
 	$("#mash_ph").jqxTooltip({ content: 'Maisch pH tussen 5.2 en 5.6. Gebruik 5.2 voor lichte en 5.5 voor donkere bieren.'});
 	$("#mash_ph").jqxNumberInput( SpinpH );
 	$("#calc_acid").jqxCheckBox({ theme: theme, width: 120, height: 23 });
 	$("#wa_base_name").jqxDropDownList({
 		theme: theme,
 		source: BaseTypeAdapter,
 		valueMember: 'id',
 		displayMember: 'nl',
-		width: 180,
+		width: 170,
 		height: 23,
 		autoDropDownHeight: true
 	});
-	$("#wa_base").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 100, height: 23, min: 0, decimalDigits: 2, spinButtons: true, spinButtonsStep: 0.05, symbol: ' gr', symbolPosition: 'right' });
+	$("#wa_base").jqxNumberInput( Spin2dec5 );
+	$("#wa_base").jqxNumberInput({ symbol: ' gr', symbolPosition: 'right' });
 	$("#wa_acid_name").jqxDropDownList({
 		theme: theme,
 		source: AcidTypeAdapter,
 		valueMember: 'id',
 		displayMember: 'nl',
-		width: 180,
+		width: 170,
 		height: 23,
 		autoDropDownHeight: true
 	});
-	$("#wa_acid").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 100, height: 23, min: 0, decimalDigits: 2, spinButtons: true, spinButtonsStep: 0.05, symbol: ' ml', symbolPosition: 'right' });
+	$("#wa_acid").jqxNumberInput( Spin2dec5 );
-	$("#wa_acid_perc").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 80, height: 23, min: 0, max: 100, decimalDigits: 0, spinButtons: true, symbol: '%', symbolPosition: 'right' });
+	$("#wa_acid").jqxNumberInput({ symbol: ' ml', symbolPosition: 'right' });
+	$("#wa_acid_perc").jqxNumberInput( Perc0 );
+	$("#wa_acid_perc").jqxNumberInput({ width: 70, symbol: '%', symbolPosition: 'right' });
 	// Sparge water
-	$("#sparge_temp").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 100, height: 23, min: 70, max: 98, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.5 });
+	$("#sparge_temp").jqxNumberInput( Spin1dec5 );
-	$("#sparge_volume").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 100, height: 23, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.1 });
+	$("#sparge_volume").jqxNumberInput( Spin1dec5 );
-	$("#sparge_ph").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 100, height: 23, min: 4.5, max: 6.5, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.1 });
+	$("#sparge_ph").jqxNumberInput( SpinpH );
-	$("#sparge_source").jqxDropDownList({ theme: theme, source: srcSource, width: 100, height: 23, dropDownHeight: 95 });
+	$("#sparge_source").jqxDropDownList({
-	$("#sparge_acid_amount").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 100, height: 23, decimalDigits: 2, readOnly: true, symbol: ' ml', symbolPosition: 'right' });
+		theme: theme,
-	$("#sparge_acid_type").jqxDropDownList({ theme: theme, source: srcAcid, width: 100, height: 23, dropDownHeight: 128 });
+		source: SpargeSourceAdapter,
-	$("#sparge_acid_perc").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 100, height: 23, spinButtons: true, decimalDigits: 0, symbol: '%', symbolPosition: 'right' });
+		valueMember: 'id',
+		displayMember: 'nl',
+		width: 110,
+		height: 23,
+		autoDropDownHeight: true
+	});
+	$("#sparge_acid_amount").jqxNumberInput( Spin2dec1 );
+	$("#sparge_acid_amount").jqxNumberInput({ spinButtons: false, readOnly: true, symbol: ' ml', symbolPosition: 'right' });
+	$("#sparge_acid_type").jqxDropDownList({
+		theme: theme,
+		source: AcidTypeAdapter,
+		valueMember: 'id',
+		displayMember: 'nl',
+		width: 110,
+		height: 23,
+		autoDropDownHeight: true
+	});
+	$("#sparge_acid_perc").jqxNumberInput( Perc0 );
+	$("#sparge_acid_perc").jqxNumberInput({ symbol: '%', symbolPosition: 'right' });
 	// Tabs inside the popup window.
 	$('#jqxTabs').jqxTabs({
 		theme: theme,
 		width: 1280,