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 date updated to sensors

Browse Source
This commit is contained in:
mgerb42
2015-12-17 13:48:18 -06:00
parent 279303d2b9
commit 345432ef15
3 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
routes/index.js
View File

@@ -22,34 +22,6 @@ 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"}, 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});
});
});
/* GET home page. */ /* GET home page. */
router.get('/', function(req, res, next) { router.get('/', function(req, res, next) {

28
routes/sensors.js
View File

@@ -10,11 +10,30 @@ var temperature = mongoose.model('temperature');
router.get('/', function(req, res, next) { 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){ 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++){ for (var i = 0; i < info.length; i++){
console.log(info[i].updated.getTime()); var monthNames = ["January", "February", "March", "April", "May", "June",
console.log(Date.now()); "July", "August", "September", "October", "November", "December"];
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 dateString = month + " " + date + ", " + year;
//converting 24 hours time to AM or PM
if (hours < 12){
info[i].lastUpdate = dateString + " - " + hours + ":" + minutes + " AM";
}
else if (hours == 12){
info[i].lastUpdate = dateString + " - " + hours + ":" + minutes + " PM";
}
else{
hours = hours - 12;
info[i].lastUpdate = dateString + " - " + hours + ":" + minutes + " PM";
}
//compared current time to last db entry - 1200000 milliseconds is 2 minutes //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() - 120000)){
@@ -24,13 +43,14 @@ router.get('/', function(req, res, next) {
info[i].connected = false; info[i].connected = false;
} }
console.log(info[i].connected);
} }
res.render('sensors', {query : info}); res.render('sensors', {query : info});
}); });
}); });
router.post('/', function(req, res,next) { router.post('/', function(req, res,next) {

2
views/sensors.ejs
View File

@@ -46,6 +46,8 @@
<h3><%=query[i]._id%></h3> <h3><%=query[i]._id%></h3>
<h4>Temperature: <%=query[i].temperature%></h4> <h4>Temperature: <%=query[i].temperature%></h4>
<h4>Humidity: <%=query[i].humidity%></h4> <h4>Humidity: <%=query[i].humidity%></h4>
<span>Updated: <%=query[i].lastUpdate%></span>
<br>
<% if (query[i].connected){ %> <% if (query[i].connected){ %>
<span class="colorGreen">Connected</span> <span class="colorGreen">Connected</span>
<%} else {%> <%} else {%>