From 0bfa4f6c4b382428ba935a907cdacd9f34c1ead8 Mon Sep 17 00:00:00 2001 From: Martin Donnelly Date: Sat, 20 Aug 2016 16:45:02 +0100 Subject: [PATCH] =?UTF-8?q?=E2=80=9D2016-08-20=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mdot/mdot_server/mdot_server/app/js/mdot.js | 4 +++- mdot/mdot_server/mdot_server/app/test.html | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mdot/mdot_server/mdot_server/app/js/mdot.js b/mdot/mdot_server/mdot_server/app/js/mdot.js index 48382e7..477c865 100644 --- a/mdot/mdot_server/mdot_server/app/js/mdot.js +++ b/mdot/mdot_server/mdot_server/app/js/mdot.js @@ -128,6 +128,7 @@ DeviceCollection.models = tempCollection.models; + notification.notify('success', 'Data loaded'); DeviceCollection.trigger('update'); console.log('temporal:', this.temporal); }, decoder: function(data) { @@ -211,7 +212,7 @@ console.log('MDOT:render'); $('#output').empty(); var that = this; - that.$el.append(this.template); + // that.$el.append(this.template); return this; } @@ -243,6 +244,7 @@ }, updateDevice: function() { var fetchObj = {beforeSend: sendAuthentication}; console.log('MainView:Updatedevice'); + notification.clearAll(); if (this.model.has('device')) { // FetchObj.data = $.param({key:'"'+ this.model.get('device') + '"'}); // this.collection.url = 'https://qz0da4.internetofthings.ibmcloud.com/api/v0002/historian/types/mDot/devices/' + this.model.get('device'); diff --git a/mdot/mdot_server/mdot_server/app/test.html b/mdot/mdot_server/mdot_server/app/test.html index 4ca1d88..c699a47 100644 --- a/mdot/mdot_server/mdot_server/app/test.html +++ b/mdot/mdot_server/mdot_server/app/test.html @@ -10,7 +10,7 @@ - +
@@ -188,6 +188,7 @@ +