From 70b9b267a82170076e011b0f93e433eeab356f5e Mon Sep 17 00:00:00 2001
From: Martin Donnelly <martind2000@gmail.com>
Date: Tue, 13 Sep 2016 16:45:02 +0100
Subject: [PATCH] =?UTF-8?q?=E2=80=9D2016-09-13=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mDotServer.censis/app/js/mdot.js          | 30 +++++++++++++++++++
 .../mDotServer.censis/app/js/socketmanager.js |  6 ++++
 .../mDotServer.censis/app/js/widgets.js       |  2 --
 .../lib/server/db-connector.js                |  6 ++--
 .../mDotServer.censis/views/test.ejs          | 10 +++++++
 5 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/mdot/mDotServer.censis/mDotServer.censis/app/js/mdot.js b/mdot/mDotServer.censis/mDotServer.censis/app/js/mdot.js
index 23e53d0..55caf69 100644
--- a/mdot/mDotServer.censis/mDotServer.censis/app/js/mdot.js
+++ b/mdot/mDotServer.censis/mDotServer.censis/app/js/mdot.js
@@ -506,6 +506,33 @@
 
   });
 
+
+  var Widget = Backbone.View.extend({
+    tagName : 'div',
+    template: _.template($('#widget-template').html()),
+    initialize: function() {
+      _.bindAll(this, 'render');
+
+      this.listenTo(this.model,'change',function(d){
+        let data = d.get('data');
+        this.render();
+      });
+
+      this.widgetMode = this.id.split('-')[1];
+      this.render();
+    },
+    render: function() {
+      let data = this.model.get('data');
+      let value = (typeof data !== 'undefined') ? data[this.widgetMode] : 0;
+      var html = this.template({name:this.widgetMode,value:value});
+      console.log(html);
+      console.log(this.$el);
+      this.$el.empty();
+       this.$el.html('<p>hello</p>');
+       return this;
+     }});
+
+
   notification.configProfile('global', {
     stacking: false
   });
@@ -529,4 +556,7 @@
 
   views.mainview.setSocket(webSocketModel);
   views.grapher.setSocket(webSocketModel);
+
+  var tempWidget = new Widget({model:webSocketModel, id:'widget-temp'});
+  var co2Widget = new Widget({model:webSocketModel, id:'widget-co2'});
 })(jQuery);
diff --git a/mdot/mDotServer.censis/mDotServer.censis/app/js/socketmanager.js b/mdot/mDotServer.censis/mDotServer.censis/app/js/socketmanager.js
index a94e7cc..3403249 100644
--- a/mdot/mDotServer.censis/mDotServer.censis/app/js/socketmanager.js
+++ b/mdot/mDotServer.censis/mDotServer.censis/app/js/socketmanager.js
@@ -31,6 +31,11 @@ var SOCKETMANAGER = (function() {
               }
 
             });
+
+        this.on('all', function(d) {
+                       console.log('model:all', d);
+
+                     });
           },
       turnOn: function() {
         console.log('SocketManager:turnOn');
@@ -57,6 +62,7 @@ var SOCKETMANAGER = (function() {
         if (item.data.deviceid === this.listeningID) {
           console.log(item.data);
           this.set({data:item.data});
+          console.log('this', this)
         }
       }
 
diff --git a/mdot/mDotServer.censis/mDotServer.censis/app/js/widgets.js b/mdot/mDotServer.censis/mDotServer.censis/app/js/widgets.js
index 315ba71..594408c 100644
--- a/mdot/mDotServer.censis/mDotServer.censis/app/js/widgets.js
+++ b/mdot/mDotServer.censis/mDotServer.censis/app/js/widgets.js
@@ -8,8 +8,6 @@
 var WIDGET = (function() {
   'use strict';
 
-  var Widget = Backbone.View.extend({
 
-  });
 
 }());
diff --git a/mdot/mDotServer.censis/mDotServer.censis/lib/server/db-connector.js b/mdot/mDotServer.censis/mDotServer.censis/lib/server/db-connector.js
index 3184e50..e219a2e 100644
--- a/mdot/mDotServer.censis/mDotServer.censis/lib/server/db-connector.js
+++ b/mdot/mDotServer.censis/mDotServer.censis/lib/server/db-connector.js
@@ -19,15 +19,13 @@ 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);
 
diff --git a/mdot/mDotServer.censis/mDotServer.censis/views/test.ejs b/mdot/mDotServer.censis/mDotServer.censis/views/test.ejs
index 7bc5ac5..bed3a24 100644
--- a/mdot/mDotServer.censis/mDotServer.censis/views/test.ejs
+++ b/mdot/mDotServer.censis/mDotServer.censis/views/test.ejs
@@ -55,6 +55,9 @@
       </div>
     </div>
   </div>
+  <div id="widget-temp" style="color:yellow;background-color:grey;border:1px yellow solid;">
+  </div>
+  <div id="widget-co2" style="color:yellow;background-color:grey;border 1px solid yellow;"></div>
   <script type="text/template" id="loaded-template">
     <div
       style="background-color: darkred;color: white;font-weight: 900;text-align: center">Loaded
@@ -211,6 +214,13 @@
     </div>
   </script>
 
+  <script type="text/template" id="widget-template">
+      <div>
+        <div class="mui-col-md-2"><%= name %></div>
+        <div class="mui-col-md-2"><%= value %></div>
+      </div>
+    </script>
+
   <!-- build:vendor -->
   <script src="lib/mui.js"></script>
   <script src="lib/notification.js"></script>