diff -r 0bb48333d133 -r 7ed5c380e21b www/js/mon_ispindel.js --- a/www/js/mon_ispindel.js Tue May 19 13:50:14 2020 +0200 +++ b/www/js/mon_ispindel.js Tue May 19 15:09:31 2020 +0200 @@ -118,17 +118,21 @@ $('#info_beer').html(record.beercode + ' - ' + record.beername); $('#info_mode').jqxDropDownList('selectItem', record.mode); + if (record.mode != 'OFF') { + $('#select_beer').jqxDropDownList({ disabled: true }); + $('#select_beer').jqxDropDownList('clearSelection'); + $('#select_beer').hide(); + } else { + $('#select_beer').show(); + $('#select_beer').jqxDropDownList({ disabled: false }); + } + if (record.online) { $('#info_online').html('On-line'); if (record.mode != 'OFF') { $('#ispindel_powerled').html('
Power'); - $('#select_beer').jqxDropDownList({ disabled: true }); - $('#select_beer').jqxDropDownList('clearSelection'); - $('#select_beer').hide(); } else { $('#ispindel_powerled').html('
Power'); - $('#select_beer').show(); - $('#select_beer').jqxDropDownList({ disabled: false }); } if (record.online && (record.alarm != '0')) { $('#ispindel_alarmled').html('
Alarm'); @@ -136,10 +140,8 @@ $('#ispindel_alarmled').html('
Alarm'); } - $('#gaugeContainer_temperature').jqxGauge({ caption: { value: record.temperature.toFixed(3) + '°C' }}); - $('#gaugeContainer_temperature').jqxGauge({ value: record.temperature }); $('#gaugeContainer_temperature').jqxGauge({ disabled: false }); - $('#gaugeContainer_gravity').jqxLinearGauge({ disabled: false }); + $('#gaugeContainer_gravity').jqxLinearGauge({ disabled: false }) var sg = plato_to_sg(record.gravity); $('#info_battery').val(record.battery); @@ -151,6 +153,7 @@ var og = plato_to_sg(record.og_gravity); var svg = calc_svg(og, sg); var max = Math.ceil(og * 100, 0) * 10; + var gravity = sg * 1000; console.log ('set max ' + max); $('#gaugeContainer_gravity').jqxLinearGauge({ max: max }); @@ -178,14 +181,13 @@ batt = 100; $('#vg_batt').html(batt + '%'); - var gravity = sg * 1000; + $('#gaugeContainer_temperature').jqxGauge({ caption: { value: record.temperature.toFixed(3) + '°C' }}); + $('#gaugeContainer_temperature').jqxGauge({ value: record.temperature }); $('#gaugeContainer_gravity').jqxLinearGauge({ value: gravity }); } else { // offline $('#info_online').html('Off-line'); $('#ispindel_powerled').html('
Power'); - $('#select_beer').show(); - $('#select_beer').jqxDropDownList({ disabled: false }); $('#ispindel_alarmled').html('
Alarm'); $('#gaugeContainer_temperature').jqxGauge({ disabled: true }); $('#gaugeContainer_gravity').jqxLinearGauge({ disabled: true }); @@ -237,7 +239,6 @@ $('#info_mode').on('select', function(event) { if (event.args && event.args.item.value != record.mode) { record.mode = event.args.item.value; - console.log('set mode ' + record.mode); websocket.send('{"device":"ispindels","node":"' + record.node + '","unit":"' + record.alias + '","mode":"' + record.mode + '"}'); } });