This should fix the problem of showing usernames instead of real name…

…s in the progress page.

controllers/dashboard.py

@@ -75,8 +75,8 @@ def index():
     user_activity = data_analyzer.user_activity
     for user, activity in user_activity.user_activities.iteritems():
         read_data.append({
-            "student":activity.username,  # causes username instead of full name to show in the report, but it works  ?? how to display the name but use the username on click??
-            "sid":activity.name,
+            "student":activity.name,  # causes username instead of full name to show in the report, but it works  ?? how to display the name but use the username on click??
+            "sid":activity.username,
             "count":activity.get_page_views()
             })
 

static/dashboard-charts.js

@@ -16,13 +16,16 @@ function DashboardCharts(){
         width = 400 - margins.left - margins.right,
         height = (20 * 24) - margins.top - margins.bottom,
         dataset = data,
+        nameMap = {},
         series = dataset.map(function (d) {
             return d['name'];
         }),
+
             dataset = dataset.map(function (d) {
                 return d.data.map(function (o, i) {
                     // Structure it so that your numeric
                     // axis (the stacked amount) is y
+                    nameMap[o['student']] = o['sid'];
                     return {
                         y: o['count'],
                         x: o['student']
@@ -119,7 +122,7 @@ function DashboardCharts(){
     .style("cursor", "pointer")
     .style("text-decoration","underline")
     .on("click", function(d){
-        document.location.href = "studentreport?id=" + d;
+       document.location.href = "studentreport?id=" + nameMap[d];
     });
     }