From 13e24bbdbbc0d401b914bfc74dfc2f45d88bce36 Mon Sep 17 00:00:00 2001
From: Sam Nicholls <sam.n@studio8media.co.uk>
Date: Sun, 27 Jan 2013 23:37:35 +0000
Subject: [PATCH] Testing rolling week [#216]

---
 modules/users/pages.js | 15 ++++++++++++---
 views/users/users.jade |  3 ++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/modules/users/pages.js b/modules/users/pages.js
index b129338..79924b1 100644
--- a/modules/users/pages.js
+++ b/modules/users/pages.js
@@ -26,18 +26,24 @@ var pages = function(dbot) {
             if(connections.hasOwnProperty(connection) && 
                 connections[connection].channels.hasOwnProperty(channel)) {
 
-                var chanData = dbot.api.stats.getChanStats(connection, channel, ["freq"]);
+                //TODO(samstudio8): Stats API Functionality
+                var chanData = dbot.api.stats.getChanStats(connection, channel, ["week"]);
                 var chanFreq = [];
+                var chanFreqLabel = [];
 
                 if(chanData){
+                    var cur_ptr;
                     for(var i=0; i <= 6; i++){
+                        cur_ptr = ((i+1)+chanData.fields.week.raw.ptr) % 7;
                         for(var j=0; j <= 23; j++){
-                            chanFreq.push(chanData.fields.freq.raw[i][j]);
+                            chanFreq.push(chanData.fields.week.raw[cur_ptr][j]);
                         }
+                        chanFreqLabel.push("'"+chanData.fields.week.raw[cur_ptr].name+"'");
                     }
                 }
                 else{
                     for (var i = 0; i < 168; i++) chanFreq[i] = 0;
+                    chanFreqLabel = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"];
                 }
 
                 var userData = { "active": [], "inactive": [], "offline": []};
@@ -79,7 +85,10 @@ var pages = function(dbot) {
                     'channel': channel,
                     'userStats': userDataSorted,
                     'chanFreq': chanFreq,
-                    'chanFreqLen': chanFreq.length });
+                    'chanFreqLen': chanFreq.length,
+                    "locals": {
+                      'chanFreqLabel': chanFreqLabel,  
+                    }});
 
             } else {
                 res.render_core('error', { 'name': dbot.config.name, 'message': 'No such connection or channel.' });
diff --git a/views/users/users.jade b/views/users/users.jade
index 85eba2d..2b97de5 100644
--- a/views/users/users.jade
+++ b/views/users/users.jade
@@ -94,7 +94,7 @@ block content
               .text(String);
 
             chart.selectAll("text.days")
-              .data(["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"])
+              .data([!{locals.chanFreqLabel}])
               .enter().append("text")
               .attr("x", function(d, i){ return ((i+0.5) * w * 24) + ticks; })
               .attr("y", h + 25)
@@ -149,6 +149,7 @@ block content
     div#backlink 
         a(href='/channels/'+connection) &laquo; Channel List
     div#row
+      h4 Seven Day Activity
       div.barchart#chanFreqChart
       hr
     div#row