Mercurial > bms / file diff

--- a/www/js/global.js	Wed Jun 05 20:06:14 2019 +0200
+++ b/www/js/global.js	Fri Jun 14 20:26:51 2019 +0200
@@ -92,7 +92,8 @@
 	{ id: 1, en: 'Boil', nl: 'Koken' },
 	{ id: 2, en: 'Fermentation', nl: 'Vergisten' },
 	{ id: 3, en: 'Lagering', nl: 'Nagisten/lageren' },
-	{ id: 4, en: 'Bottle', nl: 'Bottelen' }
+	{ id: 4, en: 'Bottle', nl: 'Bottelen' },
+	{ id: 5, en: 'Kegs', nl: 'Fust' }
 ];
 var AddedSource = {
 	localdata: AddedData,
@@ -333,20 +334,6 @@
 };
 var AerationTypeAdapter = new $.jqx.dataAdapter(AerationTypeSource);
 
-var PrimingSugarData = [
-	{ id: 0, en: 'Saccharose',          nl: 'Kristalsuiker',    factor: 1 },
-	{ id: 1, en: 'Glucose or dextrose', nl: 'Glucose/dextrose', factor: 1.16 },
-	{ id: 2, en: 'Honey',               nl: 'Honing',           factor: 1.28 },
-	{ id: 3, en: 'DME',                 nl: 'Moutextract',      factor: 1.74 },
-	{ id: 4, en: 'Molassis',            nl: 'Melasse',          factor: 3.83 }
-];
-var PrimingSugarSource = {
-	localdata: PrimingSugarData,
-	datatype: "array",
-	datafields: [{ name: 'id' }, { name: 'en' }, { name: 'nl' }, { name: 'factor' }] 
-};
-var PrimingSugarAdapter = new $.jqx.dataAdapter(PrimingSugarSource);
-
 var AcidTypeData = [
 	{ id: 0, en: 'Lactic',       nl: 'Melkzuur' },
 	{ id: 1, en: 'Hydrochloric', nl: 'Zoutzuur' },
@@ -523,7 +510,21 @@
 		return data;
 	},
         loadError: function(jqXHR, status, error) {
-		$('#err').text(status + ' ' + error);
+		console.log(status + ' ' + error);
+	},
+});
+var fermentablesugars = new $.jqx.dataAdapter(fermentableInvSource, {
+	beforeLoadComplete: function (records) {
+		var data = new Array();
+		for (var i = 0; i < records.length; i++) {
+			var row = records[i];
+			if (row.type == 1 || row.type == 3)	// Sugars or dry extract
+				data.push(row);
+		}
+		return data;
+	},
+	loadError: function(jqXHR, status, error) {
+		console.log(status + ' ' + error);
 	},
 });
 
@@ -562,7 +563,7 @@
 		return data;
 	},
         loadError: function(jqXHR, status, error) {
-		$('#err').text(status + ' ' + error);
+		console.log(status + ' ' + error);
 	},
 });
 
@@ -593,7 +594,7 @@
 		return data;
 	},
         loadError: function(jqXHR, status, error) {
-		$('#err').text(status + ' ' + error);
+		console.log(status + ' ' + error);
 	},
 });
 
@@ -630,7 +631,7 @@
 		return data;
 	},
 	loadError: function(jqXHR, status, error) {
-		$('#err').text(status + ' ' + error);
+		console.log(status + ' ' + error);
 	},
 });
 
@@ -665,7 +666,7 @@
 		return data;
 	},
         loadError: function(jqXHR, status, error) {
-		$('#err').text(status + ' ' + error);
+		console.log(status + ' ' + error);
 	},
 });