martin/censis-archive
martin/censis-archive
1
0
Fork 0
mirror of https://gitlab.silvrtree.co.uk/martind2000/censis-archive.git synced 2025-01-26 20:36:17 +00:00
Code Issues Projects Releases Wiki Activity

”2016-08-20”

Browse Source
This commit is contained in:
Martin Donnelly 2016-08-20 16:45:02 +01:00
parent e3c5e229fd
commit 0bfa4f6c4b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mdot/mdot_server/mdot_server/app/js/mdot.js
View File

@ -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');

3
mdot/mdot_server/mdot_server/app/test.html
View File

@ -10,7 +10,7 @@
<script src="lib/notification.js"></script>
<link rel="stylesheet" href="css/notification.css">
</head>
<body style="background-color:#3f3f4f">
<body style="background-color:#171d25">
<div class="mui-container">
<div class='mui-row'>
<div class="mui-col-md-3 panel">
@ -188,6 +188,7 @@
<script src="lib/underscore.js"></script>
<script src="lib/backbone.js"></script>
<script src="lib/sugar-date.js"></script>
<script src="lib/notification.js"></script>
<script src="lib/amcharts.js"></script>
<script src="lib/serial.js"></script>
<script src="lib/amstock.js"></script>