Fri, 03 May 2024 20:41:26 +0200
In fermenter screen fix errors during page load.
www/js/fermenter.js | file | annotate | diff | comparison | revisions |
--- a/www/js/fermenter.js Fri May 03 20:15:17 2024 +0200 +++ b/www/js/fermenter.js Fri May 03 20:41:26 2024 +0200 @@ -111,7 +111,6 @@ globalData = new $.jqx.dataAdapter(globalSource, { loadComplete: function(records) { global = globalData.records[0]; - updateScreen(); } }), url = 'getfermenter.php?uuid=' + my_uuid, @@ -349,8 +348,8 @@ $('#Profile2').hide(); // Get the data immediatly and then via websockets to refresh. + globalData.dataBind(); dataAdapter.dataBind(); - globalData.dataBind(); $('#info_mode').on('select', function(event) { if (event.args && event.args.item.value != record.mode) { @@ -467,23 +466,32 @@ global.hum_value = obj.THB.humidity.value; updateScreen(); } else if (obj.type == 'fermenter' && obj.unit == record.unit) { - console.log('ws got unit ' + msg); + console.log('ws got unit ' + msg); record.beeruuid = obj.metric.product.uuid; record.beercode = obj.metric.product.code; record.beername = obj.metric.product.name; record.yeast_lo = obj.metric.product.yeast_lo; record.yeast_hi = obj.metric.product.yeast_hi; if (obj.metric.air) { - record.air_state = obj.metric.air.state; - record.air_temperature = obj.metric.air.temperature; + record.air_address = obj.metric.air.address; + record.air_state = obj.metric.air.state; + record.air_temperature = obj.metric.air.temperature; + } else { + record.air_address = ''; } if (obj.metric.beer) { - record.beer_state = obj.metric.beer.state; - record.beer_temperature = obj.metric.beer.temperature; + record.beer_address = obj.metric.beer.address; + record.beer_state = obj.metric.beer.state; + record.beer_temperature = obj.metric.beer.temperature; + } else { + record.beer_address = ''; } if (obj.metric.chiller) { - record.chiller_state = obj.metric.chiller.state; - record.chiller_temperature = obj.metric.chiller.temperature; + record.chiller_address = obj.metric.chiller.address; + record.chiller_state = obj.metric.chiller.state; + record.chiller_temperature = obj.metric.chiller.temperature; + } else { + record.chiller_address = ''; } if (obj.metric.heater) { record.heater_address = obj.metric.heater.address;