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

added meeting api

Browse Source
This commit is contained in:
Martin Donnelly 2016-08-19 16:38:02 +01:00
parent 685383d572
commit 82c650cb3a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/js/mdot.js
View File

@ -58,15 +58,15 @@
{
let tsMS = new Date(ts).getTime();
console.log(new Date(ts).getTime());
console.log(ts);
// console.log(new Date(ts).getTime());
// console.log(ts);
_(occupancy).each(function(item) {
console.log(new Date(item.start).getTime(), new Date(item.start).getTime());
console.log(item.start, item.end);
// console.log(new Date(item.start).getTime(), new Date(item.start).getTime());
// console.log(item.start, item.end);
if ((ts >= new Date(item.start).getTime()) && (ts <= new Date(item.end).getTime()))
{
console.log('Occupancy', item.count);
// console.log('Occupancy', item.count);
return item.count;
}
@ -102,7 +102,7 @@
this.temporal.high = i.timestamp;
}
_occupancy = this.findOccupancy(i.timestamp, events.occupancy);
// _occupancy = this.findOccupancy(i.timestamp, events.occupancy);
tempCollection.add({
dt: i.timestamp,
@ -110,8 +110,8 @@
temp: i.temp,
co2: i.co2,
humid: i.humidity,
noise: i.sound,
occupancy: _occupancy
noise: i.sound/*,
occupancy: _occupancy*/
});
}, this);