Mercurial > bms / file diff

--- a/www/js/global.js	Wed Dec 19 21:58:21 2018 +0100
+++ b/www/js/global.js	Sun Dec 23 20:13:36 2018 +0100
@@ -242,6 +242,26 @@
 	},
 });
 
+// dropdownlist datasource from profile_water
+var waterProfileSource = {
+	datatype: "json",
+	datafields: [
+		{ name: 'record', type: 'number' },
+		{ name: 'name', type: 'string' },
+		{ name: 'calcium', type: 'float' },
+		{ name: 'bicarbonate', type: 'float' },
+		{ name: 'sulfate', type: 'float' },
+		{ name: 'chloride', type: 'float' },
+		{ name: 'sodium', type: 'float' },
+		{ name: 'magnesium', type: 'float' },
+		{ name: 'ph', type: 'float' },
+		{ name: 'total_alkalinity', type: 'float' },
+	],
+	url: "includes/db_profile_water.php",
+	async: true
+};
+var waterprofiles = new $.jqx.dataAdapter(waterProfileSource);
+
 // dropdownlist datasource from profile_mash
 var mashInvSource = {
 	datatype: "json",
@@ -574,6 +594,20 @@
 }
 
 
+function CalcFrac(TpH, pK1, pK2, pK3) {
+
+	var r1d = Math.pow(10, TpH - pK1);
+	var r2d = Math.pow(10, TpH - pK2);
+	var r3d = Math.pow(10, TpH - pK3);
+	var dd = 1/(1 + r1d + r1d*r2d + r1d*r2d*r3d);
+	var f1d = dd;
+	var f2d = r1d*dd;
+	var f3d = r1d*r2d*dd;
+	var f4d = r1d*r2d*r3d*dd;
+	return f2d + 2*f3d + 3*f4d;
+}
+
+
 /*
  * Steinie:
  *