From 386835153bbe4ea5428cca6eb417fbd0a21deabf Mon Sep 17 00:00:00 2001
From: Bridger Maxwell <bridgeyman@gmail.com>
Date: Tue, 17 Apr 2012 00:17:12 -0400
Subject: [PATCH 1/3] Added histogram graph for courseware administrators.

---
 djangoapps/courseware/module_render.py | 11 ++++++--
 templates/courseware.html              |  5 ++++
 templates/staff_problem_histogram.js   | 38 ++++++++++++++++++++++++++
 templates/staff_problem_info.html      |  4 +--
 4 files changed, 52 insertions(+), 6 deletions(-)
 create mode 100644 templates/staff_problem_histogram.js

diff --git a/djangoapps/courseware/module_render.py b/djangoapps/courseware/module_render.py
index 38f9e0211b..d10d13637a 100644
--- a/djangoapps/courseware/module_render.py
+++ b/djangoapps/courseware/module_render.py
@@ -144,12 +144,17 @@ def render_x_module(user, request, xml_module, module_object_preload):
         module_object_preload.append(smod)
     # Grab content
     content = instance.get_html()
+    init_js = instance.get_init_js()
+    destory_js = instance.get_destroy_js()
     if user.is_staff:
         content=content+render_to_string("staff_problem_info.html", {'xml':etree.tostring(xml_module), 
-                                                                     'histogram':grade_histogram(module_id)})
+                                                                     'module_id' : module_id})
+        init_js = init_js+render_to_string("staff_problem_histogram.js", {'histogram' : grade_histogram(module_id),
+                                                                          'module_id' : module_id})
+        
     content = {'content':content, 
-               "destroy_js":instance.get_destroy_js(),
-               'init_js':instance.get_init_js(), 
+               "destroy_js":destory_js,
+               'init_js':init_js, 
                'type':module_type}
 
     return content
diff --git a/templates/courseware.html b/templates/courseware.html
index ec4be8c6c4..d8972f0935 100644
--- a/templates/courseware.html
+++ b/templates/courseware.html
@@ -1,7 +1,12 @@
 <%inherit file="main.html" />
 <%block name="title"><title>Courseware – MITx 6.002x</title></%block>
 
+<%block name="headextra">
+<script type="text/javascript" src="/static/js/flot/jquery.flot.js"></script>
+</%block>
+
 <%block name="js_extra">
+##Is there a reason this isn't in header_extra? Is it important that the javascript is at the bottom of the generated document?
 <!-- TODO: http://docs.jquery.com/Plugins/Validation -->
 <script type="text/javascript">
   $(function() {
diff --git a/templates/staff_problem_histogram.js b/templates/staff_problem_histogram.js
new file mode 100644
index 0000000000..1b74713213
--- /dev/null
+++ b/templates/staff_problem_histogram.js
@@ -0,0 +1,38 @@
+<%!
+  import json
+  import math
+%>
+
+<%
+data = []
+xticks = []
+yticks = []
+maxx = 1
+maxy = 1.5
+for score, count in histogram:
+    score = score or 0 #Sometimes score is None. This fixes that
+        
+    log_count = math.log(count + 1)
+    
+    data.append( [score, log_count] )
+    
+    yticks.append( [log_count, str(count)] )
+    xticks.append( [score, str(int(score))] )
+    
+    maxx = max( score + 1, maxx )
+    maxy = max( log_count*1.1, maxy  )
+%>
+
+
+$.plot($("#histogram_${module_id}"), [{
+    data: ${ json.dumps(data) },
+    bars: { show: true,
+            align: 'center',
+            lineWidth: 0, 
+            fill: 1.0 },
+    color: "#600101",
+  }],
+  {
+    xaxis: {min: -1, max: ${maxx}, ticks: ${ json.dumps(xticks) }},
+    yaxis: {min: 0.0, max: ${maxy}, ticks: ${ json.dumps(yticks) }, labelWidth: 50},
+  });
diff --git a/templates/staff_problem_info.html b/templates/staff_problem_info.html
index 560713eaa6..38fd72600a 100644
--- a/templates/staff_problem_info.html
+++ b/templates/staff_problem_info.html
@@ -1,6 +1,4 @@
 <div class="staff_info">
 ${xml | h}
 </div>
-<div>
-${ str(histogram) }
-</div>
+<div id="histogram_${module_id}" style="width:200px;height:150px"></div>

From b2891273b513f818c215797eab1b0407d0562686 Mon Sep 17 00:00:00 2001
From: Bridger Maxwell <bridgeyman@gmail.com>
Date: Tue, 17 Apr 2012 00:40:29 -0400
Subject: [PATCH 2/3] Made sure that histogram graph doesn't show up for
 modules without scores. Modified look of histogram graph.

---
 djangoapps/courseware/module_render.py | 13 +++++++++----
 templates/staff_problem_histogram.js   |  5 +++--
 templates/staff_problem_info.html      |  4 +++-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/djangoapps/courseware/module_render.py b/djangoapps/courseware/module_render.py
index d10d13637a..2924aec9df 100644
--- a/djangoapps/courseware/module_render.py
+++ b/djangoapps/courseware/module_render.py
@@ -103,8 +103,9 @@ def grade_histogram(module_id):
     cursor.execute("select courseware_studentmodule.grade,COUNT(courseware_studentmodule.student_id) from courseware_studentmodule where courseware_studentmodule.module_id=%s group by courseware_studentmodule.grade", [module_id])
 
     grades = list(cursor.fetchall())
-    print grades
     grades.sort(key=lambda x:x[0]) # Probably not necessary
+    if (len(grades) == 1 and grades[0][0] == None):
+        return []
     return grades
 
 def render_x_module(user, request, xml_module, module_object_preload):
@@ -147,10 +148,14 @@ def render_x_module(user, request, xml_module, module_object_preload):
     init_js = instance.get_init_js()
     destory_js = instance.get_destroy_js()
     if user.is_staff:
+        histogram = grade_histogram(module_id)
+        render_histogram = len(histogram) > 0
         content=content+render_to_string("staff_problem_info.html", {'xml':etree.tostring(xml_module), 
-                                                                     'module_id' : module_id})
-        init_js = init_js+render_to_string("staff_problem_histogram.js", {'histogram' : grade_histogram(module_id),
-                                                                          'module_id' : module_id})
+                                                                     'module_id' : module_id,
+                                                                     'render_histogram' : render_histogram})
+        if render_histogram:
+            init_js = init_js+render_to_string("staff_problem_histogram.js", {'histogram' : histogram,
+                                                                              'module_id' : module_id})
         
     content = {'content':content, 
                "destroy_js":destory_js,
diff --git a/templates/staff_problem_histogram.js b/templates/staff_problem_histogram.js
index 1b74713213..8f7012cbc8 100644
--- a/templates/staff_problem_histogram.js
+++ b/templates/staff_problem_histogram.js
@@ -9,6 +9,7 @@ xticks = []
 yticks = []
 maxx = 1
 maxy = 1.5
+#Here we change the y-axis (count) to be logorithmic. We also define better ticks
 for score, count in histogram:
     score = score or 0 #Sometimes score is None. This fixes that
         
@@ -30,9 +31,9 @@ $.plot($("#histogram_${module_id}"), [{
             align: 'center',
             lineWidth: 0, 
             fill: 1.0 },
-    color: "#600101",
+    color: "#b72121",
   }],
   {
-    xaxis: {min: -1, max: ${maxx}, ticks: ${ json.dumps(xticks) }},
+    xaxis: {min: -1, max: ${maxx}, ticks: ${ json.dumps(xticks) }, tickLength: 0},
     yaxis: {min: 0.0, max: ${maxy}, ticks: ${ json.dumps(yticks) }, labelWidth: 50},
   });
diff --git a/templates/staff_problem_info.html b/templates/staff_problem_info.html
index 38fd72600a..20370a9c81 100644
--- a/templates/staff_problem_info.html
+++ b/templates/staff_problem_info.html
@@ -1,4 +1,6 @@
 <div class="staff_info">
 ${xml | h}
 </div>
-<div id="histogram_${module_id}" style="width:200px;height:150px"></div>
+%if render_histogram:
+  <div id="histogram_${module_id}" style="width:200px;height:150px"></div>
+%endif

From a117d020a2ce9f215bbaa503284bf94e9f895b74 Mon Sep 17 00:00:00 2001
From: Bridger Maxwell <bridgeyman@gmail.com>
Date: Tue, 17 Apr 2012 13:54:47 -0400
Subject: [PATCH 3/3] Removed python code in templates to be javascript.

---
 templates/staff_problem_histogram.js | 49 ++++++++++++++--------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/templates/staff_problem_histogram.js b/templates/staff_problem_histogram.js
index 8f7012cbc8..77ba59d490 100644
--- a/templates/staff_problem_histogram.js
+++ b/templates/staff_problem_histogram.js
@@ -3,30 +3,30 @@
   import math
 %>
 
-<%
-data = []
-xticks = []
-yticks = []
-maxx = 1
-maxy = 1.5
-#Here we change the y-axis (count) to be logorithmic. We also define better ticks
-for score, count in histogram:
-    score = score or 0 #Sometimes score is None. This fixes that
-        
-    log_count = math.log(count + 1)
-    
-    data.append( [score, log_count] )
-    
-    yticks.append( [log_count, str(count)] )
-    xticks.append( [score, str(int(score))] )
-    
-    maxx = max( score + 1, maxx )
-    maxy = max( log_count*1.1, maxy  )
-%>
 
+var rawData = ${json.dumps(histogram)};
+
+var maxx = 1;
+var maxy = 1.5;
+var xticks = Array();
+var yticks = Array();
+var data = Array();
+for (var i = 0; i < rawData.length; i++) {
+  var score = rawData[i][0];
+  var count = rawData[i][1];
+  var log_count = Math.log(count + 1);
+  
+  data.push( [score, log_count] );
+  
+  xticks.push( [score, score.toString()] );
+  yticks.push( [log_count, count.toString()] );
+  
+  maxx = Math.max( score + 1, maxx );
+  maxy = Math.max(log_count*1.1, maxy );
+}
 
 $.plot($("#histogram_${module_id}"), [{
-    data: ${ json.dumps(data) },
+    data: data,
     bars: { show: true,
             align: 'center',
             lineWidth: 0, 
@@ -34,6 +34,7 @@ $.plot($("#histogram_${module_id}"), [{
     color: "#b72121",
   }],
   {
-    xaxis: {min: -1, max: ${maxx}, ticks: ${ json.dumps(xticks) }, tickLength: 0},
-    yaxis: {min: 0.0, max: ${maxy}, ticks: ${ json.dumps(yticks) }, labelWidth: 50},
-  });
+    xaxis: {min: -1, max: maxx, ticks: xticks, tickLength: 0},
+    yaxis: {min: 0.0, max: maxy, ticks: yticks, labelWidth: 50},
+  }
+);