From d6cea744476dbef12a94e0651fa0f499214f53eb Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Sat, 7 Nov 2015 13:26:58 -0800
Subject: [PATCH 1/3] Offsets user displayed time to server timezone(EST) for
 the heatmap

---
 server/views/account/show.jade | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/server/views/account/show.jade b/server/views/account/show.jade
index 1392184431..1c354ea939 100644
--- a/server/views/account/show.jade
+++ b/server/views/account/show.jade
@@ -80,14 +80,29 @@ block content
                     #cal-heatmap.d3-centered
                         script.
                             $(document).ready(function () {
+                                var estUTCOffset = -5;
+                                // moment returns the utc offset in minutes
+                                var userUTCOffset = moment().utcOffset() / 60;
+                                var secondsToOffset =
+                                  (estUTCOffset - userUTCOffset) * 3600;
                                 var cal = new CalHeatMap();
                                 var calendar = !{JSON.stringify(calender)};
+                                var offsetCalendar = {};
+                                for (var prop in calendar) {
+                                  if (calendar.hasOwnProperty(prop)) {
+                                    var offsetProp = +prop + secondsToOffset;
+                                      offsetCalendar[offsetProp] =
+                                        calendar[prop];
+                                  }
+                                }
+                                console.log(calendar);
+                                console.log(offsetCalendar);
                                 cal.init({
                                     itemSelector: "#cal-heatmap",
                                     domain: "month",
                                     subDomain: "x_day",
                                     domainGutter: 10,
-                                    data: calendar,
+                                    data: offsetCalendar,
                                     cellSize: 15,
                                     align: 'center',
                                     cellRadius: 3,

From 969204e2c84af8b7bdbf4fbb9f55943505712cfc Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Sat, 7 Nov 2015 16:40:36 -0500
Subject: [PATCH 2/3] Removes debugging statements

---
 server/views/account/show.jade | 2 --
 1 file changed, 2 deletions(-)

diff --git a/server/views/account/show.jade b/server/views/account/show.jade
index 1c354ea939..a296532e35 100644
--- a/server/views/account/show.jade
+++ b/server/views/account/show.jade
@@ -95,8 +95,6 @@ block content
                                         calendar[prop];
                                   }
                                 }
-                                console.log(calendar);
-                                console.log(offsetCalendar);
                                 cal.init({
                                     itemSelector: "#cal-heatmap",
                                     domain: "month",

From 42ab1d70fd84f879eb983e43ec7ec8e1478df3d7 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Tue, 10 Nov 2015 09:59:49 -0800
Subject: [PATCH 3/3] Remove unnecessary unary operator

---
 server/views/account/show.jade | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/server/views/account/show.jade b/server/views/account/show.jade
index a296532e35..c8955d6d1a 100644
--- a/server/views/account/show.jade
+++ b/server/views/account/show.jade
@@ -90,9 +90,8 @@ block content
                                 var offsetCalendar = {};
                                 for (var prop in calendar) {
                                   if (calendar.hasOwnProperty(prop)) {
-                                    var offsetProp = +prop + secondsToOffset;
-                                      offsetCalendar[offsetProp] =
-                                        calendar[prop];
+                                    var offsetProp = prop + secondsToOffset;
+                                    offsetCalendar[offsetProp] = calendar[prop];
                                   }
                                 }
                                 cal.init({