Mercurial > bms / file diff

--- a/www/js/mon_fermenter.js	Wed Feb 27 14:40:05 2019 +0100
+++ b/www/js/mon_fermenter.js	Wed Feb 27 22:13:07 2019 +0100
@@ -61,7 +61,9 @@
 			{ name: 'code', type: 'string' },
 			{ name: 'name', type: 'string' },
 			{ name: 'uuid', type: 'string' },
-			{ name: 'stage', type: 'string' },
+			{ name: 'stage', type: 'int' },
+			{ name: 'yeast_lo', type: 'float' },
+			{ name: 'yeast_hi', type: 'float' }
 		],
 		id: 'code',
 		url: "includes/db_product.php?select=ferment"
@@ -73,7 +75,9 @@
 			blank['code'] = "Free";	 // Will override this later.
 			blank['name'] = 'Dummy';
 			blank['uuid'] = '66ecccbf-e942-4a35-af49-8b02314561a5';
-			blank['stage'] = "Ready";
+			blank['stage'] = 10;
+			blank['yeast_lo'] = 12.0;
+			blank['yeast_hi'] = 24.0;
 			data.push(blank);
 			for (var i = 0; i < records.length; i++) {
 				var row = records[i];
@@ -249,11 +253,11 @@
 		});
 	}
 
-	function sendProduct(code, name, uuid) {
+	function sendProduct(code, name, uuid, yeast_lo, yeast_hi) {
 
-		console.log("sendProduct("+code+", "+name+", "+uuid+")");
+		console.log("sendProduct("+code+", "+name+", "+uuid+", "+yeast_lo+", "+yeast_hi+")");
 		var data  = 'node='+record.node+'&alias='+record.alias+'&payload=';
-		    data += '{"product":{"code":"'+code+'","name":"'+name+'","uuid":"'+uuid+'"}}';
+		    data += '{"product":{"code":"'+code+'","name":"'+name+'","uuid":"'+uuid+'","yeast_lo":'+yeast_lo+',"yeast_hi":'+yeast_hi+'}}';
 		$.ajax({
 			url: "cmd_fermenter.php",
 			data: data,
@@ -292,7 +296,7 @@
 			{ name: 'uuid', type: 'string' },
 			{ name: 'alias', type: 'string' },
 			{ name: 'node', type: 'string' },
-			{ name: 'online', type: 'bool' },
+			{ name: 'online', type: 'int' },
 			{ name: 'beercode', type: 'string' },
 			{ name: 'beername', type: 'string' },
 			{ name: 'air_state', type: 'string' },
@@ -325,7 +329,10 @@
 			{ name: 'profile_inittemp_high', type: 'float' },
 			{ name: 'profile_inittemp_low', type: 'float' },
 			{ name: 'profile_steps', type: 'string' },
-			{ name: 'stage', type: 'string' }
+			{ name: 'stage', type: 'string' },
+			{ name: 'beeruuid', type: 'string' },
+			{ name: 'yeast_lo', type: 'float' },
+			{ name: 'yeast_hi', type: 'float' }
 		],
 		id: 'record',
 		url: url
@@ -459,14 +466,22 @@
 				$("#status_profile").html('');
 			}
 
-			$("#gaugeContainer_air").jqxGauge( { caption: { value: 'Air: '+record.air_temperature.toFixed(3) }});
+			yl = record.yeast_lo;
+			yh = record.yeast_hi;
+			var range = { ranges: [{ startValue:  0, endValue: yl, style: { fill: '#3399FF', stroke: '#3399FF' }, endWidth: 10, startWidth: 10 },
+			                       { startValue: yl, endValue: yh, style: { fill: '#00CC33', stroke: '#00CC33' }, endWidth: 10, startWidth: 10 },
+					       { startValue: yh, endValue: 40, style: { fill: '#FC6A6A', stroke: '#FC6A6A' }, endWidth: 10, startWidth: 10 }] };
+			$("#gaugeContainer_air").jqxGauge( range );
+			$("#gaugeContainer_beer").jqxGauge( range );
+
+			$("#gaugeContainer_air").jqxGauge({ caption: { value: 'Air: '+record.air_temperature.toFixed(3) }});
 			$('#gaugeContainer_air').jqxGauge({ value: record.air_temperature });
 			if (record.air_state == "OK") {
 				$("#gaugeContainer_air").jqxGauge({ disabled: false });
 			} else {
 				$("#gaugeContainer_air").jqxGauge({ disabled: true });
 			}
-			$("#gaugeContainer_beer").jqxGauge( { caption: { value: 'Beer: '+record.beer_temperature.toFixed(3) }});
+			$("#gaugeContainer_beer").jqxGauge({ caption: { value: 'Beer: '+record.beer_temperature.toFixed(3) }});
 			$('#gaugeContainer_beer').jqxGauge({ value: record.beer_temperature });
 			if (record.beer_state == "OK") {
 				$("#gaugeContainer_beer").jqxGauge({ disabled: false });
@@ -497,7 +512,7 @@
 			skip = true;
 		}
 		if (newProduct) {
-			sendProduct(record.beercode, record.beername, record.beeruuid);
+			sendProduct(record.beercode, record.beername, record.beeruuid, record.yeast_lo, record.yeast_hi);
 			newProduct = false;
 			skip = true;
 		}
@@ -537,6 +552,8 @@
 			record.beercode = datarecord.code;
 			record.beername = datarecord.name;
 			record.beeruuid = datarecord.uuid;
+			record.yeast_lo = datarecord.yeast_lo;
+			record.yeast_hi = datarecord.yeast_hi;
 			newProduct = true;
 		}
 	});