martin/censis-archive
martin/censis-archive
1
0
Fork 0
mirror of https://gitlab.silvrtree.co.uk/martind2000/censis-archive.git synced 2025-02-25 13:13:35 +00:00
Code Issues Projects Releases Wiki Activity

”2016-09-14”

Browse Source
This commit is contained in:
Martin Donnelly 2016-09-14 16:45:03 +01:00
parent 70b9b267a8
commit f578eab065
2 changed files with 179 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mdot/mDotServer.censis/mDotServer.censis/app/js/mdot.js
View File

@ -482,7 +482,7 @@
filter.push(co2); filter.push(co2);
//if (step % 100 === 0) { //If (step % 100 === 0) {
if (filter.length >= max) { if (filter.length >= max) {
let sub100 = filter.reduce((prev, cur) => prev + cur); let sub100 = filter.reduce((prev, cur) => prev + cur);
chunk.sub100 = sub100 / max; chunk.sub100 = sub100 / max;
@ -508,27 +508,31 @@
var Widget = Backbone.View.extend({ var Widget = Backbone.View.extend({
tagName : 'div', //el: '#widgets',
template: _.template($('#widget-template').html()), template: _.template($('#widget-template').html()),
initialize: function() { initialize: function() {
_.bindAll(this, 'render'); _.bindAll(this, 'render');
this.modes = ['', 'lux', 'temp', 'co2', 'humid', 'noise'];
this.listenTo(this.model,'change',function(d){ this.titles = [
let data = d.get('data'); '', 'Light Levels', 'Temperature', 'Co2 Levels', 'Humidity', 'Sound'
];
this.listenTo(this.model,'change',function() {
this.render(); this.render();
}); });
this.widgetMode = this.id.split('-')[1]; this.widgetMode = this.id.split('-')[1];
this.title = this.titles[this.modes.indexOf(this.widgetMode)];
this.render(); this.render();
}, },
render: function() { render: function() {
let data = this.model.get('data'); let data = this.model.get('data');
let value = (typeof data !== 'undefined') ? data[this.widgetMode] : 0; let value = (typeof data !== 'undefined') ? data[this.widgetMode] : 0;
var html = this.template({name:this.widgetMode,value:value}); var html = this.template({name: this.title,value: value});
console.log(html); console.log(html);
console.log(this.$el); console.log(this.$el);
this.$el.empty(); console.log('rendering');
this.$el.html('<p>hello</p>'); this.$el.append(html);
return this; return this;
}}); }});
@ -557,6 +561,6 @@
views.mainview.setSocket(webSocketModel); views.mainview.setSocket(webSocketModel);
views.grapher.setSocket(webSocketModel); views.grapher.setSocket(webSocketModel);
var tempWidget = new Widget({model:webSocketModel, id:'widget-temp'}); var tempWidget = new Widget({model: webSocketModel, id: 'widget-temp'});
var co2Widget = new Widget({model:webSocketModel, id:'widget-co2'}); var co2Widget = new Widget({model: webSocketModel, id: 'widget-co2'});
})(jQuery); })(jQuery);

37
mdot/mDotServer.censis/mDotServer.censis/views/test.ejs
View File

@ -55,15 +55,20 @@
</div> </div>
</div> </div>
</div> </div>
<div id="widget-temp" style="color:yellow;background-color:grey;border:1px yellow solid;"> <div id="widgets">
<div class='mui-row' id="widget-temp">
</div> </div>
<div id="widget-co2" style="color:yellow;background-color:grey;border 1px solid yellow;"></div> <div class='mui-row' id="widget-co2"></div>
<script type="text/template" id="loaded-template">
</div>
</div>
<script type="text/template" id="loaded-template">
<div <div
style="background-color: darkred;color: white;font-weight: 900;text-align: center">Loaded style="background-color: darkred;color: white;font-weight: 900;text-align: center">Loaded
</div> </div>
</script> </script>
<script type="text/template" id="main-template"> <script type="text/template" id="main-template">
<div class="mui-container"> <div class="mui-container">
<div class="mui-row"> <div class="mui-row">
<div class="mui-select"> <div class="mui-select">
@ -126,11 +131,11 @@
</div> </div>
</div> </div>
</script> </script>
<script type="text/template" id="list-template"> <script type="text/template" id="list-template">
<ul></ul> <ul></ul>
</script> </script>
<script type="text/template" id="item-template"> <script type="text/template" id="item-template">
<div class="mui-row"> <div class="mui-row">
<div class="mui-col-md-2"><%= item.timestamp %></div> <div class="mui-col-md-2"><%= item.timestamp %></div>
<div class="mui-col-md-2"><%= item.lux %></div> <div class="mui-col-md-2"><%= item.lux %></div>
@ -139,8 +144,8 @@
<div class="mui-col-md-2"><%= item.humidity %></div> <div class="mui-col-md-2"><%= item.humidity %></div>
<div class="mui-col-md-2"><%= item.sound %></div> <div class="mui-col-md-2"><%= item.sound %></div>
</div> </div>
</script> </script>
<script type="text/template" id="AMChart-template"> <script type="text/template" id="AMChart-template">
<div class="mui-container"> <div class="mui-container">
<div class="mui-row"> <div class="mui-row">
<div class="mui-select mui-col-md-12"> <div class="mui-select mui-col-md-12">
@ -172,8 +177,8 @@
</div> </div>
</div> </div>
</div> </div>
</script> </script>
<script type="text/template" id="graph-template"> <script type="text/template" id="graph-template">
<div class="mui-container"> <div class="mui-container">
<div class="mui-row"> <div class="mui-row">
<div class="mui-select mui-col-md-6"> <div class="mui-select mui-col-md-6">
@ -212,10 +217,10 @@
</div> </div>
</div> </div>
</div> </div>
</script> </script>
<script type="text/template" id="widget-template"> <script type="text/template" id="widget-template">
<div> <div class="mui-col-md-3 panel">
<div class="mui-col-md-2"><%= name %></div> <div class="mui-col-md-2"><%= name %></div>
<div class="mui-col-md-2"><%= value %></div> <div class="mui-col-md-2"><%= value %></div>
</div> </div>