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

fixed updated date - adjusted sensor page for humidity - updated mongoose model for temperature

Browse Source
This commit is contained in:
Mitchell
2016-01-24 19:51:12 -06:00
parent 5c306cac56
commit a3f86e8a7e
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
models/temperature.js
View File

@@ -1,8 +1,8 @@
var mongoose = require('mongoose'); var mongoose = require('mongoose');
var temperatureSchema = new mongoose.Schema({ var temperatureSchema = new mongoose.Schema({
temperature: Number, temperature: {type : Number, default : null},
humidity: Number, humidity: {type : Number, default : null},
location: {type : String, default : "Undefined Location"}, location: {type : String, default : "Undefined Location"},
updated: {type: Date, default: Date.now} updated: {type: Date, default: Date.now}
}); });

7
routes/sensors.js
View File

@@ -10,7 +10,8 @@ var temperature = mongoose.model('temperature');
router.get('/', function(req, res, next) { router.get('/', function(req, res, next) {
temperature.aggregate( [{ $group : { _id : "$location", temperature : {$last : "$temperature"}, humidity : {$last : "$humidity"}, updated : {$last : "$updated"}}}, 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 //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 //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 hours = info[i].updated.getHours();
var minutes = info[i].updated.getMinutes(); var minutes = info[i].updated.getMinutes();
var month = monthNames[info[i].updated.getMonth()]; var month = monthNames[info[i].updated.getMonth()];
var date = info[i].updated.getUTCDate(); var date = info[i].updated.getDate();
var year = info[i].updated.getUTCFullYear(); var year = info[i].updated.getFullYear();
var dateString = month + " " + date + ", " + year; var dateString = month + " " + date + ", " + year;

4
views/sensors.ejs
View File

@@ -25,7 +25,11 @@ I will continue to investigate this problem when I can get my hands on the senso
<div class="col-lg-4"> <div class="col-lg-4">
<h3><%=query[i]._id%></h3> <h3><%=query[i]._id%></h3>
<h4>Temperature: <%=query[i].temperature%>°F </h4> <h4>Temperature: <%=query[i].temperature%>°F </h4>
<% if (query[i].humidity != null) { %>
<h4>Humidity: <%=query[i].humidity%>%</h4> <h4>Humidity: <%=query[i].humidity%>%</h4>
<%}%>
<span>Updated: <%=query[i].lastUpdate%></span> <span>Updated: <%=query[i].lastUpdate%></span>
<br> <br>
<% if (query[i].connected){ %> <% if (query[i].connected){ %>