Weighted scores now working in the refactor and show up correctly on the profile…

Weighted scores now working in the refactor and show up correctly on the profile graph. Dropped score markers are back too.

djangoapps/courseware/grades.py

@@ -140,11 +140,10 @@ class WeightedSubsectionsGrader(CourseGrader):
             
             weightedPercent = subgrade_result['percent'] * weight
             section_detail = "{0} = {1:.1%} of a possible {2:.0%}".format(section_name, weightedPercent, weight)
-            section_category = "{0} - Weighted".format(section_name)
             
             total_percent += weightedPercent
             section_breakdown += subgrade_result['section_breakdown']
-            grade_breakdown.append( {'percent' : weightedPercent, 'detail' : section_detail, 'category' : section_category} )
+            grade_breakdown.append( {'percent' : weightedPercent, 'detail' : section_detail, 'category' : section_name} )
             
         return {'percent' : total_percent,
                 'section_breakdown' : section_breakdown,

templates/profile_graphs.js

@@ -49,20 +49,51 @@ $(function () {
       categoryData['data'].append( [tickIndex, section['percent']] )
       ticks.append( [tickIndex, section['label'] ] )
     
-    
       if section['category'] in detail_tooltips:
           detail_tooltips[ section['category'] ].append( section['detail'] )
       else:
           detail_tooltips[ section['category'] ] = [ section['detail'], ]
+          
+      if 'mark' in section:
+          droppedScores.append( [tickIndex, 0.05] )
+          dropped_score_tooltips.append( section['mark']['detail'] )
         
       tickIndex += 1
     
       if section.get('prominent', False):
           tickIndex += sectionSpacer
+          
+  ## ----------------------------- Grade overviewew bar ------------------------- ##
+  tickIndex += sectionSpacer
+  
+  series = categories.values()
+  overviewBarX = tickIndex
+  extraColorIndex = len(categories) #Keeping track of the next color to use for categories not in categories[]
+
+  for section in grade_summary['grade_breakdown']:
+      if section['percent'] > 0:
+          if section['category'] in categories:
+              color = categories[ section['category'] ]['color']
+          else:
+              color = colors[ extraColorIndex % len(colors) ]
+              extraColorIndex += 1
+        
+          series.append({
+              'label' : section['category'] + "-grade_breakdown",
+              'data' : [ [overviewBarX, section['percent']] ],
+              'color' : color
+          })
+            
+          detail_tooltips[section['category'] + "-grade_breakdown"] = [ section['detail'] ]
+  
+  ticks += [ [overviewBarX, "Total"] ]
+  tickIndex += 1 + sectionSpacer
   
+  totalScore = grade_summary['percent']
+  detail_tooltips['Dropped Scores'] = dropped_score_tooltips
   %>
   
-  var series = ${ json.dumps( categories.values() ) };
+  var series = ${ json.dumps( series ) };
   var ticks = ${ json.dumps(ticks) };
   var bottomTicks = ${ json.dumps(bottomTicks) };
   var detail_tooltips = ${ json.dumps(detail_tooltips) };
@@ -87,6 +118,8 @@ $(function () {
   if ($grade_detail_graph.length > 0) {
     var plot = $.plot($grade_detail_graph, series, options);
     //We need to put back the plotting of the percent here
+    var o = plot.pointOffset({x: ${overviewBarX} , y: ${totalScore}});
+    $grade_detail_graph.append('<div style="position:absolute;left:' + (o.left - 12) + 'px;top:' + (o.top - 20) + 'px">${"{totalscore:.0%}".format(totalscore=totalScore)}</div>');
   }
       
   var previousPoint = null;