Mercurial > bms / file diff

--- a/www/js/mon_co2meter.js	Mon May 18 11:00:59 2020 +0200
+++ b/www/js/mon_co2meter.js	Tue May 19 13:50:14 2020 +0200
@@ -51,9 +51,7 @@
    }
    return data;
   },
-  loadError: function(jqXHR, status, error) {
-   $('#err').text(status + ' ' + error);
-  },
+  loadError: function(jqXHR, status, error) { console.log(status + ' ' + error); },
  }),
  gaugeoptionst = {
   min: 10, max: 40, width: 375, height: 375,
@@ -93,8 +91,12 @@
    { name: 'mode', type: 'string' },
    { name: 'alarm', type: 'int' },
    { name: 'temperature_state', type: 'string' },
+   { name: 'temperature_address', type: 'string' },
    { name: 'temperature', type: 'float' },
    { name: 'pressure_state', type: 'string' },
+   { name: 'pressure_channel', type: 'int' },
+   { name: 'pressure_voltage', type: 'float' },
+   { name: 'pressure_zero', type: 'float' },
    { name: 'pressure_bar', type: 'float' }
   ],
   id: 'record',
@@ -103,15 +105,20 @@
  dataAdapter = new $.jqx.dataAdapter(source, {
   loadComplete: function(records) {
    record = dataAdapter.records[0];
+   updateScreen();
+   blank['name'] = record.alias;
+   blank['code'] = record.alias.toUpperCase();
+   blank['uuid'] = record.uuid;
+  }
+ });
+
+ function updateScreen() {
    var oline = (record.online) ? 'On-line' : 'Off-line';
    $('#info_uuid').html(record.uuid);
    $('#info_system').html(record.node + '/' + record.alias);
    $('#info_online').html(oline);
    $('#info_beer').html(record.beercode + ' - ' + record.beername);
    $('#info_mode').html(record.mode);
-   blank['name'] = record.alias;
-   blank['code'] = record.alias.toUpperCase();
-   blank['uuid'] = record.uuid;
 
    if (record.online && (record.mode != 'OFF')) {
     $('#co2meter_powerled').html('<div class="LEDblue_on"></div>Power');
@@ -143,8 +150,7 @@
    } else {
     $('#gaugeContainer_pressure').jqxGauge({ disabled: true });
    }
-  }
- });
+ }
 
  $('#select_beer').jqxDropDownList({
   placeHolder: 'Kies bier:',
@@ -177,9 +183,8 @@
    record.beername = datarecord.name;
    record.beeruuid = datarecord.uuid;
    console.log('Select beer ' + record.beercode + ', ' + record.beername);
-   var msg = '{"device":"co2meters","node":"' + record.node + '","unit":"' + record.alias +
-             '","beeruuid":"' + record.beeruuid + '","beercode":"' + record.beercode + '","beername":"' + record.beername + '"}';
-   websocket.send(msg);
+   websocket.send('{"device":"co2meters","node":"' + record.node + '","unit":"' + record.alias +
+             '","beeruuid":"' + record.beeruuid + '","beercode":"' + record.beercode + '","beername":"' + record.beername + '"}');
   }
  });
 
@@ -194,34 +199,23 @@
   var obj = JSON.parse(msg);
   if (obj.device == "co2meters" && obj.node == record.node && obj.unit == record.alias) {
    console.log('ws got this device ' + msg);
+   record.online = obj.online;
    if (obj.online) {
-    $('#info_online').html('On-line');
-   } else {
-    $('#info_online').html('Off-line');
+    record.beeruuid = obj.beeruuid;
+    record.beercode = obj.beercode;
+    record.beername = obj.beername;
+    record.mode = obj.mode;
+    record.alarm = obj.alarm;
+    record.temperature_state = obj.temperature_state;
+    record.temperature_address = obj.temperature_address;
+    record.temperature = obj.temperature;
+    record.pressure_state = obj.pressure_state;
+    record.pressure_channel = obj.pressure_channel;
+    record.pressure_voltage = obj.pressure_voltage;
+    record.pressure_zero = obj.pressure_zero;
+    record.pressure_bar = obj.pressure_bar;
    }
-   $('#info_beer').html(obj.beercode + ' - ' + obj.beername);
-   $('#info_mode').html(obj.mode);
-   if (obj.online && obj.mode != 'OFF') {
-    $('#co2meter_powerled').html('<div class="LEDblue_on"></div>Power');
-    $('#select_beer').jqxDropDownList({ disabled: true });
-    $('#select_beer').jqxDropDownList('clearSelection');
-    $('#select_beer').hide();
-   } else {
-    $('#co2meter_powerled').html('<div class="LEDblue_off"></div>Power');
-    $('#select_beer').show();
-    $('#select_beer').jqxDropDownList({ disabled: false });
-   }
-   if (obj.online && (obj.alarm != '0')) {
-    $('#co2meter_alarmled').html('<div class="LEDred_on"></div>Alarm');
-   } else {
-    $('#co2meter_alarmled').html('<div class="LEDred_off"></div>Alarm');
-   }
-
-   $('#gaugeContainer_temperature').jqxGauge({ caption: { value: 'Temp: ' + obj.temperature.toFixed(3) }});
-   $('#gaugeContainer_temperature').jqxGauge({ value: obj.temperature });
-   $('#gaugeContainer_pressure').jqxGauge({ caption: { value: 'Bar: ' + obj.pressure_bar.toFixed(2) }});
-   $('#gaugeContainer_pressure').jqxGauge({ value: obj.pressure_bar });
-
+   updateScreen();
   }
   ws_global(msg);
  }