From 6b851441649372d4710ce42fd12f50e5c776ac4c Mon Sep 17 00:00:00 2001
From: Sami Mokaddem <mokaddem.sami@gmail.com>
Date: Fri, 10 Nov 2017 11:15:31 +0100
Subject: [PATCH] Updated org contrib. overtime to display the date

---
 contributor_helper.py  | 12 ++++++------
 static/js/contrib.js   |  4 ++--
 templates/contrib.html |  2 +-
 util.py                |  5 ++++-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/contributor_helper.py b/contributor_helper.py
index 51f2f95..86feef9 100644
--- a/contributor_helper.py
+++ b/contributor_helper.py
@@ -292,21 +292,21 @@ class Contributor_helper:
         # show current top 5 org points overtime (last 5 days)
         for dic in topSortedOrg[0:5]:
             org = dic['org']
-            overtime = []
             to_append = self.getOrgOvertime(org)
             data.append(to_append)
         return data
 
     def getOrgOvertime(self, org):
         overtime = []
-        today = datetime.datetime.now()
-        for deltaD in range(1,6,1):
-            date = (datetime.datetime(today.year, today.month, today.day) - datetime.timedelta(days=deltaD))
-            keyname = 'CONTRIB_DAY:'+util.getDateStrFormat(date)
+        today = datetime.datetime.today()
+        today = today.replace(hour=0, minute=0, second=0, microsecond=0)
+        for curDate in util.getXPrevDaysSpan(today, 7):
+            timestamp = util.getTimestamp(curDate)
+            keyname = 'CONTRIB_DAY:'+util.getDateStrFormat(curDate)
             org_score =  self.serv_redis_db.zscore(keyname, org)
             if org_score is None:
                 org_score = 0
-            overtime.append([deltaD, org_score])
+            overtime.append([timestamp, org_score])
         to_return = {'label': org, 'data': overtime}
         return to_return
 
diff --git a/static/js/contrib.js b/static/js/contrib.js
index 13013ce..4f9ee03 100644
--- a/static/js/contrib.js
+++ b/static/js/contrib.js
@@ -469,7 +469,7 @@ function updateProgressHeader(org) {
             // transform secs into date
             var new_data = [];
             for(list of data['data']) {
-                new_data.push([new Date(list[0]*1000), list[1]]);
+                new_data.push([list[0]*1000, list[1]]);
             }
             data['data'] = new_data;
             toPlot.push(data);
@@ -554,7 +554,7 @@ $(document).ready(function() {
         for(i in data){
             var new_data = [];
             for(list of data[i]['data']) {
-                new_data.push([new Date(list[0]*1000), list[1]]);
+                new_data.push([list[0]*1000, list[1]]);
             }
             data[i]['data'] = new_data;
         }
diff --git a/templates/contrib.html b/templates/contrib.html
index 333f427..5d0f91d 100644
--- a/templates/contrib.html
+++ b/templates/contrib.html
@@ -284,7 +284,7 @@
                             <div class="col-lg-12">
                                 <div class="panel panel-default" style="height: 100%;">
                                     <div class="panel-heading bg-info" style="font-weight: bold;">
-                                        <i class="fa fa-th-list " style="margin-right: 5px; color: #f0ad4e;"></i><b>Contributors and Categories (total)</b>
+                                        <i class="fa fa-th-list " style="margin-right: 5px; color: #f0ad4e;"></i><b>Contributors and categories (total)</b>
                                     </div>
                                     <div id="panelRanking" class="panel-body" style="height: 100%;">
 
diff --git a/util.py b/util.py
index ba794f1..8518554 100644
--- a/util.py
+++ b/util.py
@@ -1,4 +1,4 @@
-import datetime
+import datetime, time
 
 ONE_DAY = 60*60*24
 
@@ -26,3 +26,6 @@ def getXPrevDaysSpan(date, days):
 
 def getDateStrFormat(date):
     return str(date.year)+str(date.month).zfill(2)+str(date.day).zfill(2)
+
+def getTimestamp(date):
+    return time.mktime(date.timetuple())