From 0f741192a9d1a24f04efdc930026bcec1900efb5 Mon Sep 17 00:00:00 2001 From: mgerb42 Date: Mon, 21 Dec 2015 09:39:17 -0600 Subject: [PATCH] updated for central time zone --- bin/www | 2 +- routes/index.js | 2 +- routes/sensors.js | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/www b/bin/www index d2484eb..87ffb43 100755 --- a/bin/www +++ b/bin/www @@ -12,7 +12,7 @@ var http = require('http'); * Get port from environment and store in Express. */ -var port = normalizePort(process.env.PORT || '80'); +var port = normalizePort(process.env.PORT || '3000'); app.set('port', port); /** diff --git a/routes/index.js b/routes/index.js index 1744ee2..29714c4 100644 --- a/routes/index.js +++ b/routes/index.js @@ -32,7 +32,7 @@ router.get('/', function(req, res, next) { }); router.post('/', function(req, res,next) { - var serverTimeZone = 300; + var serverTimeZone = 360; var clientTimeZone = req.body.timeZone; var timeZoneOffset = clientTimeZone - serverTimeZone; diff --git a/routes/sensors.js b/routes/sensors.js index ad59117..f294ff7 100644 --- a/routes/sensors.js +++ b/routes/sensors.js @@ -40,17 +40,17 @@ router.get('/', function(req, res, next) { //converting 24 hours time to AM or PM if (hours == 0){ hours = 12; - info[i].lastUpdate = dateString + " - " + hours + ":" + minutes + " AM (ET)"; + info[i].lastUpdate = dateString + " - " + hours + ":" + minutes + " AM"; } else if (hours < 12){ - info[i].lastUpdate = dateString + " - " + hours + ":" + minutes + " AM (ET)"; + info[i].lastUpdate = dateString + " - " + hours + ":" + minutes + " AM"; } else if (hours == 12){ - info[i].lastUpdate = dateString + " - " + hours + ":" + minutes + " PM (ET)"; + info[i].lastUpdate = dateString + " - " + hours + ":" + minutes + " PM"; } else{ hours = hours - 12; - info[i].lastUpdate = dateString + " - " + hours + ":" + minutes + " PM (ET)"; + info[i].lastUpdate = dateString + " - " + hours + ":" + minutes + " PM"; } //compared current time to last db entry - 1200000 milliseconds is 2 minutes