mitchell/mywebsite
1
0
Fork 0
mirror of https://github.com/mgerb/mywebsite synced 2026-01-12 02:42:48 +00:00
Code Issues Releases Wiki Activity

added sensors pages and other minor changes

Browse Source
This commit is contained in:
mgerb42
2015-12-17 13:05:43 -06:00
parent 259e8f0eb0
commit fdd5ee34cb
9 changed files with 163 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
routes/index.js
View File

@@ -24,8 +24,25 @@ router.get('/vpn', function(req, res, next){
router.get('/sensors', function(req, res, next) {
temperature.aggregate( [ {$sort : {location : -1, updated : -1}}, { $group : { _id : "$location", temperature : {$first : "$temperature"}, humidity : {$first : "$humidity"}} } ] ).exec(function(err, info){
temperature.aggregate( [ {$sort : {location : -1, updated : -1}}, { $group : { _id : "$location", temperature : {$first : "$temperature"}, humidity : {$first : "$humidity"}, updated : {$first : "$updated"}} } ] ).exec(function(err, info){
var date1 = new Date();
for (var i = 0; i < info.length; i++){
console.log(info[i].updated.getTime());
console.log(Date.now());
//compared current time to last db entry - 1200000 milliseconds is 2 minutes
if(info[i].updated.getTime() > (Date.now() - 120000)){
info[i].connected = true;
}
else {
info[i].connected = false;
}
console.log(info[i].connected);
}
res.render('sensors', {query : info});
});
@@ -185,7 +202,7 @@ function renderIndex(res, json){
temperature.findOne({location : "Winona Apartment"}).sort("-updated").exec(function(err, info){
posts.find().sort('-updated').exec(function(err, postsQuery){
res.render('index',{returnParameters : json,
query : info,
blogPosts : postsQuery});

53
routes/sensors.js Normal file
View File

@@ -0,0 +1,53 @@
var express = require('express');
var router = express.Router();
var mongoose = require('mongoose');
require("../models/temperature");
var temperature = mongoose.model('temperature');
/* GET sensors page. */
router.get('/', function(req, res, next) {
temperature.aggregate( [ {$sort : {location : -1, updated : -1}}, { $group : { _id : "$location", temperature : {$first : "$temperature"}, humidity : {$first : "$humidity"}, updated : {$first : "$updated"}} } ] ).exec(function(err, info){
var date1 = new Date();
for (var i = 0; i < info.length; i++){
console.log(info[i].updated.getTime());
console.log(Date.now());
//compared current time to last db entry - 1200000 milliseconds is 2 minutes
if(info[i].updated.getTime() > (Date.now() - 120000)){
info[i].connected = true;
}
else {
info[i].connected = false;
}
console.log(info[i].connected);
}
res.render('sensors', {query : info});
});
});
router.post('/', function(req, res,next) {
});
module.exports = router;