From a3f86e8a7e5d94e34ccb7eb4763d0c3a831d12d6 Mon Sep 17 00:00:00 2001
From: Mitchell <mgerb42@gmail.com>
Date: Sun, 24 Jan 2016 19:51:12 -0600
Subject: [PATCH] fixed updated date - adjusted sensor page for humidity -
 updated mongoose model for temperature

---
 models/temperature.js | 6 +++---
 routes/sensors.js     | 7 ++++---
 views/sensors.ejs     | 6 +++++-
 3 files changed, 12 insertions(+), 7 deletions(-)

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
 		<div class="col-lg-4">
 			<h3><%=query[i]._id%></h3>
 			<h4>Temperature: <%=query[i].temperature%>°F </h4>
-			<h4>Humidity: <%=query[i].humidity%>%</h4>
+			
+			<% if (query[i].humidity != null) { %>
+				<h4>Humidity: <%=query[i].humidity%>%</h4>
+			<%}%>
+
 			<span>Updated: <%=query[i].lastUpdate%></span>
 			<br>
 			<% if (query[i].connected){ %>