mitchell/mywebsite
1
0
Fork 0
mirror of https://github.com/mgerb/mywebsite synced 2026-01-11 18:32:50 +00:00
Code Issues Releases Wiki Activity

added graphs

Browse Source
This commit is contained in:
mgerb42
2015-12-19 03:53:29 -06:00
parent 78f5e35270
commit 7d3822904d
7 changed files with 182 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
routes/api.js
View File

@@ -6,14 +6,14 @@ require("../models/temperature");
var temperature = mongoose.model('temperature');
/* GET sensors page. */
//api to return the max and min temps of each day based on location
router.get('/allsensors', function(req, res, next) {
//var location = req.query.location;
temperature.aggregate([{$group : { _id : {location : "$location", month: {$month: "$updated" }, day: { $dayOfMonth: "$updated" }, year: { $year: "$updated" }},
max : {$max : "$temperature"},
min : {$min : "$temperature"}}},
{$sort : {"_id.month" : -1, "_id.day" : -1, "_id.year" : -1}}]).exec(function(err, info){
{$sort : {"_id.month" : 1, "_id.day" : 1, "_id.year" : 1}}]).exec(function(err, info){
console.log(info);
res.setHeader('Content-Type', 'application/json');
@@ -26,13 +26,20 @@ router.get('/allsensors', function(req, res, next) {
router.get('/sensorbylocation', function(req, res, next) {
var loc = req.query.location;
console.log(loc);
//var location = req.query.location;
temperature.aggregate([ {$match : {location : loc}},
var year = req.query.year;
if (year == null){
var date = new Date();
year = date.getFullYear();
}
//query finds a entries in a collection based on location and the year specified
//they are then grouped by date and sorted by date as well
temperature.aggregate([ {$match : {location : loc, updated : {$gte : new Date('1 Jan, ' + year), $lt : new Date('1 Jan ' + year +1)}}},
{$group : { _id : {location : "$location", month: {$month: "$updated" }, day: { $dayOfMonth: "$updated" }, year: { $year: "$updated" }},
max : {$max : "$temperature"},
min : {$min : "$temperature"}}},
{$sort : {"_id.month" : -1, "_id.day" : -1, "_id.year" : -1}}]).exec(function(err, info){
{$sort : {"_id.month" : 1, "_id.day" : 1, "_id.year" : 1}}]).exec(function(err, info){
console.log(info);
res.setHeader('Content-Type', 'application/json');

26
routes/sensors.js
View File

@@ -11,6 +11,9 @@ 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){
//get month for each entry and convert 24 hour time to US time
//also check to see if device has sent a data point in past 5 minutes
//if not will show up as disconnected
for (var i = 0; i < info.length; i++){
var monthNames = ["January", "February", "March", "April", "May", "June",
"July", "August", "September", "October", "November", "December"];
@@ -23,6 +26,17 @@ router.get('/', function(req, res, next) {
var dateString = month + " " + date + ", " + year;
var loc = info[i]._id;
var info_link = "/sensors/information?location="
if (loc != null){
loc = loc.split().join("+");
info_link += loc;
}
info[i].info_link = info_link;
//converting 24 hours time to AM or PM
if (hours < 12){
info[i].lastUpdate = dateString + " - " + hours + ":" + minutes + " AM (ET)";
@@ -36,7 +50,7 @@ router.get('/', function(req, res, next) {
}
//compared current time to last db entry - 1200000 milliseconds is 2 minutes
if(info[i].updated.getTime() > (Date.now() - 120000)){
if(info[i].updated.getTime() > (Date.now() - 350000)){
info[i].connected = true;
}
else {
@@ -53,7 +67,15 @@ router.get('/', function(req, res, next) {
});
router.post('/', function(req, res,next) {
router.get('/information', function(req, res, err){
var sensor_location = req.query.location;
if (sensor_location == null){
res.redirect('/404');
}
res.render('sensor_information', {info : {location : sensor_location}});
});