Converted gradebook to refactored grading format.

djangoapps/courseware/grades.py

@@ -16,7 +16,7 @@ Score = namedtuple("Score", "earned possible graded section")
 SectionPercentage = namedtuple("SectionPercentage", "percentage label summary")
 
 
-class CourseGrader:
+class CourseGrader(object):
     def grade(self, grade_sheet):
         raise NotImplementedError
     

templates/gradebook.html

@@ -8,7 +8,8 @@
   <style type="text/css">
   .grade_a {color:green;}
   .grade_b {color:Chocolate;}
-  .grade_c {color:DimGray;}
+  .grade_c {color:DarkSlateGray;}
+  .grade_f {color:DimGray;}
   .grade_none {color:LightGray;}
   </style>
   
@@ -29,16 +30,10 @@
       
       <tr> <!-- Header Row -->
         <th>Student</th>
-        %for section in templateSummary:
-          %if 'subscores' in section:
-            %for subsection in section['subscores']:
-              <th>${subsection['label']}</th>
-            %endfor
-            <th>${section['totallabel']}</th>
-          %else:
-            <th>${section['category']}</th>
-          %endif
+        %for section in templateSummary['section_breakdown']:
+          <th>${section['label']}</th>
         %endfor
+        <th>Total</th>
       </tr>
       
       <%def name="percent_data(percentage)">
@@ -50,6 +45,8 @@
             data_class = "grade_b"
           elif percentage > .6:
             data_class = "grade_c"
+          elif percentage > 0:
+              data_class = "grade_f"
         %>
         <td class="${data_class}">${ "{0:.0%}".format( percentage ) }</td>
       </%def>
@@ -57,16 +54,10 @@
       %for student in students:
       <tr>
         <td><a href="/profile/${student['id']}/">${student['username']}</a></td>
-        %for section in student['grade_info']['grade_summary']:
-          %if 'subscores' in section:
-            %for subsection in section['subscores']:
-              ${percent_data( subsection['percentage'] )}
-            %endfor
-            ${percent_data( section['totalscore'] )}
-          %else:
-            ${percent_data( section['totalscore'] )}
-          %endif
+        %for section in student['grade_info']['grade_summary']['section_breakdown']:
+          ${percent_data( section['percent'] )}
         %endfor
+        <th>${percent_data( student['grade_info']['grade_summary']['percent'])}</th>
       </tr>
       %endfor
     </table>