Added normalize column to export grade book to remote gradebook

common/lib/xmodule/xmodule/graders.py

@@ -13,7 +13,7 @@
 Score = namedtuple("Score", "earned possible graded section module_id")
 
 
-def aggregate_scores(scores, section_name="summary"):
+def aggregate_scores(scores, section_name="summary", section_location=None):
     """
     scores: A list of Score objects
     returns: A tuple (all_total, graded_total).
@@ -32,15 +32,15 @@ def aggregate_scores(scores, section_name="summary"):
         total_possible,
         False,
         section_name,
-        None
+        section_location
     )
     #selecting only graded things
     graded_total = Score(
         total_correct_graded,
         total_possible_graded,
         True,
         section_name,
-        None
+        section_location
     )
 
     return all_total, graded_total

lms/djangoapps/courseware/grades.py

@@ -6,7 +6,6 @@
 import random
 import logging
 
-from contextlib import contextmanager
 from django.conf import settings
 from django.test.client import RequestFactory
 from django.core.cache import cache
@@ -454,11 +453,15 @@ def create_module(descriptor):
                             )
                         )
 
-                    __, graded_total = graders.aggregate_scores(scores, section_name)
+                    __, graded_total = graders.aggregate_scores(
+                        scores,
+                        section_name,
+                        section_location=section_descriptor.location
+                    )
                     if keep_raw_scores:
                         raw_scores += scores
                 else:
-                    graded_total = Score(0.0, 1.0, True, section_name, None)
+                    graded_total = Score(0.0, 1.0, True, section_name, section_descriptor.location)
 
                 #Add the graded total to totaled_scores
                 if graded_total.possible > 0:

lms/djangoapps/instructor/tests/test_legacy_raw_download_csv.py

@@ -97,11 +97,11 @@ def get_expected_grade_data(
             ],
             'data': [
                 [
-                    1, u'u1', u'username', u'[email protected]', '', 0.0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    1, u'u1', u'username', u'[email protected]', '', (0.0, 1.0), 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0.0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
                 ],
                 [
-                    2, u'u2', u'username', u'[email protected]', '', 0.3333333333333333, 0, 0, 0,
+                    2, u'u2', u'username', u'[email protected]', '', (1.0, 3.0), 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0.03333333333333333, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0
                 ]

lms/djangoapps/instructor/views/legacy.py

@@ -13,7 +13,7 @@
 import requests
 import urllib
 
-from collections import defaultdict, OrderedDict
+from collections import defaultdict, OrderedDict, Counter
 from markupsafe import escape
 from requests.status_codes import codes
 from StringIO import StringIO
@@ -36,7 +36,6 @@
 from courseware import grades
 from courseware.access import has_access
 from courseware.courses import get_course_with_access, get_cms_course_link
-from courseware.models import StudentModule
 from django_comment_common.models import FORUM_ROLE_ADMINISTRATOR
 from django_comment_client.utils import has_forum_access
 from instructor.offline_gradecalc import student_grades, offline_grades_available
@@ -238,25 +237,41 @@ def domatch(student):
     elif action in ['Display grades for assignment', 'Export grades for assignment to remote gradebook',
                     'Export CSV file of grades for assignment']:
 
+        normalize_grades_enable = 1 if request.POST.get('normalize_grades', None) else 0
         log.debug(action)
         datatable = {}
         aname = request.POST.get('assignment_name', '')
         if not aname:
             msg += "<font color='red'>{text}</font>".format(text=_("Please enter an assignment name"))
         else:
-            allgrades = get_student_grade_summary_data(request, course, get_grades=True, use_offline=use_offline)
+            allgrades = get_student_grade_summary_data(
+                request,
+                course,
+                get_grades=True,
+                use_offline=use_offline,
+                get_score_max=False if normalize_grades_enable == 1 else True
+            )
+
             if aname not in allgrades['assignments']:
                 msg += "<font color='red'>{text}</font>".format(
                     text=_("Invalid assignment name '{name}'").format(name=aname)
                 )
             else:
                 aidx = allgrades['assignments'].index(aname)
-                datatable = {'header': [_('External email'), aname]}
+                datatable = {'header': [_('External email'), aname, _('max_pts'), _('normalize')]}
                 ddata = []
-                for student in allgrades['students']:  # do one by one in case there is a student who has only partial grades
-                    try:
-                        ddata.append([student.email, student.grades[aidx]])
-                    except IndexError:
+                # do one by one in case there is a student who has only partial grades
+                for student in allgrades['students']:
+                    if len(student.grades) >= aidx and student.grades[aidx] is not None:
+                        ddata.append(
+                            [
+                                student.email,
+                                student.grades[aidx][0],
+                                student.grades[aidx][1],
+                                normalize_grades_enable
+                            ],
+                        )
+                    else:
                         log.debug(u'No grade for assignment %(idx)s (%(name)s) for student %(email)s', {
                             "idx": aidx,
                             "name": aname,
@@ -736,8 +751,20 @@ def get_student_grade_summary_data(
                         else:
                             add_grade(score.section, score.earned)
                 else:
+                    category_cnts = Counter()
+                    progress_summary = grades._progress_summary(student, request, course)
                     for grade_item in gradeset['section_breakdown']:
-                        add_grade(grade_item['label'], grade_item['percent'])
+                        category = grade_item['category']
+                        try:
+                            location = gradeset['totaled_scores'][category][category_cnts[category]].module_id
+                            earned, possible = progress_summary.score_for_module(location)
+                            if get_score_max is True:
+                                add_grade(grade_item['label'], earned, possible=possible)
+                            else:
+                                add_grade(grade_item['label'], grade_item['percent'], possible=1)
+                        except (IndexError, KeyError):
+                            add_grade(grade_item['label'], grade_item['percent'])
+                        category_cnts[category] += 1
             student.grades = gtab.get_grade(student.id)
 
         data.append(datarow)

lms/templates/courseware/legacy_instructor_dashboard.html

@@ -240,7 +240,9 @@ <h3>${_("Export grades to remote gradebook")}</h3>
     <br/>
     <br/>
     </li>
-    <li>${_("Assignment name:")} <input type="text" name="assignment_name" size=40 >
+    <li>${_("Assignment name:")} <input type="text" name="assignment_name" size=40 > <input
+        type="checkbox" name="normalize_grades" id="normalize_grades" checked="checked" /> <label style="display:inline"
+              for="normalize_grades">${_("Normalize Grades")}</label>
     <br/>
     <br/>
     <input type="submit" name="action" value="Display grades for assignment">