”2016-09-12”

mdot/mDotServer.censis/mDotServer.censis/app/js/mdot.js

@@ -243,7 +243,7 @@
       this.model.set('device', newDevice);
 
       if (this.socketHandler) {
-          this.socketHandler.listenFor(newDevice);
+        this.socketHandler.listenFor(newDevice);
       }
     }, updateDevice: function() {
       var fetchObj = {beforeSend: sendAuthentication};
@@ -295,6 +295,7 @@
 
       }, this);
 
+
     }, events: {
       'change select#displaymode': 'changeMode'
     }, setupChart: function() {
@@ -408,7 +409,15 @@
             title: 'Humidity',
             valueField: 'humid',
             fillAlphas: 0
-          }
+          },
+
+                              {
+                                valueAxis: 'co2',
+                                lineColor: 'rgba(255,0,255,1)',
+                                title: 'sub100',
+                                valueField: 'sub100',
+                                fillAlphas: 0
+                              }
         ],
         chartScrollbar: {
           graph: 'occ',oppositeAxis: false,
@@ -451,17 +460,36 @@
       console.time('updateGraphV2');
       var self = this;
       var chartData = [];
+      var filter = [];
       console.time('chartData');
+      var step = 0;
+      const max = 20;
       _(this.collection.models).each(function(i) {
-        chartData.push({
+        const co2 = i.get('co2');
-          date: i.get('dt'),
+        let chunk = {
-          co2: i.get('co2'),
+                  date: i.get('dt'),
-          humid: i.get('humid'),
+                  co2: co2,
-          lux: i.get('lux'),
+                  humid: i.get('humid'),
-          noise: i.get('noise'),
+                  lux: i.get('lux'),
-          temp: i.get('temp'),
+                  noise: i.get('noise'),
-          occupancy: i.get('occupancy')
+                  temp: i.get('temp'),
-        });
+                  occupancy: i.get('occupancy')
+                };
+
+        if (filter.length >= max) {
+          filter.shift();
+        }
+        filter.push(co2);
+
+
+        //if (step % 100 === 0) {
+        if (filter.length >= max) {
+          let sub100 = filter.reduce((prev, cur) => prev + cur);
+          chunk.sub100 = sub100 / max;
+        }
+
+        chartData.push(chunk);
+        step++;
       });
       console.timeEnd('chartData');
 
@@ -470,6 +498,10 @@
     },
     setSocket: function(newSocket) {
           this.socketHandler = newSocket;
+      this.socketHandler.on('update', function() {
+        console.log('Model updated:', this.get('data'));
+      });
+
         }
 
   });

mdot/mDotServer.censis/mDotServer.censis/app/js/socketmanager.js

@@ -26,7 +26,8 @@ var SOCKETMANAGER = (function() {
             this.on('message', function(o) {
               if (this.listening)
               {
-                console.log('Message', o);
+                //console.log('Message', o);
+                this.checkItem(o);
               }
 
             });
@@ -44,8 +45,22 @@ var SOCKETMANAGER = (function() {
       listenFor: function(id) {
 
             console.log('index of', this.deviceId.indexOf(id));
-        this.listeningID = id;
+        this.listeningID = this.deviceId.indexOf(id);
+      },
+    checkItem : function(item) {
+        //console.log('Checking Item:', item);
+      if (item.hasOwnProperty('tick')) {
+        //console.log('Reject heartbeat');
+      } else {
+        console.log('Wanted deviceid', this.listeningID, item.data.deviceid);
+        //console.log('Data packet!!!');
+        if (item.data.deviceid === this.listeningID) {
+          console.log(item.data);
+          this.set({data:item.data});
+        }
       }
+
+    }
     });
 
   return SocketManager;

mdot/mDotServer.censis/mDotServer.censis/app/js/websocket.js

@@ -31,7 +31,7 @@ var WEBSOCKET = function(model) {
       model.trigger('message',d);
       switch (d.id) {
         default:
-          console.log('Default:',d);
+     //     console.log('Default:',d);
           break;
       }
     };

mdot/mDotServer.censis/mDotServer.censis/app/js/widgets.js

@@ -0,0 +1,15 @@
+/**
+ *
+ * User: Martin Donnelly
+ * Date: 2016-09-12
+ * Time: 16:19
+ *
+ */
+var WIDGET = (function() {
+  'use strict';
+
+  var Widget = Backbone.View.extend({
+
+  });
+
+}());

mdot/mDotServer.censis/mDotServer.censis/lib/server/db-connector.js

@@ -19,13 +19,15 @@ var cn = {
 
 // ElephantSql settings
 
-/*var cn = {
+/*
+var cn = {
   host: 'jumbo.db.elephantsql.com',
   port: 5432,
   database: 'amlrxqev',
   user: 'amlrxqev',
   password: 'K11cvCplk0--oNafsYj4ISN-rVQmVS3y'
-};*/
+};
+*/
 
 exports.dbConnection = pgp(cn);