diff --git a/models/temperature.js b/models/temperature.js index f099d95..95bdc92 100644 --- a/models/temperature.js +++ b/models/temperature.js @@ -1,11 +1,11 @@ var mongoose = require('mongoose'); var temperatureSchema = new mongoose.Schema({ - temperature: Number, - humidity: Number, + temperature: {type : Number, default : null}, + humidity: {type : Number, default : null}, location: {type : String, default : "Undefined Location"}, updated: {type: Date, default: Date.now} }); -mongoose.model('temperature', temperatureSchema); \ No newline at end of file +mongoose.model('temperature', temperatureSchema); diff --git a/routes/sensors.js b/routes/sensors.js index be664c8..aadb14f 100644 --- a/routes/sensors.js +++ b/routes/sensors.js @@ -10,7 +10,8 @@ var temperature = mongoose.model('temperature'); router.get('/', function(req, res, next) { temperature.aggregate( [{ $group : { _id : "$location", temperature : {$last : "$temperature"}, humidity : {$last : "$humidity"}, updated : {$last : "$updated"}}}, - {$sort : {location : -1, updated : -1}} ] ).exec(function(err, info){ + {$sort : {_id : -1}} ] ).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 @@ -22,8 +23,8 @@ router.get('/', function(req, res, next) { var hours = info[i].updated.getHours(); var minutes = info[i].updated.getMinutes(); var month = monthNames[info[i].updated.getMonth()]; - var date = info[i].updated.getUTCDate(); - var year = info[i].updated.getUTCFullYear(); + var date = info[i].updated.getDate(); + var year = info[i].updated.getFullYear(); var dateString = month + " " + date + ", " + year; diff --git a/views/sensors.ejs b/views/sensors.ejs index f8fd415..4d00edd 100644 --- a/views/sensors.ejs +++ b/views/sensors.ejs @@ -25,7 +25,11 @@ I will continue to investigate this problem when I can get my hands on the senso