From 348796e5ebd3248dfda1182152aaddf256b049c5 Mon Sep 17 00:00:00 2001
From: Bridger Maxwell <bridger@mit.edu>
Date: Wed, 1 Feb 2012 14:33:20 -0500
Subject: [PATCH] Simple graphing of homework and lab scores

--HG--
branch : profiledev
---
 .DS_Store    | Bin 12292 -> 12292 bytes
 profile.html |  37 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/.DS_Store b/.DS_Store
index a630216fad2b616b683bda11c2b2e6803e0fb4f3..bf54290bb5b9500cfecff77144f84e6b8fba5aaa 100644
GIT binary patch
delta 106
zcmZokXi3;mEWo&Ka*05)w|I56iMfG}f~7^RjzYDCp`ng~sikFYEhi@jr$9T0sFI$I
qM@V9IO>JF00~jzeLTCnFC=H_;H!BN1VcX0m@ttM!KN&V*Mg{<3C>DhP

delta 84
zcmZokXi3;mEWo&aa*04Pw?uWdiII_xf}x4o<c9(>sx`HB^$iSQz{m)p8F-;IjB47f
UB>04FGrPn$7RHp#e`VN&0cf`pZ~y=R

diff --git a/profile.html b/profile.html
index e50efed801..3f88a4995b 100644
--- a/profile.html
+++ b/profile.html
@@ -1,5 +1,9 @@
 <%inherit file="main.html" />
 
+<%!
+  import json
+%>
+
 <script>
 var loc=true; // Activate on clicks? Not if already clicked.
 var lang=true;
@@ -95,14 +99,45 @@ $(function() {
 
     <section class="course-info">
       <h1>Course Progress</h1>
+    
+    <div id="homework-detail-graph" style="width:550px;height:200px;"></div>
+    
+    <script type="text/javascript" src="${ settings.LIB_URL }flot/jquery.flot.min.js"></script>
+    <script type="text/javascript" src="${ settings.LIB_URL }flot/jquery.flot.stack.js"></script>
+    <script>
+    $(function () {
+      
 
+      var homeworkData = ${ json.dumps( [[i + 1, percentage] for i,percentage in enumerate(homework_percentages)] ) };
+      var labData = ${ json.dumps( [[i + 13, percentage] for i,percentage in enumerate(lab_percentages)] ) };
+      
+      var data = [
+        //{label: 'Homework Total', data: [ [0.5,0.8] ], bars: {barWidth: 12, align: 'left'} },
+        {label: 'Homework', data: homeworkData, color: 0},
+        //{label: 'Lab Total', data: [ [12.5,0.9] ], bars: {barWidth: 12, align: 'left'}},
+        {label: 'Labs', data: labData, color: 1},
+        {label: 'Midterm', data: [[25,0.87]], color: 2},
+        {label: 'Final', data: [[26,0.65]], color: 3},
+      ];
+      var options = {
+        series: {lines: {show: false, steps: false },
+        bars: {show: true, barWidth: 0.6, align: 'center',},},
+        xaxis: {ticks: [[1,'1'], [2,'2'], [3,'3'], [4,'4'], [5,'5']]},
+      };
+
+      $.plot($("#homework-detail-graph"), data, options);
+      
+    });
+    </script>
+    
+    
       <!-- <div id="description"></div> -->
 
       <ol>
         % for hw in homeworks:
         <li>
           <h2>${ hw['chapter'] }</h2>
-          <h3>${ hw['section'] }</h3>
+          <h3>${hw['format']} - ${ hw['section'] } ${"({0}/{1})".format( hw['section_total'][0], hw['section_total'][1] )}</h3> 
 
           <ul>
             % for score in hw['scores']: