Merge branch 'master' into jonahstanley/add-courseteam-tests

Conflicts:
	cms/djangoapps/contentstore/features/common.py

CHANGELOG.rst

@@ -5,6 +5,13 @@ These are notable changes in edx-platform.  This is a rolling list of changes,
 in roughly chronological order, most recent first.  Add your entries at or near
 the top.  Include a label indicating the component affected.
 
+LMS: Problem rescoring.  Added options on the Grades tab of the
+Instructor Dashboard to allow all students' submissions for a
+particular problem to be rescored.  Also supports resetting all
+students' number of attempts to zero.  Provides a list of background
+tasks that are currently running for the course, and an option to
+see a history of background tasks for a given problem.
+
 LMS: Forums.  Added handling for case where discussion module can get `None` as
 value of lms.start in `lms/djangoapps/django_comment_client/utils.py`
 

cms/djangoapps/auth/authz.py

@@ -39,8 +39,6 @@ def get_users_in_course_group_by_role(location, role):
 '''
 Create all permission groups for a new course and subscribe the caller into those roles
 '''
-
-
 def create_all_course_groups(creator, location):
     create_new_course_group(creator, location, INSTRUCTOR_ROLE_NAME)
     create_new_course_group(creator, location, STAFF_ROLE_NAME)
@@ -57,13 +55,11 @@ def create_new_course_group(creator, location, role):
 
     return
 
-'''
-This is to be called only by either a command line code path or through a app which has already
-asserted permissions
-'''
-
-
 def _delete_course_group(location):
+    '''
+    This is to be called only by either a command line code path or through a app which has already
+    asserted permissions
+    '''
     # remove all memberships
     instructors = Group.objects.get(name=get_course_groupname_for_role(location, INSTRUCTOR_ROLE_NAME))
     for user in instructors.user_set.all():
@@ -75,13 +71,11 @@ def _delete_course_group(location):
         user.groups.remove(staff)
         user.save()
 
-'''
-This is to be called only by either a command line code path or through an app which has already
-asserted permissions to do this action
-'''
-
-
 def _copy_course_group(source, dest):
+    '''
+    This is to be called only by either a command line code path or through an app which has already
+    asserted permissions to do this action
+    '''
     instructors = Group.objects.get(name=get_course_groupname_for_role(source, INSTRUCTOR_ROLE_NAME))
     new_instructors_group = Group.objects.get(name=get_course_groupname_for_role(dest, INSTRUCTOR_ROLE_NAME))
     for user in instructors.user_set.all():

cms/djangoapps/contentstore/features/common.py

-#pylint: disable=C0111
-#pylint: disable=W0621
+# pylint: disable=C0111
+# pylint: disable=W0621
 
 from lettuce import world, step
 from nose.tools import assert_true
@@ -20,7 +20,7 @@ COURSE_ORG = 'MITx'
 ###########  STEP HELPERS ##############
 
 @step('I (?:visit|access|open) the Studio homepage$')
-def i_visit_the_studio_homepage(step):
+def i_visit_the_studio_homepage(_step):
     # To make this go to port 8001, put
     # LETTUCE_SERVER_PORT = 8001
     # in your settings.py file.
@@ -30,17 +30,17 @@ def i_visit_the_studio_homepage(step):
 
 
 @step('I am logged into Studio$')
-def i_am_logged_into_studio(step):
+def i_am_logged_into_studio(_step):
     log_into_studio()
 
 
 @step('I confirm the alert$')
-def i_confirm_with_ok(step):
+def i_confirm_with_ok(_step):
     world.browser.get_alert().accept()
 
 
 @step(u'I press the "([^"]*)" delete icon$')
-def i_press_the_category_delete_icon(step, category):
+def i_press_the_category_delete_icon(_step, category):
     if category == 'section':
         css = 'a.delete-button.delete-section-button span.delete-icon'
     elif category == 'subsection':
@@ -51,7 +51,7 @@ def i_press_the_category_delete_icon(step, category):
 
 
 @step('I have opened a new course in Studio$')
-def i_have_opened_a_new_course(step):
+def i_have_opened_a_new_course(_step):
     open_new_course()
 
 
@@ -78,7 +78,6 @@ def create_studio_user(
     registration.register(studio_user)
     registration.activate()
 
-
 def fill_in_course_info(
         name=COURSE_NAME,
         org=COURSE_ORG,
@@ -149,6 +148,7 @@ def set_date_and_time(date_css, desired_date, time_css, desired_time):
     world.css_fill(date_css, desired_date)
     # hit TAB to get to the time field
     e = world.css_find(date_css).first
+    # pylint: disable=W0212
     e._element.send_keys(Keys.TAB)
     world.css_fill(time_css, desired_time)
     e = world.css_find(time_css).first

cms/djangoapps/contentstore/features/section.py

-#pylint: disable=C0111
-#pylint: disable=W0621
+# pylint: disable=C0111
+# pylint: disable=W0621
 
 from lettuce import world, step
 from common import *
@@ -8,7 +8,7 @@ from nose.tools import assert_equal
 ############### ACTIONS ####################
 
 
-@step('I click the new section link$')
+@step('I click the New Section link$')
 def i_click_new_section_link(_step):
     link_css = 'a.new-courseware-section-button'
     world.css_click(link_css)

cms/djangoapps/contentstore/features/studio-overview-togglesection.py

-#pylint: disable=C0111
-#pylint: disable=W0621
+# pylint: disable=C0111
+# pylint: disable=W0621
 
 from lettuce import world, step
 from common import *

cms/djangoapps/contentstore/features/video.py

@@ -6,13 +6,13 @@ from lettuce import world, step
 
 
 @step('when I view the video it does not have autoplay enabled')
-def does_not_autoplay(step):
+def does_not_autoplay(_step):
     assert world.css_find('.video')[0]['data-autoplay'] == 'False'
     assert world.css_find('.video_control')[0].has_class('play')
 
 
 @step('creating a video takes a single click')
-def video_takes_a_single_click(step):
+def video_takes_a_single_click(_step):
     assert(not world.is_css_present('.xmodule_VideoModule'))
     world.css_click("a[data-location='i4x://edx/templates/video/default']")
     assert(world.is_css_present('.xmodule_VideoModule'))

cms/djangoapps/contentstore/module_info_model.py

@@ -39,10 +39,7 @@ def get_module_info(store, location, parent_location=None, rewrite_static_links=
 def set_module_info(store, location, post_data):
     module = None
     try:
-        if location.revision is None:
-            module = store.get_item(location)
-        else:
-            module = store.get_item(location)
+        module = store.get_item(location)
     except:
         pass
 

cms/djangoapps/contentstore/tests/test_checklists.py

@@ -99,6 +99,7 @@ class ChecklistTestCase(CourseTestCase):
                                                            'name': self.course.location.name,
                                                            'checklist_index': 2})
 
+
         def get_first_item(checklist):
             return checklist['items'][0]
 

cms/djangoapps/contentstore/tests/test_contentstore.py

@@ -132,7 +132,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
 
         # just pick one vertical
         descriptor = store.get_items(Location('i4x', 'edX', 'simple', 'vertical', None, None))[0]
-        location = descriptor.location._replace(name='.' + descriptor.location.name)
+        location = descriptor.location.replace(name='.' + descriptor.location.name)
 
         resp = self.client.get(reverse('edit_unit', kwargs={'location': location.url()}))
         self.assertEqual(resp.status_code, 400)
@@ -224,7 +224,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         draft_store.clone_item(html_module.location, html_module.location)
         html_module = draft_store.get_item(['i4x', 'edX', 'simple', 'html', 'test_html', None])
 
-        new_graceperiod = timedelta(**{'hours': 1})
+        new_graceperiod = timedelta(hours=1)
 
         self.assertNotIn('graceperiod', own_metadata(html_module))
         html_module.lms.graceperiod = new_graceperiod
@@ -369,7 +369,6 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         '''
         module_store = modulestore('direct')
         import_from_xml(module_store, 'common/test/data/', ['full'])
-
         effort = module_store.get_item(Location(['i4x', 'edX', 'full', 'about', 'effort', None]))
         self.assertEqual(effort.data, '6 hours')
 
@@ -617,12 +616,12 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         items = module_store.get_items(Location(['i4x', 'edX', 'full', 'vertical', None]))
         self.assertEqual(len(items), 0)
 
-    def verify_content_existence(self, modulestore, root_dir, location, dirname, category_name, filename_suffix=''):
+    def verify_content_existence(self, store, root_dir, location, dirname, category_name, filename_suffix=''):
         filesystem = OSFS(root_dir / 'test_export')
         self.assertTrue(filesystem.exists(dirname))
 
         query_loc = Location('i4x', location.org, location.course, category_name, None)
-        items = modulestore.get_items(query_loc)
+        items = store.get_items(query_loc)
 
         for item in items:
             filesystem = OSFS(root_dir / ('test_export/' + dirname))
@@ -768,7 +767,6 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
     def test_prefetch_children(self):
         module_store = modulestore('direct')
         import_from_xml(module_store, 'common/test/data/', ['full'])
-
         location = CourseDescriptor.id_to_location('edX/full/6.002_Spring_2012')
 
         wrapper = MongoCollectionFindWrapper(module_store.collection.find)
@@ -864,7 +862,7 @@ class ContentStoreTest(ModuleStoreTestCase):
 
     def test_create_course_duplicate_course(self):
         """Test new course creation - error path"""
-        resp = self.client.post(reverse('create_new_course'), self.course_data)
+        self.client.post(reverse('create_new_course'), self.course_data)
         resp = self.client.post(reverse('create_new_course'), self.course_data)
         data = parse_json(resp)
         self.assertEqual(resp.status_code, 200)
@@ -872,7 +870,7 @@ class ContentStoreTest(ModuleStoreTestCase):
 
     def test_create_course_duplicate_number(self):
         """Test new course creation - error path"""
-        resp = self.client.post(reverse('create_new_course'), self.course_data)
+        self.client.post(reverse('create_new_course'), self.course_data)
         self.course_data['display_name'] = 'Robot Super Course Two'
 
         resp = self.client.post(reverse('create_new_course'), self.course_data)
@@ -1090,11 +1088,9 @@ class ContentStoreTest(ModuleStoreTestCase):
                                 json.dumps({'id': del_loc.url()}), "application/json")
         self.assertEqual(200, resp.status_code)
 
-
     def test_import_metadata_with_attempts_empty_string(self):
         module_store = modulestore('direct')
         import_from_xml(module_store, 'common/test/data/', ['simple'])
-
         did_load_item = False
         try:
             module_store.get_item(Location(['i4x', 'edX', 'simple', 'problem', 'ps01-simple', None]))

cms/djangoapps/contentstore/utils.py

@@ -224,14 +224,14 @@ def add_extra_panel_tab(tab_type, course):
     @param course: A course object from the modulestore.
     @return: Boolean indicating whether or not a tab was added and a list of tabs for the course.
     """
-    #Copy course tabs
+    # Copy course tabs
     course_tabs = copy.copy(course.tabs)
     changed = False
-    #Check to see if open ended panel is defined in the course
+    # Check to see if open ended panel is defined in the course
 
     tab_panel = EXTRA_TAB_PANELS.get(tab_type)
     if tab_panel not in course_tabs:
-        #Add panel to the tabs if it is not defined
+        # Add panel to the tabs if it is not defined
         course_tabs.append(tab_panel)
         changed = True
     return changed, course_tabs
@@ -244,14 +244,14 @@ def remove_extra_panel_tab(tab_type, course):
     @param course: A course object from the modulestore.
     @return: Boolean indicating whether or not a tab was added and a list of tabs for the course.
     """
-    #Copy course tabs
+    # Copy course tabs
     course_tabs = copy.copy(course.tabs)
     changed = False
-    #Check to see if open ended panel is defined in the course
+    # Check to see if open ended panel is defined in the course
 
     tab_panel = EXTRA_TAB_PANELS.get(tab_type)
     if tab_panel in course_tabs:
-        #Add panel to the tabs if it is not defined
+        # Add panel to the tabs if it is not defined
         course_tabs = [ct for ct in course_tabs if ct != tab_panel]
         changed = True
     return changed, course_tabs

cms/djangoapps/contentstore/views/course.py

@@ -12,8 +12,8 @@ from django.core.urlresolvers import reverse
 from mitxmako.shortcuts import render_to_response
 
 from xmodule.modulestore.django import modulestore
-
-from xmodule.modulestore.exceptions import ItemNotFoundError, InvalidLocationError
+from xmodule.modulestore.exceptions import ItemNotFoundError, \
+     InvalidLocationError
 from xmodule.modulestore import Location
 
 from contentstore.course_info_model import get_course_updates, update_course_updates, delete_course_update
@@ -33,9 +33,6 @@ from .component import OPEN_ENDED_COMPONENT_TYPES, \
 from django_comment_common.utils import seed_permissions_roles
 import datetime
 from django.utils.timezone import UTC
-
-# TODO: should explicitly enumerate exports with __all__
-
 __all__ = ['course_index', 'create_new_course', 'course_info',
            'course_info_updates', 'get_course_settings',
            'course_config_graders_page',

cms/djangoapps/contentstore/views/item.py

@@ -103,7 +103,7 @@ def clone_item(request):
 @expect_json
 def delete_item(request):
     item_location = request.POST['id']
-    item_loc = Location(item_location)
+    item_location = Location(item_location)
 
     # check permissions for this user within this course
     if not has_access(request.user, item_location):
@@ -124,11 +124,11 @@ def delete_item(request):
 
     # cdodge: we need to remove our parent's pointer to us so that it is no longer dangling
     if delete_all_versions:
-        parent_locs = modulestore('direct').get_parent_locations(item_loc, None)
+        parent_locs = modulestore('direct').get_parent_locations(item_location, None)
 
         for parent_loc in parent_locs:
             parent = modulestore('direct').get_item(parent_loc)
-            item_url = item_loc.url()
+            item_url = item_location.url()
             if item_url in parent.children:
                 children = parent.children
                 children.remove(item_url)

cms/djangoapps/models/settings/course_details.py

@@ -41,25 +41,25 @@ class CourseDetails(object):
         course.enrollment_start = descriptor.enrollment_start
         course.enrollment_end = descriptor.enrollment_end
 
-        temploc = course_location._replace(category='about', name='syllabus')
+        temploc = course_location.replace(category='about', name='syllabus')
         try:
             course.syllabus = get_modulestore(temploc).get_item(temploc).data
         except ItemNotFoundError:
             pass
 
-        temploc = temploc._replace(name='overview')
+        temploc = temploc.replace(name='overview')
         try:
             course.overview = get_modulestore(temploc).get_item(temploc).data
         except ItemNotFoundError:
             pass
 
-        temploc = temploc._replace(name='effort')
+        temploc = temploc.replace(name='effort')
         try:
             course.effort = get_modulestore(temploc).get_item(temploc).data
         except ItemNotFoundError:
             pass
 
-        temploc = temploc._replace(name='video')
+        temploc = temploc.replace(name='video')
         try:
             raw_video = get_modulestore(temploc).get_item(temploc).data
             course.intro_video = CourseDetails.parse_video_tag(raw_video)
@@ -126,16 +126,16 @@ class CourseDetails(object):
 
         # NOTE: below auto writes to the db w/o verifying that any of the fields actually changed
         # to make faster, could compare against db or could have client send over a list of which fields changed.
-        temploc = Location(course_location)._replace(category='about', name='syllabus')
+        temploc = Location(course_location).replace(category='about', name='syllabus')
         update_item(temploc, jsondict['syllabus'])
 
-        temploc = temploc._replace(name='overview')
+        temploc = temploc.replace(name='overview')
         update_item(temploc, jsondict['overview'])
 
-        temploc = temploc._replace(name='effort')
+        temploc = temploc.replace(name='effort')
         update_item(temploc, jsondict['effort'])
 
-        temploc = temploc._replace(name='video')
+        temploc = temploc.replace(name='video')
         recomposed_video_tag = CourseDetails.recompose_video_tag(jsondict['intro_video'])
         update_item(temploc, recomposed_video_tag)
 
@@ -174,10 +174,10 @@ class CourseDetails(object):
         return result
 
 
-# TODO move to a more general util? Is there a better way to do the isinstance model check?
+# TODO move to a more general util?
 class CourseSettingsEncoder(json.JSONEncoder):
     def default(self, obj):
-        if isinstance(obj, CourseDetails) or isinstance(obj, course_grading.CourseGradingModel):
+        if isinstance(obj, (CourseDetails, course_grading.CourseGradingModel)):
             return obj.__dict__
         elif isinstance(obj, Location):
             return obj.dict()

cms/envs/common.py

@@ -235,8 +235,7 @@ PIPELINE_JS = {
         'source_filenames': sorted(
             rooted_glob(COMMON_ROOT / 'static/', 'coffee/src/**/*.js') +
             rooted_glob(PROJECT_ROOT / 'static/', 'coffee/src/**/*.js')
-        ) + ['js/hesitate.js', 'js/base.js',
-             'js/models/feedback.js', 'js/views/feedback.js',
+        ) + ['js/hesitate.js', 'js/base.js', 'js/views/feedback.js',
              'js/models/section.js', 'js/views/section.js',
              'js/models/metadata_model.js', 'js/views/metadata_editor_view.js',
              'js/views/assets.js'],

cms/static/coffee/files.json

@@ -7,6 +7,7 @@
     "js/vendor/jquery.cookie.js",
     "js/vendor/json2.js",
     "js/vendor/underscore-min.js",
+    "js/vendor/underscore.string.min.js",
     "js/vendor/backbone-min.js",
     "js/vendor/jquery.leanModal.min.js",
     "js/vendor/sinon-1.7.1.js",

cms/static/coffee/spec/models/feedback_spec.coffee

-describe "CMS.Models.SystemFeedback", ->
-    beforeEach ->
-        @model = new CMS.Models.SystemFeedback()
-
-    it "should have an empty message by default", ->
-        expect(@model.get("message")).toEqual("")
-
-    it "should have an empty title by default", ->
-        expect(@model.get("title")).toEqual("")
-
-    it "should not have an intent set by default", ->
-        expect(@model.get("intent")).toBeNull()
-
-
-describe "CMS.Models.WarningMessage", ->
-    beforeEach ->
-        @model = new CMS.Models.WarningMessage()
-
-    it "should have the correct intent", ->
-        expect(@model.get("intent")).toEqual("warning")
-
-describe "CMS.Models.ErrorMessage", ->
-    beforeEach ->
-        @model = new CMS.Models.ErrorMessage()
-
-    it "should have the correct intent", ->
-        expect(@model.get("intent")).toEqual("error")
-
-describe "CMS.Models.ConfirmationMessage", ->
-    beforeEach ->
-        @model = new CMS.Models.ConfirmationMessage()
-
-    it "should have the correct intent", ->
-        expect(@model.get("intent")).toEqual("confirmation")

cms/static/coffee/spec/views/feedback_spec.coffee

@@ -18,79 +18,105 @@ beforeEach ->
             else
                 return trimmedText.indexOf(text) != -1;
 
-describe "CMS.Views.Alert as base class", ->
+describe "CMS.Views.SystemFeedback", ->
     beforeEach ->
-        @model = new CMS.Models.ConfirmationMessage({
+        @options =
             title: "Portal"
             message: "Welcome to the Aperture Science Computer-Aided Enrichment Center"
-        })
         # it will be interesting to see when this.render is called, so lets spy on it
-        spyOn(CMS.Views.Alert.prototype, 'render').andCallThrough()
-
-    it "renders on initalize", ->
-        view = new CMS.Views.Alert({model: @model})
-        expect(view.render).toHaveBeenCalled()
+        @renderSpy = spyOn(CMS.Views.Alert.Confirmation.prototype, 'render').andCallThrough()
+        @showSpy = spyOn(CMS.Views.Alert.Confirmation.prototype, 'show').andCallThrough()
+        @hideSpy = spyOn(CMS.Views.Alert.Confirmation.prototype, 'hide').andCallThrough()
+
+    it "requires a type and an intent", ->
+        neither = =>
+            new CMS.Views.SystemFeedback(@options)
+        noType = =>
+            options = $.extend({}, @options)
+            options.intent = "confirmation"
+            new CMS.Views.SystemFeedback(options)
+        noIntent = =>
+            options = $.extend({}, @options)
+            options.type = "alert"
+            new CMS.Views.SystemFeedback(options)
+        both = =>
+            options = $.extend({}, @options)
+            options.type = "alert"
+            options.intent = "confirmation"
+            new CMS.Views.SystemFeedback(options)
+
+        expect(neither).toThrow()
+        expect(noType).toThrow()
+        expect(noIntent).toThrow()
+        expect(both).not.toThrow()
+
+    # for simplicity, we'll use CMS.Views.Alert.Confirmation from here on,
+    # which extends and proxies to CMS.Views.SystemFeedback
+
+    it "does not show on initalize", ->
+        view = new CMS.Views.Alert.Confirmation(@options)
+        expect(@renderSpy).not.toHaveBeenCalled()
+        expect(@showSpy).not.toHaveBeenCalled()
 
     it "renders the template", ->
-        view = new CMS.Views.Alert({model: @model})
+        view = new CMS.Views.Alert.Confirmation(@options)
+        view.show()
+
         expect(view.$(".action-close")).toBeDefined()
         expect(view.$('.wrapper')).toBeShown()
-        expect(view.$el).toContainText(@model.get("title"))
-        expect(view.$el).toContainText(@model.get("message"))
+        expect(view.$el).toContainText(@options.title)
+        expect(view.$el).toContainText(@options.message)
 
     it "close button sends a .hide() message", ->
-        spyOn(CMS.Views.Alert.prototype, 'hide').andCallThrough()
-
-        view = new CMS.Views.Alert({model: @model})
+        view = new CMS.Views.Alert.Confirmation(@options).show()
         view.$(".action-close").click()
 
-        expect(CMS.Views.Alert.prototype.hide).toHaveBeenCalled()
+        expect(@hideSpy).toHaveBeenCalled()
         expect(view.$('.wrapper')).toBeHiding()
 
 describe "CMS.Views.Prompt", ->
-    beforeEach ->
-        @model = new CMS.Models.ConfirmationMessage({
-            title: "Portal"
-            message: "Welcome to the Aperture Science Computer-Aided Enrichment Center"
-        })
-
     # for some reason, expect($("body")) blows up the test runner, so this test
     # just exercises the Prompt rather than asserting on anything. Best I can
     # do for now. :(
     it "changes class on body", ->
         # expect($("body")).not.toHaveClass("prompt-is-shown")
-        view = new CMS.Views.Prompt({model: @model})
+        view = new CMS.Views.Prompt.Confirmation({
+            title: "Portal"
+            message: "Welcome to the Aperture Science Computer-Aided Enrichment Center"
+        })
         # expect($("body")).toHaveClass("prompt-is-shown")
         view.hide()
         # expect($("body")).not.toHaveClass("prompt-is-shown")
 
-describe "CMS.Views.Alert click events", ->
+describe "CMS.Views.SystemFeedback click events", ->
     beforeEach ->
-        @model = new CMS.Models.WarningMessage(
+        @primaryClickSpy = jasmine.createSpy('primaryClick')
+        @secondaryClickSpy = jasmine.createSpy('secondaryClick')
+        @view = new CMS.Views.Notification.Warning(
             title: "Unsaved",
             message: "Your content is currently Unsaved.",
             actions:
                 primary:
                     text: "Save",
                     class: "save-button",
-                    click: jasmine.createSpy('primaryClick')
+                    click: @primaryClickSpy
                 secondary: [{
                     text: "Revert",
                     class: "cancel-button",
-                    click: jasmine.createSpy('secondaryClick')
+                    click: @secondaryClickSpy
                 }]
-
         )
-
-        @view = new CMS.Views.Alert({model: @model})
+        @view.show()
 
     it "should trigger the primary event on a primary click", ->
-        @view.primaryClick()
-        expect(@model.get('actions').primary.click).toHaveBeenCalled()
+        @view.$(".action-primary").click()
+        expect(@primaryClickSpy).toHaveBeenCalled()
+        expect(@secondaryClickSpy).not.toHaveBeenCalled()
 
     it "should trigger the secondary event on a secondary click", ->
-        @view.secondaryClick()
-        expect(@model.get('actions').secondary[0].click).toHaveBeenCalled()
+        @view.$(".action-secondary").click()
+        expect(@secondaryClickSpy).toHaveBeenCalled()
+        expect(@primaryClickSpy).not.toHaveBeenCalled()
 
     it "should apply class to primary action", ->
         expect(@view.$(".action-primary")).toHaveClass("save-button")
@@ -100,20 +126,18 @@ describe "CMS.Views.Alert click events", ->
 
 describe "CMS.Views.Notification minShown and maxShown", ->
     beforeEach ->
-        @model = new CMS.Models.SystemFeedback(
-            intent: "saving"
-            title: "Saving"
-        )
-        spyOn(CMS.Views.Notification.prototype, 'show').andCallThrough()
-        spyOn(CMS.Views.Notification.prototype, 'hide').andCallThrough()
+        @showSpy = spyOn(CMS.Views.Notification.Saving.prototype, 'show')
+        @showSpy.andCallThrough()
+        @hideSpy = spyOn(CMS.Views.Notification.Saving.prototype, 'hide')
+        @hideSpy.andCallThrough()
         @clock = sinon.useFakeTimers()
 
     afterEach ->
         @clock.restore()
 
     it "a minShown view should not hide too quickly", ->
-        view = new CMS.Views.Notification({model: @model, minShown: 1000})
-        expect(CMS.Views.Notification.prototype.show).toHaveBeenCalled()
+        view = new CMS.Views.Notification.Saving({minShown: 1000})
+        view.show()
         expect(view.$('.wrapper')).toBeShown()
 
         # call hide() on it, but the minShown should prevent it from hiding right away
@@ -125,8 +149,8 @@ describe "CMS.Views.Notification minShown and maxShown", ->
         expect(view.$('.wrapper')).toBeHiding()
 
     it "a maxShown view should hide by itself", ->
-        view = new CMS.Views.Notification({model: @model, maxShown: 1000})
-        expect(CMS.Views.Notification.prototype.show).toHaveBeenCalled()
+        view = new CMS.Views.Notification.Saving({maxShown: 1000})
+        view.show()
         expect(view.$('.wrapper')).toBeShown()
 
         # wait for the maxShown timeout to expire, and check again
@@ -134,13 +158,13 @@ describe "CMS.Views.Notification minShown and maxShown", ->
         expect(view.$('.wrapper')).toBeHiding()
 
     it "a minShown view can stay visible longer", ->
-        view = new CMS.Views.Notification({model: @model, minShown: 1000})
-        expect(CMS.Views.Notification.prototype.show).toHaveBeenCalled()
+        view = new CMS.Views.Notification.Saving({minShown: 1000})
+        view.show()
         expect(view.$('.wrapper')).toBeShown()
 
         # wait for the minShown timeout to expire, and check again
         @clock.tick(1001)
-        expect(CMS.Views.Notification.prototype.hide).not.toHaveBeenCalled()
+        expect(@hideSpy).not.toHaveBeenCalled()
         expect(view.$('.wrapper')).toBeShown()
 
         # can now hide immediately
@@ -148,8 +172,8 @@ describe "CMS.Views.Notification minShown and maxShown", ->
         expect(view.$('.wrapper')).toBeHiding()
 
     it "a maxShown view can hide early", ->
-        view = new CMS.Views.Notification({model: @model, maxShown: 1000})
-        expect(CMS.Views.Notification.prototype.show).toHaveBeenCalled()
+        view = new CMS.Views.Notification.Saving({maxShown: 1000})
+        view.show()
         expect(view.$('.wrapper')).toBeShown()
 
         # wait 50 milliseconds, and hide it early
@@ -162,7 +186,8 @@ describe "CMS.Views.Notification minShown and maxShown", ->
         expect(view.$('.wrapper')).toBeHiding()
 
     it "a view can have both maxShown and minShown", ->
-        view = new CMS.Views.Notification({model: @model, minShown: 1000, maxShown: 2000})
+        view = new CMS.Views.Notification.Saving({minShown: 1000, maxShown: 2000})
+        view.show()
 
         # can't hide early
         @clock.tick(50)

cms/static/coffee/src/main.coffee

@@ -18,11 +18,15 @@ $ ->
   $(document).ajaxError (event, jqXHR, ajaxSettings, thrownError) ->
     if ajaxSettings.notifyOnError is false
       return
-    msg = new CMS.Models.ErrorMessage(
+    if jqXHR.responseText
+        message = _.str.truncate(jqXHR.responseText, 300)
+    else
+        message = gettext("This may be happening because of an error with our server or your internet connection. Try refreshing the page or making sure you are online.")
+    msg = new CMS.Views.Notification.Error(
         "title": gettext("Studio's having trouble saving your work")
-        "message": jqXHR.responseText || gettext("This may be happening because of an error with our server or your internet connection. Try refreshing the page or making sure you are online.")
+        "message": message
     )
-    new CMS.Views.Notification({model: msg})
+    msg.show()
 
   window.onTouchBasedDevice = ->
     navigator.userAgent.match /iPhone|iPod|iPad/i

cms/static/js/models/feedback.js

-CMS.Models.SystemFeedback = Backbone.Model.extend({
-    defaults: {
-        "intent": null,  // "warning", "confirmation", "error", "announcement", "step-required", etc
-        "title": "",
-        "message": ""
-        /* could also have an "actions" hash: here is an example demonstrating
-           the expected structure
-        "actions": {
-            "primary": {
-                "text": "Save",
-                "class": "action-save",
-                "click": function() {
-                    // do something when Save is clicked
-                    // `this` refers to the model
-                }
-            },
-            "secondary": [
-                {
-                    "text": "Cancel",
-                    "class": "action-cancel",
-                    "click": function() {}
-                }, {
-                    "text": "Discard Changes",
-                    "class": "action-discard",
-                    "click": function() {}
-                }
-            ]
-        }
-        */
-    }
-});
-
-CMS.Models.WarningMessage = CMS.Models.SystemFeedback.extend({
-    defaults: $.extend({}, CMS.Models.SystemFeedback.prototype.defaults, {
-        "intent": "warning"
-    })
-});
-
-CMS.Models.ErrorMessage = CMS.Models.SystemFeedback.extend({
-    defaults: $.extend({}, CMS.Models.SystemFeedback.prototype.defaults, {
-        "intent": "error"
-    })
-});
-
-CMS.Models.ConfirmAssetDeleteMessage = CMS.Models.SystemFeedback.extend({
-    defaults: $.extend({}, CMS.Models.SystemFeedback.prototype.defaults, {
-        "intent": "warning"
-    })
-});
-
-CMS.Models.ConfirmationMessage = CMS.Models.SystemFeedback.extend({
-    defaults: $.extend({}, CMS.Models.SystemFeedback.prototype.defaults, {
-        "intent": "confirmation"
-    })
-});

cms/static/js/models/section.js

@@ -22,22 +22,16 @@ CMS.Models.Section = Backbone.Model.extend({
     },
     showNotification: function() {
         if(!this.msg) {
-            this.msg = new CMS.Models.SystemFeedback({
-                intent: "saving",
-                title: gettext("Saving…")
-            });
-        }
-        if(!this.msgView) {
-            this.msgView = new CMS.Views.Notification({
-                model: this.msg,
+            this.msg = new CMS.Views.Notification.Saving({
+                title: gettext("Saving…"),
                 closeIcon: false,
                 minShown: 1250
             });
         }
-        this.msgView.show();
+        this.msg.show();
     },
     hideNotification: function() {
-        if(!this.msgView) { return; }
-        this.msgView.hide();
+        if(!this.msg) { return; }
+        this.msg.hide();
     }
 });

cms/static/js/views/feedback.js

-CMS.Views.Alert = Backbone.View.extend({
+CMS.Views.SystemFeedback = Backbone.View.extend({
     options: {
-        type: "alert",
+        title: "",
+        message: "",
+        intent: null,  // "warning", "confirmation", "error", "announcement", "step-required", etc
+        type: null, // "alert", "notification", or "prompt": set by subclass
         shown: true,  // is this view currently being shown?
         icon: true,  // should we render an icon related to the message intent?
         closeIcon: true,  // should we render a close button in the top right corner?
         minShown: 0,  // length of time after this view has been shown before it can be hidden (milliseconds)
         maxShown: Infinity  // length of time after this view has been shown before it will be automatically hidden (milliseconds)
+
+        /* could also have an "actions" hash: here is an example demonstrating
+           the expected structure
+        actions: {
+            primary: {
+                "text": "Save",
+                "class": "action-save",
+                "click": function(view) {
+                    // do something when Save is clicked
+                }
+            },
+            secondary: [
+                {
+                    "text": "Cancel",
+                    "class": "action-cancel",
+                    "click": function(view) {}
+                }, {
+                    "text": "Discard Changes",
+                    "class": "action-discard",
+                    "click": function(view) {}
+                }
+            ]
+        }
+        */
     },
     initialize: function() {
+        if(!this.options.type) {
+            throw "SystemFeedback: type required (given " +
+                JSON.stringify(this.options) + ")";
+        }
+        if(!this.options.intent) {
+            throw "SystemFeedback: intent required (given " +
+                JSON.stringify(this.options) + ")";
+        }
         var tpl = $("#system-feedback-tpl").text();
         if(!tpl) {
             console.error("Couldn't load system-feedback template");
         }
         this.template = _.template(tpl);
         this.setElement($("#page-"+this.options.type));
-        this.listenTo(this.model, 'change', this.render);
-        return this.show();
-    },
-    render: function() {
-        var attrs = $.extend({}, this.options, this.model.attributes);
-        this.$el.html(this.template(attrs));
         return this;
     },
-    events: {
-        "click .action-close": "hide",
-        "click .action-primary": "primaryClick",
-        "click .action-secondary": "secondaryClick"
-    },
+    // public API: show() and hide()
     show: function() {
         clearTimeout(this.hideTimeout);
         this.options.shown = true;
         this.shownAt = new Date();
         this.render();
         if($.isNumeric(this.options.maxShown)) {
-            this.hideTimeout = setTimeout($.proxy(this.hide, this),
+            this.hideTimeout = setTimeout(_.bind(this.hide, this),
                 this.options.maxShown);
         }
         return this;
@@ -43,7 +68,7 @@ CMS.Views.Alert = Backbone.View.extend({
            this.options.minShown > new Date() - this.shownAt)
         {
             clearTimeout(this.hideTimeout);
-            this.hideTimeout = setTimeout($.proxy(this.hide, this),
+            this.hideTimeout = setTimeout(_.bind(this.hide, this),
                 this.options.minShown - (new Date() - this.shownAt));
         } else {
             this.options.shown = false;
@@ -52,40 +77,63 @@ CMS.Views.Alert = Backbone.View.extend({
         }
         return this;
     },
-    primaryClick: function() {
-        var actions = this.model.get("actions");
+    // the rest of the API should be considered semi-private
+    events: {
+        "click .action-close": "hide",
+        "click .action-primary": "primaryClick",
+        "click .action-secondary": "secondaryClick"
+    },
+    render: function() {
+        // there can be only one active view of a given type at a time: only
+        // one alert, only one notification, only one prompt. Therefore, we'll
+        // use a singleton approach.
+        var parent = CMS.Views[_.str.capitalize(this.options.type)];
+        if(parent && parent.active && parent.active !== this) {
+            parent.active.stopListening();
+        }
+        this.$el.html(this.template(this.options));
+        parent.active = this;
+        return this;
+    },
+    primaryClick: function(event) {
+        var actions = this.options.actions;
         if(!actions) { return; }
         var primary = actions.primary;
         if(!primary) { return; }
         if(primary.click) {
-            primary.click.call(this.model, this);
+            primary.click.call(event.target, this, event);
         }
     },
-    secondaryClick: function(e) {
-        var actions = this.model.get("actions");
+    secondaryClick: function(event) {
+        var actions = this.options.actions;
         if(!actions) { return; }
         var secondaryList = actions.secondary;
         if(!secondaryList) { return; }
         // which secondary action was clicked?
         var i = 0;  // default to the first secondary action (easier for testing)
-        if(e && e.target) {
-            i = _.indexOf(this.$(".action-secondary"), e.target);
+        if(event && event.target) {
+            i = _.indexOf(this.$(".action-secondary"), event.target);
         }
-        var secondary = this.model.get("actions").secondary[i];
+        var secondary = secondaryList[i];
         if(secondary.click) {
-            secondary.click.call(this.model, this);
+            secondary.click.call(event.target, this, event);
         }
     }
 });
 
-CMS.Views.Notification = CMS.Views.Alert.extend({
-    options: $.extend({}, CMS.Views.Alert.prototype.options, {
+CMS.Views.Alert = CMS.Views.SystemFeedback.extend({
+    options: $.extend({}, CMS.Views.SystemFeedback.prototype.options, {
+        type: "alert"
+    })
+});
+CMS.Views.Notification = CMS.Views.SystemFeedback.extend({
+    options: $.extend({}, CMS.Views.SystemFeedback.prototype.options, {
         type: "notification",
         closeIcon: false
     })
 });
-CMS.Views.Prompt = CMS.Views.Alert.extend({
-    options: $.extend({}, CMS.Views.Alert.prototype.options, {
+CMS.Views.Prompt = CMS.Views.SystemFeedback.extend({
+    options: $.extend({}, CMS.Views.SystemFeedback.prototype.options, {
         type: "prompt",
         closeIcon: false,
         icon: false
@@ -98,6 +146,27 @@ CMS.Views.Prompt = CMS.Views.Alert.extend({
             $body.removeClass('prompt-is-shown');
         }
         // super() in Javascript has awkward syntax :(
-        return CMS.Views.Alert.prototype.render.apply(this, arguments);
+        return CMS.Views.SystemFeedback.prototype.render.apply(this, arguments);
     }
 });
+
+// create CMS.Views.Alert.Warning, CMS.Views.Notification.Confirmation,
+// CMS.Views.Prompt.StepRequired, etc
+var capitalCamel, types, intents;
+capitalCamel = _.compose(_.str.capitalize, _.str.camelize);
+types = ["alert", "notification", "prompt"];
+intents = ["warning", "error", "confirmation", "announcement", "step-required", "help", "saving"];
+_.each(types, function(type) {
+    _.each(intents, function(intent) {
+        // "class" is a reserved word in Javascript, so use "klass" instead
+        var klass, subklass;
+        klass = CMS.Views[capitalCamel(type)];
+        subklass = klass.extend({
+            options: $.extend({}, klass.prototype.options, {
+                type: type,
+                intent: intent
+            })
+        });
+        klass[capitalCamel(intent)] = subklass;
+    });
+});

cms/static/js/views/section.js

@@ -67,7 +67,7 @@ CMS.Views.SectionEdit = Backbone.View.extend({
     showInvalidMessage: function(model, error, options) {
         model.set("name", model.previous("name"));
         var that = this;
-        var msg = new CMS.Models.ErrorMessage({
+        var prompt = new CMS.Views.Prompt.Error({
             title: gettext("Your change could not be saved"),
             message: error,
             actions: {
@@ -80,6 +80,6 @@ CMS.Views.SectionEdit = Backbone.View.extend({
                 }
             }
         });
-        new CMS.Views.Prompt({model: msg});
+        prompt.show();
     }
 });

cms/templates/asset_index.html

@@ -8,7 +8,6 @@
 
 <%block name="jsextra">
 <script src="${static.url('js/vendor/mustache.js')}"></script>
-<script type="text/javascript" src="${static.url('js/views/assets.js')}"></script>
 
 <script type='text/javascript'>
   // we just want a singleton

cms/templates/base.html

@@ -38,6 +38,7 @@
     <script type="text/javascript" src="/jsi18n/"></script>
     <script type="text/javascript" src="${static.url('js/vendor/json2.js')}"></script>
     <script type="text/javascript" src="${static.url('js/vendor/underscore-min.js')}"></script>
+    <script type="text/javascript" src="${static.url('js/vendor/underscore.string.min.js')}"></script>
     <script type="text/javascript" src="${static.url('js/vendor/backbone-min.js')}"></script>
     <script type="text/javascript" src="${static.url('js/vendor/markitup/jquery.markitup.js')}"></script>
     <script type="text/javascript" src="${static.url('js/vendor/markitup/sets/wiki/set.js')}"></script>
@@ -54,7 +55,6 @@
     <script type="text/javascript" src="${static.url('js/vendor/CodeMirror/css.js')}"></script>
     <script type="text/javascript" src="//www.youtube.com/player_api"></script>
 
-    <script src="${static.url('js/models/feedback.js')}"></script>
     <script src="${static.url('js/views/feedback.js')}"></script>
 
     <!-- view -->

common/djangoapps/terrain/course_helpers.py

-#pylint: disable=C0111
-#pylint: disable=W0621
+# pylint: disable=C0111
+# pylint: disable=W0621
 
 from lettuce import world, step
 from .factories import *

common/djangoapps/track/views.py

 import json
 import logging
-import os
 import pytz
 import datetime
 import dateutil.parser
 
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse
-from django.http import Http404
 from django.shortcuts import redirect
 from django.conf import settings
 from mitxmako.shortcuts import render_to_response
@@ -22,6 +20,7 @@ LOGFIELDS = ['username', 'ip', 'event_source', 'event_type', 'event', 'agent', '
 
 
 def log_event(event):
+    """Write tracking event to log file, and optionally to TrackingLog model."""
     event_str = json.dumps(event)
     log.info(event_str[:settings.TRACK_MAX_EVENT])
     if settings.MITX_FEATURES.get('ENABLE_SQL_TRACKING_LOGS'):
@@ -34,6 +33,11 @@ def log_event(event):
 
 
 def user_track(request):
+    """
+    Log when GET call to "event" URL is made by a user.
+
+    GET call should provide "event_type", "event", and "page" arguments.
+    """
     try:  # TODO: Do the same for many of the optional META parameters
         username = request.user.username
     except:
@@ -50,7 +54,6 @@ def user_track(request):
     except:
         agent = ''
 
-    # TODO: Move a bunch of this into log_event
     event = {
         "username": username,
         "session": scookie,
@@ -68,6 +71,7 @@ def user_track(request):
 
 
 def server_track(request, event_type, event, page=None):
+    """Log events related to server requests."""
     try:
         username = request.user.username
     except:
@@ -95,9 +99,52 @@ def server_track(request, event_type, event, page=None):
     log_event(event)
 
 
+def task_track(request_info, task_info, event_type, event, page=None):
+    """
+    Logs tracking information for events occuring within celery tasks.
+
+    The `event_type` is a string naming the particular event being logged,
+    while `event` is a dict containing whatever additional contextual information
+    is desired.
+
+    The `request_info` is a dict containing information about the original
+    task request.  Relevant keys are `username`, `ip`, `agent`, and `host`.
+    While the dict is required, the values in it are not, so that {} can be
+    passed in.
+
+    In addition, a `task_info` dict provides more information about the current
+    task, to be stored with the `event` dict.  This may also be an empty dict.
+
+    The `page` parameter is optional, and allows the name of the page to
+    be provided.
+    """
+
+    # supplement event information with additional information
+    # about the task in which it is running.
+    full_event = dict(event, **task_info)
+
+    # All fields must be specified, in case the tracking information is
+    # also saved to the TrackingLog model.  Get values from the task-level
+    # information, or just add placeholder values.
+    event = {
+        "username": request_info.get('username', 'unknown'),
+        "ip": request_info.get('ip', 'unknown'),
+        "event_source": "task",
+        "event_type": event_type,
+        "event": full_event,
+        "agent": request_info.get('agent', 'unknown'),
+        "page": page,
+        "time": datetime.datetime.utcnow().isoformat(),
+        "host": request_info.get('host', 'unknown')
+        }
+
+    log_event(event)
+
+
 @login_required
 @ensure_csrf_cookie
 def view_tracking_log(request, args=''):
+    """View to output contents of TrackingLog model.  For staff use only."""
     if not request.user.is_staff:
         return redirect('/')
     nlen = 100

common/djangoapps/xmodule_modifiers.py

-import re
 import json
 import logging
 import static_replace

common/lib/xmodule/xmodule/capa_module.py

@@ -424,7 +424,7 @@ class CapaModule(CapaFields, XModule):
 
         # If we cannot construct the problem HTML,
         # then generate an error message instead.
-        except Exception, err:
+        except Exception as err:
             html = self.handle_problem_html_error(err)
 
         # The convention is to pass the name of the check button
@@ -655,7 +655,7 @@ class CapaModule(CapaFields, XModule):
     @staticmethod
     def make_dict_of_responses(get):
         '''Make dictionary of student responses (aka "answers")
-        get is POST dictionary (Djano QueryDict).
+        get is POST dictionary (Django QueryDict).
 
         The *get* dict has keys of the form 'x_y', which are mapped
         to key 'y' in the returned dict.  For example,
@@ -739,13 +739,13 @@ class CapaModule(CapaFields, XModule):
         # Too late. Cannot submit
         if self.closed():
             event_info['failure'] = 'closed'
-            self.system.track_function('save_problem_check_fail', event_info)
+            self.system.track_function('problem_check_fail', event_info)
             raise NotFoundError('Problem is closed')
 
         # Problem submitted. Student should reset before checking again
         if self.done and self.rerandomize == "always":
             event_info['failure'] = 'unreset'
-            self.system.track_function('save_problem_check_fail', event_info)
+            self.system.track_function('problem_check_fail', event_info)
             raise NotFoundError('Problem must be reset before it can be checked again')
 
         # Problem queued. Students must wait a specified waittime before they are allowed to submit
@@ -759,6 +759,8 @@ class CapaModule(CapaFields, XModule):
 
         try:
             correct_map = self.lcp.grade_answers(answers)
+            self.attempts = self.attempts + 1
+            self.lcp.done = True
             self.set_state_from_lcp()
 
         except (StudentInputError, ResponseError, LoncapaProblemError) as inst:
@@ -778,17 +780,13 @@ class CapaModule(CapaFields, XModule):
 
             return {'success': msg}
 
-        except Exception, err:
+        except Exception as err:
             if self.system.DEBUG:
                 msg = "Error checking problem: " + str(err)
                 msg += '\nTraceback:\n' + traceback.format_exc()
                 return {'success': msg}
             raise
 
-        self.attempts = self.attempts + 1
-        self.lcp.done = True
-
-        self.set_state_from_lcp()
         self.publish_grade()
 
         # success = correct if ALL questions in this problem are correct
@@ -802,7 +800,7 @@ class CapaModule(CapaFields, XModule):
         event_info['correct_map'] = correct_map.get_dict()
         event_info['success'] = success
         event_info['attempts'] = self.attempts
-        self.system.track_function('save_problem_check', event_info)
+        self.system.track_function('problem_check', event_info)
 
         if hasattr(self.system, 'psychometrics_handler'):  # update PsychometricsData using callback
             self.system.psychometrics_handler(self.get_state_for_lcp())
@@ -814,12 +812,92 @@ class CapaModule(CapaFields, XModule):
                 'contents': html,
                 }
 
+    def rescore_problem(self):
+        """
+        Checks whether the existing answers to a problem are correct.
+
+        This is called when the correct answer to a problem has been changed,
+        and the grade should be re-evaluated.
+
+        Returns a dict with one key:
+            {'success' : 'correct' | 'incorrect' | AJAX alert msg string }
+
+        Raises NotFoundError if called on a problem that has not yet been
+        answered, or NotImplementedError if it's a problem that cannot be rescored.
+
+        Returns the error messages for exceptions occurring while performing
+        the rescoring, rather than throwing them.
+        """
+        event_info = {'state': self.lcp.get_state(), 'problem_id': self.location.url()}
+
+        if not self.lcp.supports_rescoring():
+            event_info['failure'] = 'unsupported'
+            self.system.track_function('problem_rescore_fail', event_info)
+            raise NotImplementedError("Problem's definition does not support rescoring")
+
+        if not self.done:
+            event_info['failure'] = 'unanswered'
+            self.system.track_function('problem_rescore_fail', event_info)
+            raise NotFoundError('Problem must be answered before it can be graded again')
+
+        # get old score, for comparison:
+        orig_score = self.lcp.get_score()
+        event_info['orig_score'] = orig_score['score']
+        event_info['orig_total'] = orig_score['total']
+
+        try:
+            correct_map = self.lcp.rescore_existing_answers()
+
+        except (StudentInputError, ResponseError, LoncapaProblemError) as inst:
+            log.warning("Input error in capa_module:problem_rescore", exc_info=True)
+            event_info['failure'] = 'input_error'
+            self.system.track_function('problem_rescore_fail', event_info)
+            return {'success': u"Error: {0}".format(inst.message)}
+
+        except Exception as err:
+            event_info['failure'] = 'unexpected'
+            self.system.track_function('problem_rescore_fail', event_info)
+            if self.system.DEBUG:
+                msg = u"Error checking problem: {0}".format(err.message)
+                msg += u'\nTraceback:\n' + traceback.format_exc()
+                return {'success': msg}
+            raise
+
+        # rescoring should have no effect on attempts, so don't
+        # need to increment here, or mark done.  Just save.
+        self.set_state_from_lcp()
+
+        self.publish_grade()
+
+        new_score = self.lcp.get_score()
+        event_info['new_score'] = new_score['score']
+        event_info['new_total'] = new_score['total']
+
+        # success = correct if ALL questions in this problem are correct
+        success = 'correct'
+        for answer_id in correct_map:
+            if not correct_map.is_correct(answer_id):
+                success = 'incorrect'
+
+        # NOTE: We are logging both full grading and queued-grading submissions. In the latter,
+        #       'success' will always be incorrect
+        event_info['correct_map'] = correct_map.get_dict()
+        event_info['success'] = success
+        event_info['attempts'] = self.attempts
+        self.system.track_function('problem_rescore', event_info)
+
+        # psychometrics should be called on rescoring requests in the same way as check-problem
+        if hasattr(self.system, 'psychometrics_handler'):  # update PsychometricsData using callback
+            self.system.psychometrics_handler(self.get_state_for_lcp())
+
+        return {'success': success}
+
     def save_problem(self, get):
-        '''
+        """
         Save the passed in answers.
-        Returns a dict { 'success' : bool, ['error' : error-msg]},
-        with the error key only present if success is False.
-        '''
+        Returns a dict { 'success' : bool, 'msg' : message }
+        The message is informative on success, and an error message on failure.
+        """
         event_info = dict()
         event_info['state'] = self.lcp.get_state()
         event_info['problem_id'] = self.location.url()

common/lib/xmodule/xmodule/combined_open_ended_module.py

@@ -58,7 +58,7 @@ class CombinedOpenEndedFields(object):
     state = String(help="Which step within the current task that the student is on.", default="initial",
                    scope=Scope.user_state)
     student_attempts = Integer(help="Number of attempts taken by the student on this problem", default=0,
-                                      scope=Scope.user_state)
+                               scope=Scope.user_state)
     ready_to_reset = Boolean(
         help="If the problem is ready to be reset or not.", default=False,
         scope=Scope.user_state
@@ -66,7 +66,7 @@ class CombinedOpenEndedFields(object):
     attempts = Integer(
         display_name="Maximum Attempts",
         help="The number of times the student can try to answer this problem.", default=1,
-        scope=Scope.settings, values = {"min" : 1 }
+        scope=Scope.settings, values={"min" : 1 }
     )
     is_graded = Boolean(display_name="Graded", help="Whether or not the problem is graded.", default=False, scope=Scope.settings)
     accept_file_upload = Boolean(
@@ -89,7 +89,7 @@ class CombinedOpenEndedFields(object):
     weight = Float(
         display_name="Problem Weight",
         help="Defines the number of points each problem is worth. If the value is not set, each problem is worth one point.",
-        scope=Scope.settings, values = {"min" : 0 , "step": ".1"}
+        scope=Scope.settings, values={"min" : 0 , "step": ".1"}
     )
     markdown = String(help="Markdown source of this module", scope=Scope.settings)
 

common/lib/xmodule/xmodule/fields.py

@@ -77,10 +77,8 @@ class Date(ModelType):
             else:
                 return value.isoformat()
 
-
 TIMEDELTA_REGEX = re.compile(r'^((?P<days>\d+?) day(?:s?))?(\s)?((?P<hours>\d+?) hour(?:s?))?(\s)?((?P<minutes>\d+?) minute(?:s)?)?(\s)?((?P<seconds>\d+?) second(?:s)?)?$')
 
-
 class Timedelta(ModelType):
     def from_json(self, time_str):
         """

common/lib/xmodule/xmodule/gst_module.py

@@ -84,7 +84,7 @@ class GraphicalSliderToolModule(GraphicalSliderToolFields, XModule):
 
         xml = html.fromstring(html_string)
 
-        #substitute plot, if presented
+        # substitute plot, if presented
         plot_div = '<div class="{element_class}_plot" id="{element_id}_plot" \
                     style="{style}"></div>'
         plot_el = xml.xpath('//plot')
@@ -95,7 +95,7 @@ class GraphicalSliderToolModule(GraphicalSliderToolFields, XModule):
                                                element_id=self.html_id,
                                                style=plot_el.get('style', ""))))
 
-        #substitute sliders
+        # substitute sliders
         slider_div = '<div class="{element_class}_slider" \
                                    id="{element_id}_slider_{var}" \
                                    data-var="{var}" \

common/lib/xmodule/xmodule/html_module.py

@@ -57,7 +57,7 @@ class HtmlDescriptor(HtmlFields, XmlDescriptor, EditingDescriptor):
         if path.endswith('.html.xml'):
             path = path[:-9] + '.html'  # backcompat--look for html instead of xml
         if path.endswith('.html.html'):
-            path = path[:-5]            # some people like to include .html in filenames..
+            path = path[:-5]  # some people like to include .html in filenames..
         candidates = []
         while os.sep in path:
             candidates.append(path)
@@ -100,9 +100,9 @@ class HtmlDescriptor(HtmlFields, XmlDescriptor, EditingDescriptor):
             pointer_path = "{category}/{url_path}".format(category='html',
                                                   url_path=name_to_pathname(location.name))
             base = path(pointer_path).dirname()
-            #log.debug("base = {0}, base.dirname={1}, filename={2}".format(base, base.dirname(), filename))
+            # log.debug("base = {0}, base.dirname={1}, filename={2}".format(base, base.dirname(), filename))
             filepath = "{base}/{name}.html".format(base=base, name=filename)
-            #log.debug("looking for html file for {0} at {1}".format(location, filepath))
+            # log.debug("looking for html file for {0} at {1}".format(location, filepath))
 
             # VS[compat]
             # TODO (cpennington): If the file doesn't exist at the right path,
@@ -111,7 +111,7 @@ class HtmlDescriptor(HtmlFields, XmlDescriptor, EditingDescriptor):
             # online and has imported all current (fall 2012) courses from xml
             if not system.resources_fs.exists(filepath):
                 candidates = cls.backcompat_paths(filepath)
-                #log.debug("candidates = {0}".format(candidates))
+                # log.debug("candidates = {0}".format(candidates))
                 for candidate in candidates:
                     if system.resources_fs.exists(candidate):
                         filepath = candidate

common/lib/xmodule/xmodule/modulestore/__init__.py

@@ -196,7 +196,7 @@ class Location(_LocationBase):
                 raise InvalidLocationError(location)
 
             if len(location) == 5:
-                args = tuple(location) + (None, )
+                args = tuple(location) + (None,)
             else:
                 args = tuple(location)
 
@@ -415,7 +415,7 @@ class ModuleStoreBase(ModuleStore):
         '''
         Set up the error-tracking logic.
         '''
-        self._location_errors = {}    # location -> ErrorLog
+        self._location_errors = {}  # location -> ErrorLog
         self.metadata_inheritance_cache = None
         self.modulestore_update_signal = None  # can be set by runtime to route notifications of datastore changes
 
@@ -440,7 +440,7 @@ class ModuleStoreBase(ModuleStore):
         """
         # check that item is present and raise the promised exceptions if needed
         # TODO (vshnayder): post-launch, make errors properties of items
-        #self.get_item(location)
+        # self.get_item(location)
 
         errorlog = self._get_errorlog(location)
         return errorlog.errors

common/lib/xmodule/xmodule/modulestore/draft.py

@@ -15,14 +15,14 @@ def as_draft(location):
     """
     Returns the Location that is the draft for `location`
     """
-    return Location(location)._replace(revision=DRAFT)
+    return Location(location).replace(revision=DRAFT)
 
 
 def as_published(location):
     """
     Returns the Location that is the published version for `location`
     """
-    return Location(location)._replace(revision=None)
+    return Location(location).replace(revision=None)
 
 
 def wrap_draft(item):
@@ -32,7 +32,7 @@ def wrap_draft(item):
     non-draft location in either case
     """
     setattr(item, 'is_draft', item.location.revision == DRAFT)
-    item.location = item.location._replace(revision=None)
+    item.location = item.location.replace(revision=None)
     return item
 
 
@@ -234,7 +234,7 @@ class DraftModuleStore(ModuleStoreBase):
         # always return the draft - if available
         for draft in to_process_drafts:
             draft_loc = Location(draft["_id"])
-            draft_as_non_draft_loc = draft_loc._replace(revision=None)
+            draft_as_non_draft_loc = draft_loc.replace(revision=None)
 
             # does non-draft exist in the collection
             # if so, replace it

common/lib/xmodule/xmodule/modulestore/mongo.py

@@ -307,7 +307,7 @@ class MongoModuleStore(ModuleStoreBase):
             location = Location(result['_id'])
             # We need to collate between draft and non-draft
             # i.e. draft verticals can have children which are not in non-draft versions
-            location = location._replace(revision=None)
+            location = location.replace(revision=None)
             location_url = location.url()
             if location_url in results_by_url:
                 existing_children = results_by_url[location_url].get('definition', {}).get('children', [])

common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py

@@ -19,18 +19,18 @@ log = logging.getLogger("mitx.courseware")
 # attempts specified in xml definition overrides this.
 MAX_ATTEMPTS = 1
 
-#The highest score allowed for the overall xmodule and for each rubric point
+# The highest score allowed for the overall xmodule and for each rubric point
 MAX_SCORE_ALLOWED = 50
 
-#If true, default behavior is to score module as a practice problem.  Otherwise, no grade at all is shown in progress
-#Metadata overrides this.
+# If true, default behavior is to score module as a practice problem.  Otherwise, no grade at all is shown in progress
+# Metadata overrides this.
 IS_SCORED = False
 
-#If true, then default behavior is to require a file upload or pasted link from a student for this problem.
-#Metadata overrides this.
+# If true, then default behavior is to require a file upload or pasted link from a student for this problem.
+# Metadata overrides this.
 ACCEPT_FILE_UPLOAD = False
 
-#Contains all reasonable bool and case combinations of True
+# Contains all reasonable bool and case combinations of True
 TRUE_DICT = ["True", True, "TRUE", "true"]
 
 HUMAN_TASK_TYPE = {
@@ -38,8 +38,8 @@ HUMAN_TASK_TYPE = {
     'openended': "edX Assessment",
 }
 
-#Default value that controls whether or not to skip basic spelling checks in the controller
-#Metadata overrides this
+# Default value that controls whether or not to skip basic spelling checks in the controller
+# Metadata overrides this
 SKIP_BASIC_CHECKS = False
 
 
@@ -74,7 +74,7 @@ class CombinedOpenEndedV1Module():
     INTERMEDIATE_DONE = 'intermediate_done'
     DONE = 'done'
 
-    #Where the templates live for this problem
+    # Where the templates live for this problem
     TEMPLATE_DIR = "combinedopenended"
 
     def __init__(self, system, location, definition, descriptor,
@@ -118,21 +118,21 @@ class CombinedOpenEndedV1Module():
         self.instance_state = instance_state
         self.display_name = instance_state.get('display_name', "Open Ended")
 
-        #We need to set the location here so the child modules can use it
+        # We need to set the location here so the child modules can use it
         system.set('location', location)
         self.system = system
 
-        #Tells the system which xml definition to load
+        # Tells the system which xml definition to load
         self.current_task_number = instance_state.get('current_task_number', 0)
-        #This loads the states of the individual children
+        # This loads the states of the individual children
         self.task_states = instance_state.get('task_states', [])
-        #Overall state of the combined open ended module
+        # Overall state of the combined open ended module
         self.state = instance_state.get('state', self.INITIAL)
 
         self.student_attempts = instance_state.get('student_attempts', 0)
         self.weight = instance_state.get('weight', 1)
 
-        #Allow reset is true if student has failed the criteria to move to the next child task
+        # Allow reset is true if student has failed the criteria to move to the next child task
         self.ready_to_reset = instance_state.get('ready_to_reset', False)
         self.attempts = self.instance_state.get('attempts', MAX_ATTEMPTS)
         self.is_scored = self.instance_state.get('is_graded', IS_SCORED) in TRUE_DICT
@@ -153,7 +153,7 @@ class CombinedOpenEndedV1Module():
         rubric_string = stringify_children(definition['rubric'])
         self._max_score = self.rubric_renderer.check_if_rubric_is_parseable(rubric_string, location, MAX_SCORE_ALLOWED)
 
-        #Static data is passed to the child modules to render
+        # Static data is passed to the child modules to render
         self.static_data = {
             'max_score': self._max_score,
             'max_attempts': self.attempts,
@@ -243,11 +243,11 @@ class CombinedOpenEndedV1Module():
 
         self.current_task_descriptor = children['descriptors'][current_task_type](self.system)
 
-        #This is the xml object created from the xml definition of the current task
+        # This is the xml object created from the xml definition of the current task
         etree_xml = etree.fromstring(self.current_task_xml)
 
-        #This sends the etree_xml object through the descriptor module of the current task, and
-        #returns the xml parsed by the descriptor
+        # This sends the etree_xml object through the descriptor module of the current task, and
+        # returns the xml parsed by the descriptor
         self.current_task_parsed_xml = self.current_task_descriptor.definition_from_xml(etree_xml, self.system)
         if current_task_state is None and self.current_task_number == 0:
             self.current_task = child_task_module(self.system, self.location,
@@ -293,8 +293,9 @@ class CombinedOpenEndedV1Module():
             if self.current_task_number > 0:
                 last_response_data = self.get_last_response(self.current_task_number - 1)
                 current_response_data = self.get_current_attributes(self.current_task_number)
+
                 if (current_response_data['min_score_to_attempt'] > last_response_data['score']
-                        or current_response_data['max_score_to_attempt'] < last_response_data['score']):
+                    or current_response_data['max_score_to_attempt'] < last_response_data['score']):
                     self.state = self.DONE
                     self.ready_to_reset = True
 
@@ -307,7 +308,7 @@ class CombinedOpenEndedV1Module():
         Output: A dictionary that can be rendered into the combined open ended template.
         """
         task_html = self.get_html_base()
-        #set context variables and render template
+        # set context variables and render template
 
         context = {
             'items': [{'content': task_html}],
@@ -499,7 +500,6 @@ class CombinedOpenEndedV1Module():
         """
         changed = self.update_task_states()
         if changed:
-            #return_html=self.get_html()
             pass
         return return_html
 
@@ -730,15 +730,15 @@ class CombinedOpenEndedV1Module():
         max_score = None
         score = None
         if self.is_scored and self.weight is not None:
-            #Finds the maximum score of all student attempts and keeps it.
+            # Finds the maximum score of all student attempts and keeps it.
             score_mat = []
             for i in xrange(0, len(self.task_states)):
-                #For each task, extract all student scores on that task (each attempt for each task)
+                # For each task, extract all student scores on that task (each attempt for each task)
                 last_response = self.get_last_response(i)
                 max_score = last_response.get('max_score', None)
                 score = last_response.get('all_scores', None)
                 if score is not None:
-                    #Convert none scores and weight scores properly
+                    # Convert none scores and weight scores properly
                     for z in xrange(0, len(score)):
                         if score[z] is None:
                             score[z] = 0
@@ -746,19 +746,19 @@ class CombinedOpenEndedV1Module():
                     score_mat.append(score)
 
             if len(score_mat) > 0:
-                #Currently, assume that the final step is the correct one, and that those are the final scores.
-                #This will change in the future, which is why the machinery above exists to extract all scores on all steps
-                #TODO: better final score handling.
+                # Currently, assume that the final step is the correct one, and that those are the final scores.
+                # This will change in the future, which is why the machinery above exists to extract all scores on all steps
+                # TODO: better final score handling.
                 scores = score_mat[-1]
                 score = max(scores)
             else:
                 score = 0
 
             if max_score is not None:
-                #Weight the max score if it is not None
+                # Weight the max score if it is not None
                 max_score *= float(self.weight)
             else:
-                #Without a max_score, we cannot have a score!
+                # Without a max_score, we cannot have a score!
                 score = None
 
         score_dict = {
@@ -833,7 +833,7 @@ class CombinedOpenEndedV1Descriptor():
         expected_children = ['task', 'rubric', 'prompt']
         for child in expected_children:
             if len(xml_object.xpath(child)) == 0:
-                #This is a staff_facing_error
+                # This is a staff_facing_error
                 raise ValueError(
                     "Combined Open Ended definition must include at least one '{0}' tag. Contact the learning sciences group for assistance. {1}".format(
                         child, xml_object))
@@ -848,6 +848,7 @@ class CombinedOpenEndedV1Descriptor():
 
         return {'task_xml': parse_task('task'), 'prompt': parse('prompt'), 'rubric': parse('rubric')}
 
+
     def definition_to_xml(self, resource_fs):
         '''Return an xml element representing this definition.'''
         elt = etree.Element('combinedopenended')

common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py

@@ -54,7 +54,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         @param system: Modulesystem
         @return: Rendered HTML
         """
-        #set context variables and render template
+        # set context variables and render template
         if self.child_state != self.INITIAL:
             latest = self.latest_answer()
             previous_answer = latest if latest is not None else ''
@@ -93,9 +93,9 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         }
 
         if dispatch not in handlers:
-            #This is a dev_facing_error
+            # This is a dev_facing_error
             log.error("Cannot find {0} in handlers in handle_ajax function for open_ended_module.py".format(dispatch))
-            #This is a dev_facing_error
+            # This is a dev_facing_error
             return json.dumps({'error': 'Error handling action.  Please try again.', 'success': False})
 
         before = self.get_progress()
@@ -129,7 +129,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         elif self.child_state in (self.POST_ASSESSMENT, self.DONE):
             context['read_only'] = True
         else:
-            #This is a dev_facing_error
+            # This is a dev_facing_error
             raise ValueError("Self assessment module is in an illegal state '{0}'".format(self.child_state))
 
         return system.render_template('{0}/self_assessment_rubric.html'.format(self.TEMPLATE_DIR), context)
@@ -155,7 +155,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         elif self.child_state == self.DONE:
             context['read_only'] = True
         else:
-            #This is a dev_facing_error
+            # This is a dev_facing_error
             raise ValueError("Self Assessment module is in an illegal state '{0}'".format(self.child_state))
 
         return system.render_template('{0}/self_assessment_hint.html'.format(self.TEMPLATE_DIR), context)
@@ -190,10 +190,10 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
                 self.new_history_entry(get['student_answer'])
                 self.change_state(self.ASSESSING)
             else:
-                #Error message already defined
+                # Error message already defined
                 success = False
         else:
-            #This is a student_facing_error
+            # This is a student_facing_error
             error_message = "There was a problem saving the image in your submission.  Please try a different image, or try pasting a link to an image into the answer box."
 
         return {
@@ -227,12 +227,12 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
             for i in xrange(0, len(score_list)):
                 score_list[i] = int(score_list[i])
         except ValueError:
-            #This is a dev_facing_error
+            # This is a dev_facing_error
             log.error("Non-integer score value passed to save_assessment ,or no score list present.")
-            #This is a student_facing_error
+            # This is a student_facing_error
             return {'success': False, 'error': "Error saving your score.  Please notify course staff."}
 
-        #Record score as assessment and rubric scores as post assessment
+        # Record score as assessment and rubric scores as post assessment
         self.record_latest_score(score)
         self.record_latest_post_assessment(json.dumps(score_list))
 
@@ -272,7 +272,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         try:
             rubric_scores = json.loads(latest_post_assessment)
         except:
-            #This is a dev_facing_error
+            # This is a dev_facing_error
             log.error("Cannot parse rubric scores in self assessment module from {0}".format(latest_post_assessment))
             rubric_scores = []
         return [rubric_scores]
@@ -306,7 +306,7 @@ class SelfAssessmentDescriptor():
         expected_children = []
         for child in expected_children:
             if len(xml_object.xpath(child)) != 1:
-                #This is a staff_facing_error
+                # This is a staff_facing_error
                 raise ValueError(
                     "Self assessment definition must include exactly one '{0}' tag. Contact the learning sciences group for assistance.".format(
                         child))

common/lib/xmodule/xmodule/seq_module.py

@@ -62,7 +62,7 @@ class SequenceModule(SequenceFields, XModule):
         progress = reduce(Progress.add_counts, progresses)
         return progress
 
-    def handle_ajax(self, dispatch, get):		# TODO: bounds checking
+    def handle_ajax(self, dispatch, get):  # TODO: bounds checking
         ''' get = request.POST instance '''
         if dispatch == 'goto_position':
             self.position = int(get['position'])

common/lib/xmodule/xmodule/template_module.py

@@ -55,7 +55,7 @@ class CustomTagDescriptor(RawDescriptor):
         params = dict(xmltree.items())
 
         # cdodge: look up the template as a module
-        template_loc = self.location._replace(category='custom_tag_template', name=template_name)
+        template_loc = self.location.replace(category='custom_tag_template', name=template_name)
 
         template_module = modulestore().get_instance(system.course_id, template_loc)
         template_module_data = template_module.data

common/lib/xmodule/xmodule/tests/test_capa_module.py

@@ -19,6 +19,7 @@ from django.http import QueryDict
 
 from . import test_system
 from pytz import UTC
+from capa.correctmap import CorrectMap
 
 
 class CapaFactory(object):
@@ -597,6 +598,85 @@ class CapaModuleTest(unittest.TestCase):
         # Expect that the problem was NOT reset
         self.assertTrue('success' in result and not result['success'])
 
+    def test_rescore_problem_correct(self):
+
+        module = CapaFactory.create(attempts=1, done=True)
+
+        # Simulate that all answers are marked correct, no matter
+        # what the input is, by patching LoncapaResponse.evaluate_answers()
+        with patch('capa.responsetypes.LoncapaResponse.evaluate_answers') as mock_evaluate_answers:
+            mock_evaluate_answers.return_value = CorrectMap(CapaFactory.answer_key(), 'correct')
+            result = module.rescore_problem()
+
+        # Expect that the problem is marked correct
+        self.assertEqual(result['success'], 'correct')
+
+        # Expect that we get no HTML
+        self.assertFalse('contents' in result)
+
+        # Expect that the number of attempts is not incremented
+        self.assertEqual(module.attempts, 1)
+
+    def test_rescore_problem_incorrect(self):
+        # make sure it also works when attempts have been reset,
+        # so add this to the test:
+        module = CapaFactory.create(attempts=0, done=True)
+
+        # Simulate that all answers are marked incorrect, no matter
+        # what the input is, by patching LoncapaResponse.evaluate_answers()
+        with patch('capa.responsetypes.LoncapaResponse.evaluate_answers') as mock_evaluate_answers:
+            mock_evaluate_answers.return_value = CorrectMap(CapaFactory.answer_key(), 'incorrect')
+            result = module.rescore_problem()
+
+        # Expect that the problem is marked incorrect
+        self.assertEqual(result['success'], 'incorrect')
+
+        # Expect that the number of attempts is not incremented
+        self.assertEqual(module.attempts, 0)
+
+    def test_rescore_problem_not_done(self):
+        # Simulate that the problem is NOT done
+        module = CapaFactory.create(done=False)
+
+        # Try to rescore the problem, and get exception
+        with self.assertRaises(xmodule.exceptions.NotFoundError):
+            module.rescore_problem()
+
+    def test_rescore_problem_not_supported(self):
+        module = CapaFactory.create(done=True)
+
+        # Try to rescore the problem, and get exception
+        with patch('capa.capa_problem.LoncapaProblem.supports_rescoring') as mock_supports_rescoring:
+            mock_supports_rescoring.return_value = False
+            with self.assertRaises(NotImplementedError):
+                module.rescore_problem()
+
+    def _rescore_problem_error_helper(self, exception_class):
+        """Helper to allow testing all errors that rescoring might return."""
+        # Create the module
+        module = CapaFactory.create(attempts=1, done=True)
+
+        # Simulate answering a problem that raises the exception
+        with patch('capa.capa_problem.LoncapaProblem.rescore_existing_answers') as mock_rescore:
+            mock_rescore.side_effect = exception_class(u'test error \u03a9')
+            result = module.rescore_problem()
+
+        # Expect an AJAX alert message in 'success'
+        expected_msg = u'Error: test error \u03a9'
+        self.assertEqual(result['success'], expected_msg)
+
+        # Expect that the number of attempts is NOT incremented
+        self.assertEqual(module.attempts, 1)
+
+    def test_rescore_problem_student_input_error(self):
+        self._rescore_problem_error_helper(StudentInputError)
+
+    def test_rescore_problem_problem_error(self):
+        self._rescore_problem_error_helper(LoncapaProblemError)
+
+    def test_rescore_problem_response_error(self):
+        self._rescore_problem_error_helper(ResponseError)
+
     def test_save_problem(self):
         module = CapaFactory.create(done=False)
 

common/lib/xmodule/xmodule/tests/test_conditional.py

@@ -20,7 +20,7 @@ from . import test_system
 
 class DummySystem(ImportSystem):
 
-    @patch('xmodule.modulestore.xml.OSFS', lambda dir: MemoryFS())
+    @patch('xmodule.modulestore.xml.OSFS', lambda directory: MemoryFS())
     def __init__(self, load_error_modules):
 
         xmlstore = XMLModuleStore("data_dir", course_dirs=[], load_error_modules=load_error_modules)
@@ -41,7 +41,8 @@ class DummySystem(ImportSystem):
         )
 
     def render_template(self, template, context):
-            raise Exception("Shouldn't be called")
+        raise Exception("Shouldn't be called")
+
 
 class ConditionalFactory(object):
     """
@@ -93,7 +94,7 @@ class ConditionalFactory(object):
         # return dict:
         return {'cond_module': cond_module,
                 'source_module': source_module,
-                'child_module': child_module }
+                'child_module': child_module}
 
 
 class ConditionalModuleBasicTest(unittest.TestCase):
@@ -109,12 +110,11 @@ class ConditionalModuleBasicTest(unittest.TestCase):
         '''verify that get_icon_class works independent of condition satisfaction'''
         modules = ConditionalFactory.create(self.test_system)
         for attempted in ["false", "true"]:
-            for icon_class in [ 'other', 'problem', 'video']:
+            for icon_class in ['other', 'problem', 'video']:
                 modules['source_module'].is_attempted = attempted
                 modules['child_module'].get_icon_class = lambda: icon_class
                 self.assertEqual(modules['cond_module'].get_icon_class(), icon_class)
 
-
     def test_get_html(self):
         modules = ConditionalFactory.create(self.test_system)
         # because test_system returns the repr of the context dict passed to render_template,
@@ -224,4 +224,3 @@ class ConditionalModuleXmlTest(unittest.TestCase):
         print "post-attempt ajax: ", ajax
         html = ajax['html']
         self.assertTrue(any(['This is a secret' in item for item in html]))
-

common/lib/xmodule/xmodule/x_module.py

@@ -15,7 +15,7 @@ from xblock.core import XBlock, Scope, String, Integer, Float, ModelType
 log = logging.getLogger(__name__)
 
 
-def dummy_track(event_type, event):
+def dummy_track(_event_type, _event):
     pass
 
 
@@ -231,7 +231,7 @@ class XModule(XModuleFields, HTMLSnippet, XBlock):
         '''
         return self.icon_class
 
-    ### Functions used in the LMS
+    # Functions used in the LMS
 
     def get_score(self):
         """
@@ -272,7 +272,7 @@ class XModule(XModuleFields, HTMLSnippet, XBlock):
         '''
         return None
 
-    def handle_ajax(self, dispatch, get):
+    def handle_ajax(self, _dispatch, _get):
         ''' dispatch is last part of the URL.
             get is a dictionary-like object '''
         return ""
@@ -647,13 +647,13 @@ class XModuleDescriptor(XModuleFields, HTMLSnippet, ResourceTemplates, XBlock):
             # 1. A select editor for fields with a list of possible values (includes Booleans).
             # 2. Number editors for integers and floats.
             # 3. A generic string editor for anything else (editing JSON representation of the value).
-            type = "Generic"
+            editor_type = "Generic"
             values = [] if field.values is None else copy.deepcopy(field.values)
             if isinstance(values, tuple):
                 values = list(values)
             if isinstance(values, list):
                 if len(values) > 0:
-                    type = "Select"
+                    editor_type = "Select"
                 for index, choice in enumerate(values):
                     json_choice = copy.deepcopy(choice)
                     if isinstance(json_choice, dict) and 'value' in json_choice:
@@ -662,11 +662,11 @@ class XModuleDescriptor(XModuleFields, HTMLSnippet, ResourceTemplates, XBlock):
                         json_choice = field.to_json(json_choice)
                     values[index] = json_choice
             elif isinstance(field, Integer):
-                type = "Integer"
+                editor_type = "Integer"
             elif isinstance(field, Float):
-                type = "Float"
+                editor_type = "Float"
             metadata_fields[field.name] = {'field_name': field.name,
-                                           'type': type,
+                                           'type': editor_type,
                                            'display_name': field.display_name,
                                            'value': field.to_json(value),
                                            'options': values,
@@ -862,7 +862,7 @@ class ModuleSystem(object):
 
 class DoNothingCache(object):
     """A duck-compatible object to use in ModuleSystem when there's no cache."""
-    def get(self, key):
+    def get(self, _key):
         return None
 
     def set(self, key, value, timeout=None):

common/lib/xmodule/xmodule/xml_module.py

@@ -56,7 +56,6 @@ def get_metadata_from_xml(xml_object, remove=True):
     if meta is None:
         return ''
     dmdata = meta.text
-    #log.debug('meta for %s loaded: %s' % (xml_object,dmdata))
     if remove:
         xml_object.remove(meta)
     return dmdata

common/static/coffee/spec/logger_spec.coffee

@@ -3,6 +3,11 @@ describe 'Logger', ->
     expect(window.log_event).toBe Logger.log
 
   describe 'log', ->
+    it 'sends an event to Segment.io, if the event is whitelisted', ->
+      spyOn(analytics, 'track')
+      Logger.log 'seq_goto', 'data'
+      expect(analytics.track).toHaveBeenCalledWith 'seq_goto', 'data'
+
     it 'send a request to log event', ->
       spyOn $, 'getWithPrefix'
       Logger.log 'example', 'data'

common/static/coffee/src/logger.coffee

 class @Logger
+  # events we want sent to Segment.io for tracking
+  SEGMENT_IO_WHITELIST = ["seq_goto", "seq_next", "seq_prev"]
+
   @log: (event_type, data) ->
+    if event_type in SEGMENT_IO_WHITELIST
+      # Segment.io event tracking
+      analytics.track event_type, data
+
     $.getWithPrefix '/event',
       event_type: event_type
       event: JSON.stringify(data)

common/static/js/vendor/underscore.string.min.js

+!function(e,t){"use strict";var n=t.prototype.trim,r=t.prototype.trimRight,i=t.prototype.trimLeft,s=function(e){return e*1||0},o=function(e,t){if(t<1)return"";var n="";while(t>0)t&1&&(n+=e),t>>=1,e+=e;return n},u=[].slice,a=function(e){return e==null?"\\s":e.source?e.source:"["+p.escapeRegExp(e)+"]"},f={lt:"<",gt:">",quot:'"',apos:"'",amp:"&"},l={};for(var c in f)l[f[c]]=c;var h=function(){function e(e){return Object.prototype.toString.call(e).slice(8,-1).toLowerCase()}var n=o,r=function(){return r.cache.hasOwnProperty(arguments[0])||(r.cache[arguments[0]]=r.parse(arguments[0])),r.format.call(null,r.cache[arguments[0]],arguments)};return r.format=function(r,i){var s=1,o=r.length,u="",a,f=[],l,c,p,d,v,m;for(l=0;l<o;l++){u=e(r[l]);if(u==="string")f.push(r[l]);else if(u==="array"){p=r[l];if(p[2]){a=i[s];for(c=0;c<p[2].length;c++){if(!a.hasOwnProperty(p[2][c]))throw new Error(h('[_.sprintf] property "%s" does not exist',p[2][c]));a=a[p[2][c]]}}else p[1]?a=i[p[1]]:a=i[s++];if(/[^s]/.test(p[8])&&e(a)!="number")throw new Error(h("[_.sprintf] expecting number but found %s",e(a)));switch(p[8]){case"b":a=a.toString(2);break;case"c":a=t.fromCharCode(a);break;case"d":a=parseInt(a,10);break;case"e":a=p[7]?a.toExponential(p[7]):a.toExponential();break;case"f":a=p[7]?parseFloat(a).toFixed(p[7]):parseFloat(a);break;case"o":a=a.toString(8);break;case"s":a=(a=t(a))&&p[7]?a.substring(0,p[7]):a;break;case"u":a=Math.abs(a);break;case"x":a=a.toString(16);break;case"X":a=a.toString(16).toUpperCase()}a=/[def]/.test(p[8])&&p[3]&&a>=0?"+"+a:a,v=p[4]?p[4]=="0"?"0":p[4].charAt(1):" ",m=p[6]-t(a).length,d=p[6]?n(v,m):"",f.push(p[5]?a+d:d+a)}}return f.join("")},r.cache={},r.parse=function(e){var t=e,n=[],r=[],i=0;while(t){if((n=/^[^\x25]+/.exec(t))!==null)r.push(n[0]);else if((n=/^\x25{2}/.exec(t))!==null)r.push("%");else{if((n=/^\x25(?:([1-9]\d*)\$|\(([^\)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-fosuxX])/.exec(t))===null)throw new Error("[_.sprintf] huh?");if(n[2]){i|=1;var s=[],o=n[2],u=[];if((u=/^([a-z_][a-z_\d]*)/i.exec(o))===null)throw new Error("[_.sprintf] huh?");s.push(u[1]);while((o=o.substring(u[0].length))!=="")if((u=/^\.([a-z_][a-z_\d]*)/i.exec(o))!==null)s.push(u[1]);else{if((u=/^\[(\d+)\]/.exec(o))===null)throw new Error("[_.sprintf] huh?");s.push(u[1])}n[2]=s}else i|=2;if(i===3)throw new Error("[_.sprintf] mixing positional and named placeholders is not (yet) supported");r.push(n)}t=t.substring(n[0].length)}return r},r}(),p={VERSION:"2.3.0",isBlank:function(e){return e==null&&(e=""),/^\s*$/.test(e)},stripTags:function(e){return e==null?"":t(e).replace(/<\/?[^>]+>/g,"")},capitalize:function(e){return e=e==null?"":t(e),e.charAt(0).toUpperCase()+e.slice(1)},chop:function(e,n){return e==null?[]:(e=t(e),n=~~n,n>0?e.match(new RegExp(".{1,"+n+"}","g")):[e])},clean:function(e){return p.strip(e).replace(/\s+/g," ")},count:function(e,n){return e==null||n==null?0:t(e).split(n).length-1},chars:function(e){return e==null?[]:t(e).split("")},swapCase:function(e){return e==null?"":t(e).replace(/\S/g,function(e){return e===e.toUpperCase()?e.toLowerCase():e.toUpperCase()})},escapeHTML:function(e){return e==null?"":t(e).replace(/[&<>"']/g,function(e){return"&"+l[e]+";"})},unescapeHTML:function(e){return e==null?"":t(e).replace(/\&([^;]+);/g,function(e,n){var r;return n in f?f[n]:(r=n.match(/^#x([\da-fA-F]+)$/))?t.fromCharCode(parseInt(r[1],16)):(r=n.match(/^#(\d+)$/))?t.fromCharCode(~~r[1]):e})},escapeRegExp:function(e){return e==null?"":t(e).replace(/([.*+?^=!:${}()|[\]\/\\])/g,"\\$1")},splice:function(e,t,n,r){var i=p.chars(e);return i.splice(~~t,~~n,r),i.join("")},insert:function(e,t,n){return p.splice(e,t,0,n)},include:function(e,n){return n===""?!0:e==null?!1:t(e).indexOf(n)!==-1},join:function(){var e=u.call(arguments),t=e.shift();return t==null&&(t=""),e.join(t)},lines:function(e){return e==null?[]:t(e).split("\n")},reverse:function(e){return p.chars(e).reverse().join("")},startsWith:function(e,n){return n===""?!0:e==null||n==null?!1:(e=t(e),n=t(n),e.length>=n.length&&e.slice(0,n.length)===n)},endsWith:function(e,n){return n===""?!0:e==null||n==null?!1:(e=t(e),n=t(n),e.length>=n.length&&e.slice(e.length-n.length)===n)},succ:function(e){return e==null?"":(e=t(e),e.slice(0,-1)+t.fromCharCode(e.charCodeAt(e.length-1)+1))},titleize:function(e){return e==null?"":t(e).replace(/(?:^|\s)\S/g,function(e){return e.toUpperCase()})},camelize:function(e){return p.trim(e).replace(/[-_\s]+(.)?/g,function(e,t){return t.toUpperCase()})},underscored:function(e){return p.trim(e).replace(/([a-z\d])([A-Z]+)/g,"$1_$2").replace(/[-\s]+/g,"_").toLowerCase()},dasherize:function(e){return p.trim(e).replace(/([A-Z])/g,"-$1").replace(/[-_\s]+/g,"-").toLowerCase()},classify:function(e){return p.titleize(t(e).replace(/_/g," ")).replace(/\s/g,"")},humanize:function(e){return p.capitalize(p.underscored(e).replace(/_id$/,"").replace(/_/g," "))},trim:function(e,r){return e==null?"":!r&&n?n.call(e):(r=a(r),t(e).replace(new RegExp("^"+r+"+|"+r+"+$","g"),""))},ltrim:function(e,n){return e==null?"":!n&&i?i.call(e):(n=a(n),t(e).replace(new RegExp("^"+n+"+"),""))},rtrim:function(e,n){return e==null?"":!n&&r?r.call(e):(n=a(n),t(e).replace(new RegExp(n+"+$"),""))},truncate:function(e,n,r){return e==null?"":(e=t(e),r=r||"...",n=~~n,e.length>n?e.slice(0,n)+r:e)},prune:function(e,n,r){if(e==null)return"";e=t(e),n=~~n,r=r!=null?t(r):"...";if(e.length<=n)return e;var i=function(e){return e.toUpperCase()!==e.toLowerCase()?"A":" "},s=e.slice(0,n+1).replace(/.(?=\W*\w*$)/g,i);return s.slice(s.length-2).match(/\w\w/)?s=s.replace(/\s*\S+$/,""):s=p.rtrim(s.slice(0,s.length-1)),(s+r).length>e.length?e:e.slice(0,s.length)+r},words:function(e,t){return p.isBlank(e)?[]:p.trim(e,t).split(t||/\s+/)},pad:function(e,n,r,i){e=e==null?"":t(e),n=~~n;var s=0;r?r.length>1&&(r=r.charAt(0)):r=" ";switch(i){case"right":return s=n-e.length,e+o(r,s);case"both":return s=n-e.length,o(r,Math.ceil(s/2))+e+o(r,Math.floor(s/2));default:return s=n-e.length,o(r,s)+e}},lpad:function(e,t,n){return p.pad(e,t,n)},rpad:function(e,t,n){return p.pad(e,t,n,"right")},lrpad:function(e,t,n){return p.pad(e,t,n,"both")},sprintf:h,vsprintf:function(e,t){return t.unshift(e),h.apply(null,t)},toNumber:function(e,n){if(e==null||e=="")return 0;e=t(e);var r=s(s(e).toFixed(~~n));return r===0&&!e.match(/^0+$/)?Number.NaN:r},numberFormat:function(e,t,n,r){if(isNaN(e)||e==null)return"";e=e.toFixed(~~t),r=r||",";var i=e.split("."),s=i[0],o=i[1]?(n||".")+i[1]:"";return s.replace(/(\d)(?=(?:\d{3})+$)/g,"$1"+r)+o},strRight:function(e,n){if(e==null)return"";e=t(e),n=n!=null?t(n):n;var r=n?e.indexOf(n):-1;return~r?e.slice(r+n.length,e.length):e},strRightBack:function(e,n){if(e==null)return"";e=t(e),n=n!=null?t(n):n;var r=n?e.lastIndexOf(n):-1;return~r?e.slice(r+n.length,e.length):e},strLeft:function(e,n){if(e==null)return"";e=t(e),n=n!=null?t(n):n;var r=n?e.indexOf(n):-1;return~r?e.slice(0,r):e},strLeftBack:function(e,t){if(e==null)return"";e+="",t=t!=null?""+t:t;var n=e.lastIndexOf(t);return~n?e.slice(0,n):e},toSentence:function(e,t,n,r){t=t||", ",n=n||" and ";var i=e.slice(),s=i.pop();return e.length>2&&r&&(n=p.rtrim(t)+n),i.length?i.join(t)+n+s:s},toSentenceSerial:function(){var e=u.call(arguments);return e[3]=!0,p.toSentence.apply(p,e)},slugify:function(e){if(e==null)return"";var n="ąàáäâãåæćęèéëêìíïîłńòóöôõøùúüûñçżź",r="aaaaaaaaceeeeeiiiilnoooooouuuunczz",i=new RegExp(a(n),"g");return e=t(e).toLowerCase().replace(i,function(e){var t=n.indexOf(e);return r.charAt(t)||"-"}),p.dasherize(e.replace(/[^\w\s-]/g,""))},surround:function(e,t){return[t,e,t].join("")},quote:function(e){return p.surround(e,'"')},exports:function(){var e={};for(var t in this){if(!this.hasOwnProperty(t)||t.match(/^(?:include|contains|reverse)$/))continue;e[t]=this[t]}return e},repeat:function(e,n,r){if(e==null)return"";n=~~n;if(r==null)return o(t(e),n);for(var i=[];n>0;i[--n]=e);return i.join(r)},levenshtein:function(e,n){if(e==null&&n==null)return 0;if(e==null)return t(n).length;if(n==null)return t(e).length;e=t(e),n=t(n);var r=[],i,s;for(var o=0;o<=n.length;o++)for(var u=0;u<=e.length;u++)o&&u?e.charAt(u-1)===n.charAt(o-1)?s=i:s=Math.min(r[u],r[u-1],i)+1:s=o+u,i=r[u],r[u]=s;return r.pop()}};p.strip=p.trim,p.lstrip=p.ltrim,p.rstrip=p.rtrim,p.center=p.lrpad,p.rjust=p.lpad,p.ljust=p.rpad,p.contains=p.include,p.q=p.quote,typeof exports!="undefined"?(typeof module!="undefined"&&module.exports&&(module.exports=p),exports._s=p):typeof define=="function"&&define.amd?define("underscore.string",[],function(){return p}):(e._=e._||{},e._.string=e._.str=p)}(this,String);
\ No newline at end of file

common/templates/jasmine/jasmine_test_runner.html.erb

@@ -26,6 +26,8 @@
   <script type="text/javascript" src="<%= common_js_root %>/vendor/tiny_mce/tiny_mce.js"></script>
   <script type="text/javascript" src="<%= common_js_root %>/vendor/mathjax-MathJax-c9db6ac/MathJax.js?config=default"></script>
   <script type="text/javascript" src="<%= common_js_root %>/vendor/jquery.timeago.js"></script>
+  <script type="text/javascript" src="<%= common_js_root %>/vendor/sinon-1.7.1.js"></script>
+  <script type="text/javascript" src="<%= common_js_root %>/vendor/analytics.js"></script>
   <script type="text/javascript">
     AjaxPrefix.addAjaxPrefix(jQuery, function() {
        return "";

lms/djangoapps/courseware/features/common.py

-#pylint: disable=C0111
-#pylint: disable=W0621
+# pylint: disable=C0111
+# pylint: disable=W0621
 
 from __future__ import absolute_import
 

lms/djangoapps/courseware/features/problems.py

@@ -112,12 +112,12 @@ def assert_problem_has_answer(step, problem_type, answer_class):
 
 
 @step(u'I reset the problem')
-def reset_problem(step):
+def reset_problem(_step):
     world.css_click('input.reset')
 
 
 @step(u'I press the button with the label "([^"]*)"$')
-def press_the_button_with_label(step, buttonname):
+def press_the_button_with_label(_step, buttonname):
     button_css = 'button span.show-label'
     elem = world.css_find(button_css).first
     assert_equal(elem.text, buttonname)
@@ -125,7 +125,7 @@ def press_the_button_with_label(step, buttonname):
 
 
 @step(u'The "([^"]*)" button does( not)? appear')
-def action_button_present(step, buttonname, doesnt_appear):
+def action_button_present(_step, buttonname, doesnt_appear):
     button_css = 'section.action input[value*="%s"]' % buttonname
     if doesnt_appear:
         assert world.is_css_not_present(button_css)

lms/djangoapps/courseware/features/registration.py

-#pylint: disable=C0111
-#pylint: disable=W0621
+# pylint: disable=C0111
+# pylint: disable=W0621
 
 from lettuce import world, step
 from lettuce.django import django_url
@@ -7,7 +7,7 @@ from common import TEST_COURSE_ORG, TEST_COURSE_NAME
 
 
 @step('I register for the course "([^"]*)"$')
-def i_register_for_the_course(step, course):
+def i_register_for_the_course(_step, course):
     cleaned_name = TEST_COURSE_NAME.replace(' ', '_')
     url = django_url('courses/%s/%s/%s/about' % (TEST_COURSE_ORG, course, cleaned_name))
     world.browser.visit(url)
@@ -20,13 +20,13 @@ def i_register_for_the_course(step, course):
 
 
 @step(u'I should see an empty dashboard message')
-def i_should_see_empty_dashboard(step):
+def i_should_see_empty_dashboard(_step):
     empty_dash_css = 'section.empty-dashboard-message'
     assert world.is_css_present(empty_dash_css)
 
 
 @step(u'I should( NOT)? see the course numbered "([^"]*)" in my dashboard$')
-def i_should_see_that_course_in_my_dashboard(step, doesnt_appear, course):
+def i_should_see_that_course_in_my_dashboard(_step, doesnt_appear, course):
     course_link_css = 'section.my-courses a[href*="%s"]' % course
     if doesnt_appear:
         assert world.is_css_not_present(course_link_css)
@@ -35,7 +35,7 @@ def i_should_see_that_course_in_my_dashboard(step, doesnt_appear, course):
 
 
 @step(u'I unregister for the course numbered "([^"]*)"')
-def i_unregister_for_that_course(step, course):
+def i_unregister_for_that_course(_step, course):
     unregister_css = 'section.info a[href*="#unenroll-modal"][data-course-number*="%s"]' % course
     world.css_click(unregister_css)
     button_css = 'section#unenroll-modal input[value="Unregister"]'

lms/djangoapps/courseware/features/video.py

@@ -8,12 +8,12 @@ from common import TEST_COURSE_NAME, TEST_SECTION_NAME, i_am_registered_for_the_
 
 
 @step('when I view the video it has autoplay enabled')
-def does_autoplay(step):
+def does_autoplay(_step):
     assert(world.css_find('.video')[0]['data-autoplay'] == 'True')
 
 
 @step('the course has a Video component')
-def view_video(step):
+def view_video(_step):
     coursename = TEST_COURSE_NAME.replace(' ', '_')
     i_am_registered_for_the_course(step, coursename)
 

lms/djangoapps/courseware/models.py

@@ -4,9 +4,9 @@ WE'RE USING MIGRATIONS!
 If you make changes to this model, be sure to create an appropriate migration
 file and check it in at the same time as your model changes. To do that,
 
-1. Go to the mitx dir
+1. Go to the edx-platform dir
 2. ./manage.py schemamigration courseware --auto description_of_your_change
-3. Add the migration file created in mitx/courseware/migrations/
+3. Add the migration file created in edx-platform/lms/djangoapps/courseware/migrations/
 
 
 ASSUMPTIONS: modules have unique IDs, even across different module_types
@@ -17,6 +17,7 @@ from django.db import models
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 
+
 class StudentModule(models.Model):
     """
     Keeps student state for a particular module in a particular course.

lms/djangoapps/courseware/module_render.py

@@ -121,7 +121,7 @@ def toc_for_course(user, request, course, active_chapter, active_section, model_
 
 
 def get_module(user, request, location, model_data_cache, course_id,
-               position=None, not_found_ok = False, wrap_xmodule_display=True,
+               position=None, not_found_ok=False, wrap_xmodule_display=True,
                grade_bucket_type=None, depth=0):
     """
     Get an instance of the xmodule class identified by location,
@@ -161,16 +161,49 @@ def get_module(user, request, location, model_data_cache, course_id,
         return None
 
 
-def get_module_for_descriptor(user, request, descriptor, model_data_cache, course_id,
-                position=None, wrap_xmodule_display=True, grade_bucket_type=None):
+def get_xqueue_callback_url_prefix(request):
     """
-    Actually implement get_module.  See docstring there for details.
+    Calculates default prefix based on request, but allows override via settings
+
+    This is separated from get_module_for_descriptor so that it can be called
+    by the LMS before submitting background tasks to run.  The xqueue callbacks
+    should go back to the LMS, not to the worker.
     """
+    prefix = '{proto}://{host}'.format(
+            proto=request.META.get('HTTP_X_FORWARDED_PROTO', 'https' if request.is_secure() else 'http'),
+            host=request.get_host()
+        )
+    return settings.XQUEUE_INTERFACE.get('callback_url', prefix)
 
+
+def get_module_for_descriptor(user, request, descriptor, model_data_cache, course_id,
+                              position=None, wrap_xmodule_display=True, grade_bucket_type=None):
+    """
+    Implements get_module, extracting out the request-specific functionality.
+
+    See get_module() docstring for further details.
+    """
     # allow course staff to masquerade as student
     if has_access(user, descriptor, 'staff', course_id):
         setup_masquerade(request, True)
 
+    track_function = make_track_function(request)
+    xqueue_callback_url_prefix = get_xqueue_callback_url_prefix(request)
+
+    return get_module_for_descriptor_internal(user, descriptor, model_data_cache, course_id,
+                                              track_function, xqueue_callback_url_prefix,
+                                              position, wrap_xmodule_display, grade_bucket_type)
+
+
+def get_module_for_descriptor_internal(user, descriptor, model_data_cache, course_id,
+                                       track_function, xqueue_callback_url_prefix,
+                                       position=None, wrap_xmodule_display=True, grade_bucket_type=None):
+    """
+    Actually implement get_module, without requiring a request.
+
+    See get_module() docstring for further details.
+    """
+
     # Short circuit--if the user shouldn't have access, bail without doing any work
     if not has_access(user, descriptor, 'load', course_id):
         return None
@@ -186,19 +219,13 @@ def get_module_for_descriptor(user, request, descriptor, model_data_cache, cours
 
     def make_xqueue_callback(dispatch='score_update'):
         # Fully qualified callback URL for external queueing system
-        xqueue_callback_url = '{proto}://{host}'.format(
-            host=request.get_host(),
-            proto=request.META.get('HTTP_X_FORWARDED_PROTO', 'https' if request.is_secure() else 'http')
-        )
-        xqueue_callback_url = settings.XQUEUE_INTERFACE.get('callback_url',xqueue_callback_url)	# allow override
-
-        xqueue_callback_url += reverse('xqueue_callback',
-                                      kwargs=dict(course_id=course_id,
-                                                  userid=str(user.id),
-                                                  id=descriptor.location.url(),
-                                                  dispatch=dispatch),
-                                      )
-        return xqueue_callback_url
+        relative_xqueue_callback_url = reverse('xqueue_callback',
+                                               kwargs=dict(course_id=course_id,
+                                                           userid=str(user.id),
+                                                           id=descriptor.location.url(),
+                                                           dispatch=dispatch),
+                                       )
+        return xqueue_callback_url_prefix + relative_xqueue_callback_url
 
     # Default queuename is course-specific and is derived from the course that
     #   contains the current module.
@@ -211,20 +238,20 @@ def get_module_for_descriptor(user, request, descriptor, model_data_cache, cours
               'waittime': settings.XQUEUE_WAITTIME_BETWEEN_REQUESTS
              }
 
-    #This is a hacky way to pass settings to the combined open ended xmodule
-    #It needs an S3 interface to upload images to S3
-    #It needs the open ended grading interface in order to get peer grading to be done
-    #this first checks to see if the descriptor is the correct one, and only sends settings if it is
+    # This is a hacky way to pass settings to the combined open ended xmodule
+    # It needs an S3 interface to upload images to S3
+    # It needs the open ended grading interface in order to get peer grading to be done
+    # this first checks to see if the descriptor is the correct one, and only sends settings if it is
 
-    #Get descriptor metadata fields indicating needs for various settings
+    # Get descriptor metadata fields indicating needs for various settings
     needs_open_ended_interface = getattr(descriptor, "needs_open_ended_interface", False)
     needs_s3_interface = getattr(descriptor, "needs_s3_interface", False)
 
-    #Initialize interfaces to None
+    # Initialize interfaces to None
     open_ended_grading_interface = None
     s3_interface = None
 
-    #Create interfaces if needed
+    # Create interfaces if needed
     if needs_open_ended_interface:
         open_ended_grading_interface = settings.OPEN_ENDED_GRADING_INTERFACE
         open_ended_grading_interface['mock_peer_grading'] = settings.MOCK_PEER_GRADING
@@ -238,10 +265,15 @@ def get_module_for_descriptor(user, request, descriptor, model_data_cache, cours
 
     def inner_get_module(descriptor):
         """
-        Delegate to get_module.  It does an access check, so may return None
+        Delegate to get_module_for_descriptor_internal() with all values except `descriptor` set.
+
+        Because it does an access check, it may return None.
         """
-        return get_module_for_descriptor(user, request, descriptor,
-                                         model_data_cache, course_id, position)
+        # TODO: fix this so that make_xqueue_callback uses the descriptor passed into
+        # inner_get_module, not the parent's callback.  Add it as an argument....
+        return get_module_for_descriptor_internal(user, descriptor, model_data_cache, course_id,
+                                                  track_function, make_xqueue_callback,
+                                                  position, wrap_xmodule_display, grade_bucket_type)
 
     def xblock_model_data(descriptor):
         return DbModel(
@@ -266,7 +298,7 @@ def get_module_for_descriptor(user, request, descriptor, model_data_cache, cours
         student_module.max_grade = event.get('max_value')
         student_module.save()
 
-        #Bin score into range and increment stats
+        # Bin score into range and increment stats
         score_bucket = get_score_bucket(student_module.grade, student_module.max_grade)
         org, course_num, run = course_id.split("/")
 
@@ -291,7 +323,7 @@ def get_module_for_descriptor(user, request, descriptor, model_data_cache, cours
     # TODO (cpennington): When modules are shared between courses, the static
     # prefix is going to have to be specific to the module, not the directory
     # that the xml was loaded from
-    system = ModuleSystem(track_function=make_track_function(request),
+    system = ModuleSystem(track_function=track_function,
                           render_template=render_to_string,
                           ajax_url=ajax_url,
                           xqueue=xqueue,
@@ -440,13 +472,13 @@ def modx_dispatch(request, dispatch, location, course_id):
             inputfiles = request.FILES.getlist(fileinput_id)
 
             if len(inputfiles) > settings.MAX_FILEUPLOADS_PER_INPUT:
-                too_many_files_msg = 'Submission aborted! Maximum %d files may be submitted at once' %\
+                too_many_files_msg = 'Submission aborted! Maximum %d files may be submitted at once' % \
                     settings.MAX_FILEUPLOADS_PER_INPUT
                 return HttpResponse(json.dumps({'success': too_many_files_msg}))
 
             for inputfile in inputfiles:
-                if inputfile.size > settings.STUDENT_FILEUPLOAD_MAX_SIZE:   # Bytes
-                    file_too_big_msg = 'Submission aborted! Your file "%s" is too large (max size: %d MB)' %\
+                if inputfile.size > settings.STUDENT_FILEUPLOAD_MAX_SIZE:  # Bytes
+                    file_too_big_msg = 'Submission aborted! Your file "%s" is too large (max size: %d MB)' % \
                                         (inputfile.name, settings.STUDENT_FILEUPLOAD_MAX_SIZE / (1000 ** 2))
                     return HttpResponse(json.dumps({'success': file_too_big_msg}))
             p[fileinput_id] = inputfiles

lms/djangoapps/courseware/tests/test_tabs.py

@@ -11,21 +11,22 @@ from courseware.tests.tests import TEST_DATA_MONGO_MODULESTORE
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
 
+
 class ProgressTestCase(TestCase):
 
-   def setUp(self):
+    def setUp(self):
 
-       self.mockuser1 = MagicMock()
-       self.mockuser0 = MagicMock()
-       self.course = MagicMock()
-       self.mockuser1.is_authenticated.return_value = True
-       self.mockuser0.is_authenticated.return_value = False
-       self.course.id = 'edX/full/6.002_Spring_2012'
-       self.tab = {'name': 'same'}
-       self.active_page1 = 'progress'
-       self.active_page0 = 'stagnation'
+        self.mockuser1 = MagicMock()
+        self.mockuser0 = MagicMock()
+        self.course = MagicMock()
+        self.mockuser1.is_authenticated.return_value = True
+        self.mockuser0.is_authenticated.return_value = False
+        self.course.id = 'edX/full/6.002_Spring_2012'
+        self.tab = {'name': 'same'}
+        self.active_page1 = 'progress'
+        self.active_page0 = 'stagnation'
 
-   def test_progress(self):
+    def test_progress(self):
 
         self.assertEqual(tabs._progress(self.tab, self.mockuser0, self.course,
                                         self.active_page0), [])
@@ -34,8 +35,8 @@ class ProgressTestCase(TestCase):
                                         self.active_page1)[0].name, 'same')
 
         self.assertEqual(tabs._progress(self.tab, self.mockuser1, self.course,
-                                       self.active_page1)[0].link,
-                         reverse('progress', args = [self.course.id]))
+                                        self.active_page1)[0].link,
+                         reverse('progress', args=[self.course.id]))
 
         self.assertEqual(tabs._progress(self.tab, self.mockuser1, self.course,
                                         self.active_page0)[0].is_active, False)
@@ -63,15 +64,15 @@ class WikiTestCase(TestCase):
                          'same')
 
         self.assertEqual(tabs._wiki(self.tab, self.user,
-                    				self.course, self.active_page1)[0].link,
+                                    self.course, self.active_page1)[0].link,
                          reverse('course_wiki', args=[self.course.id]))
 
         self.assertEqual(tabs._wiki(self.tab, self.user,
-        			                self.course, self.active_page1)[0].is_active,
+                                    self.course, self.active_page1)[0].is_active,
                          True)
 
         self.assertEqual(tabs._wiki(self.tab, self.user,
-        			                self.course, self.active_page0)[0].is_active,
+                                    self.course, self.active_page0)[0].is_active,
                          False)
 
     @override_settings(WIKI_ENABLED=False)
@@ -129,14 +130,13 @@ class StaticTabTestCase(TestCase):
 
         self.assertEqual(tabs._static_tab(self.tabby, self.user,
                                           self.course, self.active_page1)[0].link,
-                         reverse('static_tab', args = [self.course.id,
-                                                       self.tabby['url_slug']]))
+                         reverse('static_tab', args=[self.course.id,
+                                                     self.tabby['url_slug']]))
 
         self.assertEqual(tabs._static_tab(self.tabby, self.user,
                                           self.course, self.active_page1)[0].is_active,
                          True)
 
-
         self.assertEqual(tabs._static_tab(self.tabby, self.user,
                                           self.course, self.active_page0)[0].is_active,
                          False)
@@ -183,7 +183,7 @@ class TextbooksTestCase(TestCase):
 
         self.assertEqual(tabs._textbooks(self.tab, self.mockuser1,
                                          self.course, self.active_page1)[1].name,
-                        'Topology')
+                         'Topology')
 
         self.assertEqual(tabs._textbooks(self.tab, self.mockuser1,
                                          self.course, self.active_page1)[1].link,
@@ -206,6 +206,7 @@ class TextbooksTestCase(TestCase):
         self.assertEqual(tabs._textbooks(self.tab, self.mockuser0,
                                          self.course, self.active_pageX), [])
 
+
 class KeyCheckerTestCase(TestCase):
 
     def setUp(self):
@@ -223,39 +224,36 @@ class KeyCheckerTestCase(TestCase):
 
 class NullValidatorTestCase(TestCase):
 
-   def setUp(self):
-
-      self.d = {}
+    def setUp(self):
 
-      def test_null_validator(self):
+        self.dummy = {}
 
-         self.assertIsNone(tabs.null_validator(self.d))
+        def test_null_validator(self):
+            self.assertIsNone(tabs.null_validator(self.dummy))
 
 
 class ValidateTabsTestCase(TestCase):
 
     def setUp(self):
 
-        self.courses = [MagicMock() for i in range(0,5)]
+        self.courses = [MagicMock() for i in range(0, 5)]
 
         self.courses[0].tabs = None
 
-        self.courses[1].tabs = [{'type':'courseware'}, {'type': 'fax'}]
-
-        self.courses[2].tabs = [{'type':'shadow'}, {'type': 'course_info'}]
+        self.courses[1].tabs = [{'type': 'courseware'}, {'type': 'fax'}]
 
-        self.courses[3].tabs = [{'type':'courseware'},{'type':'course_info', 'name': 'alice'},
-                             {'type': 'wiki', 'name':'alice'}, {'type':'discussion', 'name': 'alice'},
-                             {'type':'external_link', 'name': 'alice', 'link':'blink'},
-                             {'type':'textbooks'}, {'type':'progress', 'name': 'alice'},
-                             {'type':'static_tab', 'name':'alice', 'url_slug':'schlug'},
-                             {'type': 'staff_grading'}]
+        self.courses[2].tabs = [{'type': 'shadow'}, {'type': 'course_info'}]
 
-        self.courses[4].tabs = [{'type':'courseware'},{'type': 'course_info'}, {'type': 'flying'}]
+        self.courses[3].tabs = [{'type': 'courseware'}, {'type': 'course_info', 'name': 'alice'},
+                                {'type': 'wiki', 'name': 'alice'}, {'type': 'discussion', 'name': 'alice'},
+                                {'type': 'external_link', 'name': 'alice', 'link': 'blink'},
+                                {'type': 'textbooks'}, {'type': 'progress', 'name': 'alice'},
+                                {'type': 'static_tab', 'name': 'alice', 'url_slug': 'schlug'},
+                                {'type': 'staff_grading'}]
 
+        self.courses[4].tabs = [{'type': 'courseware'}, {'type': 'course_info'}, {'type': 'flying'}]
 
     def test_validate_tabs(self):
-
         self.assertIsNone(tabs.validate_tabs(self.courses[0]))
         self.assertRaises(tabs.InvalidTabsException, tabs.validate_tabs, self.courses[1])
         self.assertRaises(tabs.InvalidTabsException, tabs.validate_tabs, self.courses[2])
@@ -268,15 +266,15 @@ class DiscussionLinkTestCase(ModuleStoreTestCase):
 
     def setUp(self):
         self.tabs_with_discussion = [
-            {'type':'courseware'},
-            {'type':'course_info'},
-            {'type':'discussion'},
-            {'type':'textbooks'},
+            {'type': 'courseware'},
+            {'type': 'course_info'},
+            {'type': 'discussion'},
+            {'type': 'textbooks'},
         ]
         self.tabs_without_discussion = [
-            {'type':'courseware'},
-            {'type':'course_info'},
-            {'type':'textbooks'},
+            {'type': 'courseware'},
+            {'type': 'course_info'},
+            {'type': 'textbooks'},
         ]
 
     @staticmethod

lms/djangoapps/instructor_task/api.py

+"""
+API for submitting background tasks by an instructor for a course.
+
+Also includes methods for getting information about tasks that have
+already been submitted, filtered either by running state or input
+arguments.
+
+"""
+
+from celery.states import READY_STATES
+
+from xmodule.modulestore.django import modulestore
+
+from instructor_task.models import InstructorTask
+from instructor_task.tasks import (rescore_problem,
+                                   reset_problem_attempts,
+                                   delete_problem_state)
+
+from instructor_task.api_helper import (check_arguments_for_rescoring,
+                                        encode_problem_and_student_input,
+                                        submit_task)
+
+
+def get_running_instructor_tasks(course_id):
+    """
+    Returns a query of InstructorTask objects of running tasks for a given course.
+
+    Used to generate a list of tasks to display on the instructor dashboard.
+    """
+    instructor_tasks = InstructorTask.objects.filter(course_id=course_id)
+    # exclude states that are "ready" (i.e. not "running", e.g. failure, success, revoked):
+    for state in READY_STATES:
+        instructor_tasks = instructor_tasks.exclude(task_state=state)
+    return instructor_tasks.order_by('-id')
+
+
+def get_instructor_task_history(course_id, problem_url, student=None):
+    """
+    Returns a query of InstructorTask objects of historical tasks for a given course,
+    that match a particular problem and optionally a student.
+    """
+    _, task_key = encode_problem_and_student_input(problem_url, student)
+
+    instructor_tasks = InstructorTask.objects.filter(course_id=course_id, task_key=task_key)
+    return instructor_tasks.order_by('-id')
+
+
+def submit_rescore_problem_for_student(request, course_id, problem_url, student):
+    """
+    Request a problem to be rescored as a background task.
+
+    The problem will be rescored for the specified student only.  Parameters are the `course_id`,
+    the `problem_url`, and the `student` as a User object.
+    The url must specify the location of the problem, using i4x-type notation.
+
+    ItemNotFoundException is raised if the problem doesn't exist, or AlreadyRunningError
+    if the problem is already being rescored for this student, or NotImplementedError if
+    the problem doesn't support rescoring.
+
+    This method makes sure the InstructorTask entry is committed.
+    When called from any view that is wrapped by TransactionMiddleware,
+    and thus in a "commit-on-success" transaction, an autocommit buried within here
+    will cause any pending transaction to be committed by a successful
+    save here.  Any future database operations will take place in a
+    separate transaction.
+
+    """
+    # check arguments:  let exceptions return up to the caller.
+    check_arguments_for_rescoring(course_id, problem_url)
+
+    task_type = 'rescore_problem'
+    task_class = rescore_problem
+    task_input, task_key = encode_problem_and_student_input(problem_url, student)
+    return submit_task(request, task_type, task_class, course_id, task_input, task_key)
+
+
+def submit_rescore_problem_for_all_students(request, course_id, problem_url):
+    """
+    Request a problem to be rescored as a background task.
+
+    The problem will be rescored for all students who have accessed the
+    particular problem in a course and have provided and checked an answer.
+    Parameters are the `course_id` and the `problem_url`.
+    The url must specify the location of the problem, using i4x-type notation.
+
+    ItemNotFoundException is raised if the problem doesn't exist, or AlreadyRunningError
+    if the problem is already being rescored, or NotImplementedError if the problem doesn't
+    support rescoring.
+
+    This method makes sure the InstructorTask entry is committed.
+    When called from any view that is wrapped by TransactionMiddleware,
+    and thus in a "commit-on-success" transaction, an autocommit buried within here
+    will cause any pending transaction to be committed by a successful
+    save here.  Any future database operations will take place in a
+    separate transaction.
+    """
+    # check arguments:  let exceptions return up to the caller.
+    check_arguments_for_rescoring(course_id, problem_url)
+
+    # check to see if task is already running, and reserve it otherwise
+    task_type = 'rescore_problem'
+    task_class = rescore_problem
+    task_input, task_key = encode_problem_and_student_input(problem_url)
+    return submit_task(request, task_type, task_class, course_id, task_input, task_key)
+
+
+def submit_reset_problem_attempts_for_all_students(request, course_id, problem_url):
+    """
+    Request to have attempts reset for a problem as a background task.
+
+    The problem's attempts will be reset for all students who have accessed the
+    particular problem in a course.  Parameters are the `course_id` and
+    the `problem_url`.  The url must specify the location of the problem,
+    using i4x-type notation.
+
+    ItemNotFoundException is raised if the problem doesn't exist, or AlreadyRunningError
+    if the problem is already being reset.
+
+    This method makes sure the InstructorTask entry is committed.
+    When called from any view that is wrapped by TransactionMiddleware,
+    and thus in a "commit-on-success" transaction, an autocommit buried within here
+    will cause any pending transaction to be committed by a successful
+    save here.  Any future database operations will take place in a
+    separate transaction.
+    """
+    # check arguments:  make sure that the problem_url is defined
+    # (since that's currently typed in).  If the corresponding module descriptor doesn't exist,
+    # an exception will be raised.  Let it pass up to the caller.
+    modulestore().get_instance(course_id, problem_url)
+
+    task_type = 'reset_problem_attempts'
+    task_class = reset_problem_attempts
+    task_input, task_key = encode_problem_and_student_input(problem_url)
+    return submit_task(request, task_type, task_class, course_id, task_input, task_key)
+
+
+def submit_delete_problem_state_for_all_students(request, course_id, problem_url):
+    """
+    Request to have state deleted for a problem as a background task.
+
+    The problem's state will be deleted for all students who have accessed the
+    particular problem in a course.  Parameters are the `course_id` and
+    the `problem_url`.  The url must specify the location of the problem,
+    using i4x-type notation.
+
+    ItemNotFoundException is raised if the problem doesn't exist, or AlreadyRunningError
+    if the particular problem's state is already being deleted.
+
+    This method makes sure the InstructorTask entry is committed.
+    When called from any view that is wrapped by TransactionMiddleware,
+    and thus in a "commit-on-success" transaction, an autocommit buried within here
+    will cause any pending transaction to be committed by a successful
+    save here.  Any future database operations will take place in a
+    separate transaction.
+    """
+    # check arguments:  make sure that the problem_url is defined
+    # (since that's currently typed in).  If the corresponding module descriptor doesn't exist,
+    # an exception will be raised.  Let it pass up to the caller.
+    modulestore().get_instance(course_id, problem_url)
+
+    task_type = 'delete_problem_state'
+    task_class = delete_problem_state
+    task_input, task_key = encode_problem_and_student_input(problem_url)
+    return submit_task(request, task_type, task_class, course_id, task_input, task_key)

lms/djangoapps/instructor_task/migrations/0001_initial.py

+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'InstructorTask'
+        db.create_table('instructor_task_instructortask', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('task_type', self.gf('django.db.models.fields.CharField')(max_length=50, db_index=True)),
+            ('course_id', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)),
+            ('task_key', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)),
+            ('task_input', self.gf('django.db.models.fields.CharField')(max_length=255)),
+            ('task_id', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)),
+            ('task_state', self.gf('django.db.models.fields.CharField')(max_length=50, null=True, db_index=True)),
+            ('task_output', self.gf('django.db.models.fields.CharField')(max_length=1024, null=True)),
+            ('requester', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
+            ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, null=True, blank=True)),
+            ('updated', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
+        ))
+        db.send_create_signal('instructor_task', ['InstructorTask'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'InstructorTask'
+        db.delete_table('instructor_task_instructortask')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'instructor_task.instructortask': {
+            'Meta': {'object_name': 'InstructorTask'},
+            'course_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'requester': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'task_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'task_input': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'task_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'task_output': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True'}),
+            'task_state': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'db_index': 'True'}),
+            'task_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['instructor_task']
\ No newline at end of file

lms/djangoapps/instructor_task/models.py

+"""
+WE'RE USING MIGRATIONS!
+
+If you make changes to this model, be sure to create an appropriate migration
+file and check it in at the same time as your model changes. To do that,
+
+1. Go to the edx-platform dir
+2. ./manage.py schemamigration instructor_task --auto description_of_your_change
+3. Add the migration file created in edx-platform/lms/djangoapps/instructor_task/migrations/
+
+
+ASSUMPTIONS: modules have unique IDs, even across different module_types
+
+"""
+from uuid import uuid4
+import json
+
+from django.contrib.auth.models import User
+from django.db import models, transaction
+
+
+# define custom states used by InstructorTask
+QUEUING = 'QUEUING'
+PROGRESS = 'PROGRESS'
+
+
+class InstructorTask(models.Model):
+    """
+    Stores information about background tasks that have been submitted to
+    perform work by an instructor (or course staff).
+    Examples include grading and rescoring.
+
+    `task_type` identifies the kind of task being performed, e.g. rescoring.
+    `course_id` uses the course run's unique id to identify the course.
+    `task_key` stores relevant input arguments encoded into key value for testing to see
+           if the task is already running (together with task_type and course_id).
+    `task_input` stores input arguments as JSON-serialized dict, for reporting purposes.
+        Examples include url of problem being rescored, id of student if only one student being rescored.
+
+    `task_id` stores the id used by celery for the background task.
+    `task_state` stores the last known state of the celery task
+    `task_output` stores the output of the celery task.
+        Format is a JSON-serialized dict.  Content varies by task_type and task_state.
+
+    `requester` stores id of user who submitted the task
+    `created` stores date that entry was first created
+    `updated` stores date that entry was last modified
+    """
+    task_type = models.CharField(max_length=50, db_index=True)
+    course_id = models.CharField(max_length=255, db_index=True)
+    task_key = models.CharField(max_length=255, db_index=True)
+    task_input = models.CharField(max_length=255)
+    task_id = models.CharField(max_length=255, db_index=True)  # max_length from celery_taskmeta
+    task_state = models.CharField(max_length=50, null=True, db_index=True)  # max_length from celery_taskmeta
+    task_output = models.CharField(max_length=1024, null=True)
+    requester = models.ForeignKey(User, db_index=True)
+    created = models.DateTimeField(auto_now_add=True, null=True)
+    updated = models.DateTimeField(auto_now=True)
+
+    def __repr__(self):
+        return 'InstructorTask<%r>' % ({
+            'task_type': self.task_type,
+            'course_id': self.course_id,
+            'task_input': self.task_input,
+            'task_id': self.task_id,
+            'task_state': self.task_state,
+            'task_output': self.task_output,
+        },)
+
+    def __unicode__(self):
+        return unicode(repr(self))
+
+    @classmethod
+    def create(cls, course_id, task_type, task_key, task_input, requester):
+        # create the task_id here, and pass it into celery:
+        task_id = str(uuid4())
+
+        json_task_input = json.dumps(task_input)
+
+        # check length of task_input, and return an exception if it's too long:
+        if len(json_task_input) > 255:
+            fmt = 'Task input longer than 255: "{input}" for "{task}" of "{course}"'
+            msg = fmt.format(input=json_task_input, task=task_type, course=course_id)
+            raise ValueError(msg)
+
+        # create the task, then save it:
+        instructor_task = cls(course_id=course_id,
+                          task_type=task_type,
+                          task_id=task_id,
+                          task_key=task_key,
+                          task_input=json_task_input,
+                          task_state=QUEUING,
+                          requester=requester)
+        instructor_task.save_now()
+
+        return instructor_task
+
+    @transaction.autocommit
+    def save_now(self):
+        """Writes InstructorTask immediately, ensuring the transaction is committed."""
+        self.save()
+
+    @staticmethod
+    def create_output_for_success(returned_result):
+        """
+        Converts successful result to output format.
+
+        Raises a ValueError exception if the output is too long.
+        """
+        # In future, there should be a check here that the resulting JSON
+        # will fit in the column.  In the meantime, just return an exception.
+        json_output = json.dumps(returned_result)
+        if len(json_output) > 1023:
+            raise ValueError("Length of task output is too long: {0}".format(json_output))
+        return json_output
+
+    @staticmethod
+    def create_output_for_failure(exception, traceback_string):
+        """
+        Converts failed result information to output format.
+
+        Traceback information is truncated or not included if it would result in an output string
+        that would not fit in the database.  If the output is still too long, then the
+        exception message is also truncated.
+
+        Truncation is indicated by adding "..." to the end of the value.
+        """
+        tag = '...'
+        task_progress = {'exception': type(exception).__name__, 'message': str(exception.message)}
+        if traceback_string is not None:
+            # truncate any traceback that goes into the InstructorTask model:
+            task_progress['traceback'] = traceback_string
+        json_output = json.dumps(task_progress)
+        # if the resulting output is too long, then first shorten the
+        # traceback, and then the message, until it fits.
+        too_long = len(json_output) - 1023
+        if too_long > 0:
+            if traceback_string is not None:
+                if too_long >= len(traceback_string) - len(tag):
+                    # remove the traceback entry entirely (so no key or value)
+                    del task_progress['traceback']
+                    too_long -= (len(traceback_string) + len('traceback'))
+                else:
+                    # truncate the traceback:
+                    task_progress['traceback'] = traceback_string[:-(too_long + len(tag))] + tag
+                    too_long = 0
+            if too_long > 0:
+                # we need to shorten the message:
+                task_progress['message'] = task_progress['message'][:-(too_long + len(tag))] + tag
+            json_output = json.dumps(task_progress)
+        return json_output
+
+    @staticmethod
+    def create_output_for_revoked():
+        """Creates standard message to store in output format for revoked tasks."""
+        return json.dumps({'message': 'Task revoked before running'})

lms/djangoapps/instructor_task/tasks.py

+"""
+This file contains tasks that are designed to perform background operations on the
+running state of a course.
+
+At present, these tasks all operate on StudentModule objects in one way or another,
+so they share a visitor architecture.  Each task defines an "update function" that
+takes a module_descriptor, a particular StudentModule object, and xmodule_instance_args.
+
+A task may optionally specify a "filter function" that takes a query for StudentModule
+objects, and adds additional filter clauses.
+
+A task also passes through "xmodule_instance_args", that are used to provide
+information to our code that instantiates xmodule instances.
+
+The task definition then calls the traversal function, passing in the three arguments
+above, along with the id value for an InstructorTask object.  The InstructorTask
+object contains a 'task_input' row which is a JSON-encoded dict containing
+a problem URL and optionally a student.  These are used to set up the initial value
+of the query for traversing StudentModule objects.
+
+"""
+from celery import task
+from instructor_task.tasks_helper import (update_problem_module_state,
+                                          rescore_problem_module_state,
+                                          reset_attempts_module_state,
+                                          delete_problem_module_state)
+
+
+@task
+def rescore_problem(entry_id, xmodule_instance_args):
+    """Rescores a problem in a course, for all students or one specific student.
+
+    `entry_id` is the id value of the InstructorTask entry that corresponds to this task.
+    The entry contains the `course_id` that identifies the course, as well as the
+    `task_input`, which contains task-specific input.
+
+    The task_input should be a dict with the following entries:
+
+      'problem_url': the full URL to the problem to be rescored.  (required)
+
+      'student': the identifier (username or email) of a particular user whose
+          problem submission should be rescored.  If not specified, all problem
+          submissions for the problem will be rescored.
+
+    `xmodule_instance_args` provides information needed by _get_module_instance_for_task()
+    to instantiate an xmodule instance.
+    """
+    action_name = 'rescored'
+    update_fcn = rescore_problem_module_state
+    filter_fcn = lambda(modules_to_update): modules_to_update.filter(state__contains='"done": true')
+    return update_problem_module_state(entry_id,
+                                       update_fcn, action_name, filter_fcn=filter_fcn,
+                                       xmodule_instance_args=xmodule_instance_args)
+
+
+@task
+def reset_problem_attempts(entry_id, xmodule_instance_args):
+    """Resets problem attempts to zero for a particular problem for all students in a course.
+
+    `entry_id` is the id value of the InstructorTask entry that corresponds to this task.
+    The entry contains the `course_id` that identifies the course, as well as the
+    `task_input`, which contains task-specific input.
+
+    The task_input should be a dict with the following entries:
+
+      'problem_url': the full URL to the problem to be rescored.  (required)
+
+    `xmodule_instance_args` provides information needed by _get_module_instance_for_task()
+    to instantiate an xmodule instance.
+    """
+    action_name = 'reset'
+    update_fcn = reset_attempts_module_state
+    return update_problem_module_state(entry_id,
+                                       update_fcn, action_name, filter_fcn=None,
+                                       xmodule_instance_args=xmodule_instance_args)
+
+
+@task
+def delete_problem_state(entry_id, xmodule_instance_args):
+    """Deletes problem state entirely for all students on a particular problem in a course.
+
+    `entry_id` is the id value of the InstructorTask entry that corresponds to this task.
+    The entry contains the `course_id` that identifies the course, as well as the
+    `task_input`, which contains task-specific input.
+
+    The task_input should be a dict with the following entries:
+
+      'problem_url': the full URL to the problem to be rescored.  (required)
+
+    `xmodule_instance_args` provides information needed by _get_module_instance_for_task()
+    to instantiate an xmodule instance.
+    """
+    action_name = 'deleted'
+    update_fcn = delete_problem_module_state
+    return update_problem_module_state(entry_id,
+                                       update_fcn, action_name, filter_fcn=None,
+                                       xmodule_instance_args=xmodule_instance_args)

lms/djangoapps/instructor_task/tests/factories.py

+import json
+
+from factory import DjangoModelFactory, SubFactory
+from student.tests.factories import UserFactory as StudentUserFactory
+from instructor_task.models import InstructorTask
+from celery.states import PENDING
+
+
+class InstructorTaskFactory(DjangoModelFactory):
+    FACTORY_FOR = InstructorTask
+
+    task_type = 'rescore_problem'
+    course_id = "MITx/999/Robot_Super_Course"
+    task_input = json.dumps({})
+    task_key = None
+    task_id = None
+    task_state = PENDING
+    task_output = None
+    requester = SubFactory(StudentUserFactory)

lms/djangoapps/instructor_task/tests/test_api.py

+"""
+Test for LMS instructor background task queue management
+"""
+
+from xmodule.modulestore.exceptions import ItemNotFoundError
+
+from courseware.tests.factories import UserFactory
+
+from instructor_task.api import (get_running_instructor_tasks,
+                                 get_instructor_task_history,
+                                 submit_rescore_problem_for_all_students,
+                                 submit_rescore_problem_for_student,
+                                 submit_reset_problem_attempts_for_all_students,
+                                 submit_delete_problem_state_for_all_students)
+
+from instructor_task.api_helper import AlreadyRunningError
+from instructor_task.models import InstructorTask, PROGRESS
+from instructor_task.tests.test_base import (InstructorTaskTestCase,
+                                             InstructorTaskModuleTestCase,
+                                             TEST_COURSE_ID)
+
+
+class InstructorTaskReportTest(InstructorTaskTestCase):
+    """
+    Tests API and view methods that involve the reporting of status for background tasks.
+    """
+
+    def test_get_running_instructor_tasks(self):
+        # when fetching running tasks, we get all running tasks, and only running tasks
+        for _ in range(1, 5):
+            self._create_failure_entry()
+            self._create_success_entry()
+        progress_task_ids = [self._create_progress_entry().task_id for _ in range(1, 5)]
+        task_ids = [instructor_task.task_id for instructor_task in get_running_instructor_tasks(TEST_COURSE_ID)]
+        self.assertEquals(set(task_ids), set(progress_task_ids))
+
+    def test_get_instructor_task_history(self):
+        # when fetching historical tasks, we get all tasks, including running tasks
+        expected_ids = []
+        for _ in range(1, 5):
+            expected_ids.append(self._create_failure_entry().task_id)
+            expected_ids.append(self._create_success_entry().task_id)
+            expected_ids.append(self._create_progress_entry().task_id)
+        task_ids = [instructor_task.task_id for instructor_task
+                    in get_instructor_task_history(TEST_COURSE_ID, self.problem_url)]
+        self.assertEquals(set(task_ids), set(expected_ids))
+
+
+class InstructorTaskSubmitTest(InstructorTaskModuleTestCase):
+    """Tests API methods that involve the submission of background tasks."""
+
+    def setUp(self):
+        self.initialize_course()
+        self.student = UserFactory.create(username="student", email="student@edx.org")
+        self.instructor = UserFactory.create(username="instructor", email="instructor@edx.org")
+
+    def test_submit_nonexistent_modules(self):
+        # confirm that a rescore of a non-existent module returns an exception
+        problem_url = InstructorTaskModuleTestCase.problem_location("NonexistentProblem")
+        course_id = self.course.id
+        request = None
+        with self.assertRaises(ItemNotFoundError):
+            submit_rescore_problem_for_student(request, course_id, problem_url, self.student)
+        with self.assertRaises(ItemNotFoundError):
+            submit_rescore_problem_for_all_students(request, course_id, problem_url)
+        with self.assertRaises(ItemNotFoundError):
+            submit_reset_problem_attempts_for_all_students(request, course_id, problem_url)
+        with self.assertRaises(ItemNotFoundError):
+            submit_delete_problem_state_for_all_students(request, course_id, problem_url)
+
+    def test_submit_nonrescorable_modules(self):
+        # confirm that a rescore of an existent but unscorable module returns an exception
+        # (Note that it is easier to test a scoreable but non-rescorable module in test_tasks,
+        # where we are creating real modules.)
+        problem_url = self.problem_section.location.url()
+        course_id = self.course.id
+        request = None
+        with self.assertRaises(NotImplementedError):
+            submit_rescore_problem_for_student(request, course_id, problem_url, self.student)
+        with self.assertRaises(NotImplementedError):
+            submit_rescore_problem_for_all_students(request, course_id, problem_url)
+
+    def _test_submit_with_long_url(self, task_function, student=None):
+        problem_url_name = 'x' * 255
+        self.define_option_problem(problem_url_name)
+        location = InstructorTaskModuleTestCase.problem_location(problem_url_name)
+        with self.assertRaises(ValueError):
+            if student is not None:
+                task_function(self.create_task_request(self.instructor), self.course.id, location, student)
+            else:
+                task_function(self.create_task_request(self.instructor), self.course.id, location)
+
+    def test_submit_rescore_all_with_long_url(self):
+        self._test_submit_with_long_url(submit_rescore_problem_for_all_students)
+
+    def test_submit_rescore_student_with_long_url(self):
+        self._test_submit_with_long_url(submit_rescore_problem_for_student, self.student)
+
+    def test_submit_reset_all_with_long_url(self):
+        self._test_submit_with_long_url(submit_reset_problem_attempts_for_all_students)
+
+    def test_submit_delete_all_with_long_url(self):
+        self._test_submit_with_long_url(submit_delete_problem_state_for_all_students)
+
+    def _test_submit_task(self, task_function, student=None):
+        # tests submit, and then tests a second identical submission.
+        problem_url_name = 'H1P1'
+        self.define_option_problem(problem_url_name)
+        location = InstructorTaskModuleTestCase.problem_location(problem_url_name)
+        if student is not None:
+            instructor_task = task_function(self.create_task_request(self.instructor),
+                                            self.course.id, location, student)
+        else:
+            instructor_task = task_function(self.create_task_request(self.instructor),
+                                            self.course.id, location)
+
+        # test resubmitting, by updating the existing record:
+        instructor_task = InstructorTask.objects.get(id=instructor_task.id)
+        instructor_task.task_state = PROGRESS
+        instructor_task.save()
+
+        with self.assertRaises(AlreadyRunningError):
+            if student is not None:
+                task_function(self.create_task_request(self.instructor), self.course.id, location, student)
+            else:
+                task_function(self.create_task_request(self.instructor), self.course.id, location)
+
+    def test_submit_rescore_all(self):
+        self._test_submit_task(submit_rescore_problem_for_all_students)
+
+    def test_submit_rescore_student(self):
+        self._test_submit_task(submit_rescore_problem_for_student, self.student)
+
+    def test_submit_reset_all(self):
+        self._test_submit_task(submit_reset_problem_attempts_for_all_students)
+
+    def test_submit_delete_all(self):
+        self._test_submit_task(submit_delete_problem_state_for_all_students)

lms/djangoapps/instructor_task/tests/test_base.py

+"""
+Base test classes for LMS instructor-initiated background tasks
+
+"""
+import json
+from uuid import uuid4
+from mock import Mock
+
+from celery.states import SUCCESS, FAILURE
+
+from django.test.testcases import TestCase
+from django.contrib.auth.models import User
+from django.test.utils import override_settings
+
+from capa.tests.response_xml_factory import OptionResponseXMLFactory
+from xmodule.modulestore.django import modulestore
+from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+
+from student.tests.factories import CourseEnrollmentFactory, UserFactory
+from courseware.model_data import StudentModule
+from courseware.tests.tests import LoginEnrollmentTestCase, TEST_DATA_MONGO_MODULESTORE
+
+from instructor_task.api_helper import encode_problem_and_student_input
+from instructor_task.models import PROGRESS, QUEUING
+from instructor_task.tests.factories import InstructorTaskFactory
+from instructor_task.views import instructor_task_status
+
+
+TEST_COURSE_ORG = 'edx'
+TEST_COURSE_NAME = 'Test Course'
+TEST_COURSE_NUMBER = '1.23x'
+TEST_SECTION_NAME = "Problem"
+TEST_COURSE_ID = 'edx/1.23x/test_course'
+
+TEST_FAILURE_MESSAGE = 'task failed horribly'
+TEST_FAILURE_EXCEPTION = 'RandomCauseError'
+
+OPTION_1 = 'Option 1'
+OPTION_2 = 'Option 2'
+
+
+class InstructorTaskTestCase(TestCase):
+    """
+    Tests API and view methods that involve the reporting of status for background tasks.
+    """
+    def setUp(self):
+        self.student = UserFactory.create(username="student", email="student@edx.org")
+        self.instructor = UserFactory.create(username="instructor", email="instructor@edx.org")
+        self.problem_url = InstructorTaskTestCase.problem_location("test_urlname")
+
+    @staticmethod
+    def problem_location(problem_url_name):
+        """
+        Create an internal location for a test problem.
+        """
+        return "i4x://{org}/{number}/problem/{problem_url_name}".format(org='edx',
+                                                                        number='1.23x',
+                                                                        problem_url_name=problem_url_name)
+
+    def _create_entry(self, task_state=QUEUING, task_output=None, student=None):
+        """Creates a InstructorTask entry for testing."""
+        task_id = str(uuid4())
+        progress_json = json.dumps(task_output) if task_output is not None else None
+        task_input, task_key = encode_problem_and_student_input(self.problem_url, student)
+
+        instructor_task = InstructorTaskFactory.create(course_id=TEST_COURSE_ID,
+                                                       requester=self.instructor,
+                                                       task_input=json.dumps(task_input),
+                                                       task_key=task_key,
+                                                       task_id=task_id,
+                                                       task_state=task_state,
+                                                       task_output=progress_json)
+        return instructor_task
+
+    def _create_failure_entry(self):
+        """Creates a InstructorTask entry representing a failed task."""
+        # view task entry for task failure
+        progress = {'message': TEST_FAILURE_MESSAGE,
+                    'exception': TEST_FAILURE_EXCEPTION,
+                    }
+        return self._create_entry(task_state=FAILURE, task_output=progress)
+
+    def _create_success_entry(self, student=None):
+        """Creates a InstructorTask entry representing a successful task."""
+        return self._create_progress_entry(student, task_state=SUCCESS)
+
+    def _create_progress_entry(self, student=None, task_state=PROGRESS):
+        """Creates a InstructorTask entry representing a task in progress."""
+        progress = {'attempted': 3,
+                    'updated': 2,
+                    'total': 5,
+                    'action_name': 'rescored',
+                    }
+        return self._create_entry(task_state=task_state, task_output=progress, student=student)
+
+
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
+class InstructorTaskModuleTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase):
+    """
+    Base test class for InstructorTask-related tests that require
+    the setup of a course and problem in order to access StudentModule state.
+    """
+    course = None
+    current_user = None
+
+    def initialize_course(self):
+        """Create a course in the store, with a chapter and section."""
+        self.module_store = modulestore()
+
+        # Create the course
+        self.course = CourseFactory.create(org=TEST_COURSE_ORG,
+                                           number=TEST_COURSE_NUMBER,
+                                           display_name=TEST_COURSE_NAME)
+
+        # Add a chapter to the course
+        chapter = ItemFactory.create(parent_location=self.course.location,
+                                     display_name=TEST_SECTION_NAME)
+
+        # add a sequence to the course to which the problems can be added
+        self.problem_section = ItemFactory.create(parent_location=chapter.location,
+                                                  template='i4x://edx/templates/sequential/Empty',
+                                                  display_name=TEST_SECTION_NAME)
+
+    @staticmethod
+    def get_user_email(username):
+        """Generate email address based on username"""
+        return '{0}@test.com'.format(username)
+
+    def login_username(self, username):
+        """Login the user, given the `username`."""
+        if self.current_user != username:
+            self.login(InstructorTaskModuleTestCase.get_user_email(username), "test")
+            self.current_user = username
+
+    def _create_user(self, username, is_staff=False):
+        """Creates a user and enrolls them in the test course."""
+        email = InstructorTaskModuleTestCase.get_user_email(username)
+        thisuser = UserFactory.create(username=username, email=email, is_staff=is_staff)
+        CourseEnrollmentFactory.create(user=thisuser, course_id=self.course.id)
+        return thisuser
+
+    def create_instructor(self, username):
+        """Creates an instructor for the test course."""
+        return self._create_user(username, is_staff=True)
+
+    def create_student(self, username):
+        """Creates a student for the test course."""
+        return self._create_user(username, is_staff=False)
+
+    @staticmethod
+    def problem_location(problem_url_name):
+        """
+        Create an internal location for a test problem.
+        """
+        if "i4x:" in problem_url_name:
+            return problem_url_name
+        else:
+            return "i4x://{org}/{number}/problem/{problem_url_name}".format(org=TEST_COURSE_ORG,
+                                                                            number=TEST_COURSE_NUMBER,
+                                                                            problem_url_name=problem_url_name)
+
+    def define_option_problem(self, problem_url_name):
+        """Create the problem definition so the answer is Option 1"""
+        factory = OptionResponseXMLFactory()
+        factory_args = {'question_text': 'The correct answer is {0}'.format(OPTION_1),
+                        'options': [OPTION_1, OPTION_2],
+                        'correct_option': OPTION_1,
+                        'num_responses': 2}
+        problem_xml = factory.build_xml(**factory_args)
+        ItemFactory.create(parent_location=self.problem_section.location,
+                           template="i4x://edx/templates/problem/Blank_Common_Problem",
+                           display_name=str(problem_url_name),
+                           data=problem_xml)
+
+    def redefine_option_problem(self, problem_url_name):
+        """Change the problem definition so the answer is Option 2"""
+        factory = OptionResponseXMLFactory()
+        factory_args = {'question_text': 'The correct answer is {0}'.format(OPTION_2),
+                        'options': [OPTION_1, OPTION_2],
+                        'correct_option': OPTION_2,
+                        'num_responses': 2}
+        problem_xml = factory.build_xml(**factory_args)
+        location = InstructorTaskTestCase.problem_location(problem_url_name)
+        self.module_store.update_item(location, problem_xml)
+
+    def get_student_module(self, username, descriptor):
+        """Get StudentModule object for test course, given the `username` and the problem's `descriptor`."""
+        return StudentModule.objects.get(course_id=self.course.id,
+                                         student=User.objects.get(username=username),
+                                         module_type=descriptor.location.category,
+                                         module_state_key=descriptor.location.url(),
+                                         )
+
+    @staticmethod
+    def get_task_status(task_id):
+        """Use api method to fetch task status, using mock request."""
+        mock_request = Mock()
+        mock_request.REQUEST = {'task_id': task_id}
+        response = instructor_task_status(mock_request)
+        status = json.loads(response.content)
+        return status
+
+    def create_task_request(self, requester_username):
+        """Generate request that can be used for submitting tasks"""
+        request = Mock()
+        request.user = User.objects.get(username=requester_username)
+        request.get_host = Mock(return_value="testhost")
+        request.META = {'REMOTE_ADDR': '0:0:0:0', 'SERVER_NAME': 'testhost'}
+        request.is_secure = Mock(return_value=False)
+        return request

lms/djangoapps/instructor_task/views.py

+
+import json
+import logging
+
+from django.http import HttpResponse
+
+from celery.states import FAILURE, REVOKED, READY_STATES
+
+from instructor_task.api_helper import (get_status_from_instructor_task,
+                                        get_updated_instructor_task)
+from instructor_task.models import PROGRESS
+
+
+log = logging.getLogger(__name__)
+
+# return status for completed tasks and tasks in progress
+STATES_WITH_STATUS = [state for state in READY_STATES] + [PROGRESS]
+
+
+def _get_instructor_task_status(task_id):
+    """
+    Returns status for a specific task.
+
+    Written as an internal method here (rather than as a helper)
+    so that get_task_completion_info() can be called without
+    causing a circular dependency (since it's also called directly).
+    """
+    instructor_task = get_updated_instructor_task(task_id)
+    status = get_status_from_instructor_task(instructor_task)
+    if instructor_task is not None and instructor_task.task_state in STATES_WITH_STATUS:
+        succeeded, message = get_task_completion_info(instructor_task)
+        status['message'] = message
+        status['succeeded'] = succeeded
+    return status
+
+
+def instructor_task_status(request):
+    """
+    View method that returns the status of a course-related task or tasks.
+
+    Status is returned as a JSON-serialized dict, wrapped as the content of a HTTPResponse.
+
+    The task_id can be specified to this view in one of three ways:
+
+    * by making a request containing 'task_id' as a parameter with a single value
+      Returns a dict containing status information for the specified task_id
+
+    * by making a request containing 'task_ids' as a parameter,
+      with a list of task_id values.
+      Returns a dict of dicts, with the task_id as key, and the corresponding
+      dict containing status information for the specified task_id
+
+      Task_id values that are unrecognized are skipped.
+
+    The dict with status information for a task contains the following keys:
+      'message': on complete tasks, status message reporting on final progress,
+          or providing exception message if failed.  For tasks in progress,
+          indicates the current progress.
+      'succeeded': on complete tasks or tasks in progress, boolean value indicates if the
+          task outcome was successful:  did it achieve what it set out to do.
+          This is in contrast with a successful task_state, which indicates that the
+          task merely completed.
+      'task_id': id assigned by LMS and used by celery.
+      'task_state': state of task as stored in celery's result store.
+      'in_progress': boolean indicating if task is still running.
+      'task_progress': dict containing progress information.  This includes:
+          'attempted': number of attempts made
+          'updated': number of attempts that "succeeded"
+          'total': number of possible subtasks to attempt
+          'action_name': user-visible verb to use in status messages.  Should be past-tense.
+          'duration_ms': how long the task has (or had) been running.
+          'exception': name of exception class raised in failed tasks.
+          'message': returned for failed and revoked tasks.
+          'traceback': optional, returned if task failed and produced a traceback.
+
+    """
+
+    output = {}
+    if 'task_id' in request.REQUEST:
+        task_id = request.REQUEST['task_id']
+        output = _get_instructor_task_status(task_id)
+    elif 'task_ids[]' in request.REQUEST:
+        tasks = request.REQUEST.getlist('task_ids[]')
+        for task_id in tasks:
+            task_output = _get_instructor_task_status(task_id)
+            if task_output is not None:
+                output[task_id] = task_output
+
+    return HttpResponse(json.dumps(output, indent=4))
+
+
+def get_task_completion_info(instructor_task):
+    """
+    Construct progress message from progress information in InstructorTask entry.
+
+    Returns (boolean, message string) duple, where the boolean indicates
+    whether the task completed without incident.  (It is possible for a
+    task to attempt many sub-tasks, such as rescoring many students' problem
+    responses, and while the task runs to completion, some of the students'
+    responses could not be rescored.)
+
+    Used for providing messages to instructor_task_status(), as well as
+    external calls for providing course task submission history information.
+    """
+    succeeded = False
+
+    if instructor_task.task_state not in STATES_WITH_STATUS:
+        return (succeeded, "No status information available")
+
+    # we're more surprised if there is no output for a completed task, but just warn:
+    if instructor_task.task_output is None:
+        log.warning("No task_output information found for instructor_task {0}".format(instructor_task.task_id))
+        return (succeeded, "No status information available")
+
+    try:
+        task_output = json.loads(instructor_task.task_output)
+    except ValueError:
+        fmt = "No parsable task_output information found for instructor_task {0}: {1}"
+        log.warning(fmt.format(instructor_task.task_id, instructor_task.task_output))
+        return (succeeded, "No parsable status information available")
+
+    if instructor_task.task_state in [FAILURE, REVOKED]:
+        return (succeeded, task_output.get('message', 'No message provided'))
+
+    if any([key not in task_output for key in ['action_name', 'attempted', 'updated', 'total']]):
+        fmt = "Invalid task_output information found for instructor_task {0}: {1}"
+        log.warning(fmt.format(instructor_task.task_id, instructor_task.task_output))
+        return (succeeded, "No progress status information available")
+
+    action_name = task_output['action_name']
+    num_attempted = task_output['attempted']
+    num_updated = task_output['updated']
+    num_total = task_output['total']
+
+    student = None
+    try:
+        task_input = json.loads(instructor_task.task_input)
+    except ValueError:
+        fmt = "No parsable task_input information found for instructor_task {0}: {1}"
+        log.warning(fmt.format(instructor_task.task_id, instructor_task.task_input))
+    else:
+        student = task_input.get('student')
+
+    if instructor_task.task_state == PROGRESS:
+        # special message for providing progress updates:
+        msg_format = "Progress: {action} {updated} of {attempted} so far"
+    elif student is not None:
+        if num_attempted == 0:
+            msg_format = "Unable to find submission to be {action} for student '{student}'"
+        elif num_updated == 0:
+            msg_format = "Problem failed to be {action} for student '{student}'"
+        else:
+            succeeded = True
+            msg_format = "Problem successfully {action} for student '{student}'"
+    elif num_attempted == 0:
+        msg_format = "Unable to find any students with submissions to be {action}"
+    elif num_updated == 0:
+        msg_format = "Problem failed to be {action} for any of {attempted} students"
+    elif num_updated == num_attempted:
+        succeeded = True
+        msg_format = "Problem successfully {action} for {attempted} students"
+    else:  # num_updated < num_attempted
+        msg_format = "Problem {action} for {updated} of {attempted} students"
+
+    if student is None and num_attempted != num_total:
+        msg_format += " (out of {total})"
+
+    # Update status in task result object itself:
+    message = msg_format.format(action=action_name, updated=num_updated,
+                                attempted=num_attempted, total=num_total,
+                                student=student)
+    return (succeeded, message)

lms/envs/common.py

@@ -102,7 +102,7 @@ MITX_FEATURES = {
     # Staff Debug tool.
     'ENABLE_STUDENT_HISTORY_VIEW': True,
 
-    # segment.io for LMS--need to explicitly turn it on on production.
+    # segment.io for LMS--need to explicitly turn it on for production.
     'SEGMENT_IO_LMS': False,
 
     # Enables the student notes API and UI.
@@ -122,7 +122,10 @@ MITX_FEATURES = {
     'USE_CUSTOM_THEME': False,
 
     # Do autoplay videos for students
-    'AUTOPLAY_VIDEOS': True
+    'AUTOPLAY_VIDEOS': True,
+
+    # Enable instructor dash to submit background tasks
+    'ENABLE_INSTRUCTOR_BACKGROUND_TASKS': True,
 }
 
 # Used for A/B testing
@@ -691,6 +694,7 @@ INSTALLED_APPS = (
     'util',
     'certificates',
     'instructor',
+    'instructor_task',
     'open_ended_grading',
     'psychometrics',
     'licenses',

lms/static/js/pending_tasks.js

+// Define an InstructorTaskProgress object for updating a table on the instructor
+// dashboard that shows the current background tasks that are currently running
+// for the instructor's course.  Any tasks that were running when the page is
+// first displayed are passed in as instructor_tasks, and populate the "Pending Instructor
+// Task" table. The InstructorTaskProgress is bound to this table, and periodically
+// polls the LMS to see if any of the tasks has completed.  Once a task is complete,
+// it is not included in any further polling.
+
+(function() {
+
+    var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+    this.InstructorTaskProgress = (function() {
+
+        function InstructorTaskProgress(element) {
+            this.update_progress = __bind(this.update_progress, this);
+            this.get_status = __bind(this.get_status, this);
+            this.element = element;
+            this.entries = $(element).find('.task-progress-entry')
+            if (window.queuePollerID) {
+                window.clearTimeout(window.queuePollerID);
+            }
+            // Hardcode the initial delay before the first refresh to one second:
+            window.queuePollerID = window.setTimeout(this.get_status, 1000);
+        }
+
+        InstructorTaskProgress.prototype.$ = function(selector) {
+            return $(selector, this.element);
+        };
+
+        InstructorTaskProgress.prototype.update_progress = function(response) {
+            var _this = this;
+            // Response should be a dict with an entry for each requested task_id,
+            // with a "task-state" and "in_progress" key and optionally a "message"
+            // and a "task_progress.duration" key.
+            var something_in_progress = false;
+            for (task_id in response) {
+                var task_dict = response[task_id];
+                // find the corresponding entry, and update it:
+                entry = $(_this.element).find('[data-task-id="' + task_id + '"]');
+                entry.find('.task-state').text(task_dict.task_state)
+                var duration_value = (task_dict.task_progress && task_dict.task_progress.duration_ms
+                                        && Math.round(task_dict.task_progress.duration_ms/1000)) || 'unknown';
+                entry.find('.task-duration').text(duration_value);
+                var progress_value = task_dict.message || '';
+                entry.find('.task-progress').text(progress_value);
+                // if the task is complete, then change the entry so it won't
+                // be queried again.  Otherwise set a flag.
+                if (task_dict.in_progress === true) {
+                    something_in_progress = true;
+                } else {
+                    entry.data('inProgress', "False")
+                }
+            }
+
+            // if some entries are still incomplete, then repoll:
+            // Hardcode the refresh interval to be every five seconds.
+            // TODO: allow the refresh interval to be set.  (And if it is disabled,
+            // then don't set the timeout at all.)
+            if (something_in_progress) {
+                window.queuePollerID = window.setTimeout(_this.get_status, 5000);
+            } else {
+                delete window.queuePollerID;
+            }
+        }
+
+        InstructorTaskProgress.prototype.get_status = function() {
+            var _this = this;
+            var task_ids = [];
+
+            // Construct the array of ids to get status for, by
+            // including the subset of entries that are still in progress.
+            this.entries.each(function(idx, element) {
+                var task_id = $(element).data('taskId');
+                var in_progress = $(element).data('inProgress');
+                if (in_progress="True") {
+                    task_ids.push(task_id);
+                }
+            });
+
+            // Make call to get status for these ids.
+            // Note that the keyname here ends up with "[]" being appended
+            // in the POST parameter that shows up on the Django server.
+            // TODO: add error handler.
+            var ajax_url = '/instructor_task_status/';
+            var data = {'task_ids': task_ids };
+            $.post(ajax_url, data).done(this.update_progress);
+        };
+
+        return InstructorTaskProgress;
+    })();
+
+}).call(this);
+
+// once the page is rendered, create the progress object
+var instructorTaskProgress;
+$(document).ready(function() {
+    instructorTaskProgress = new InstructorTaskProgress($('#task-progress-wrapper'));
+});
+

lms/templates/courseware/instructor_dashboard.html

@@ -9,7 +9,9 @@
   <script type="text/javascript" src="${static.url('js/vendor/jquery-jvectormap-1.1.1/jquery-jvectormap-1.1.1.min.js')}"></script>
   <script type="text/javascript" src="${static.url('js/vendor/jquery-jvectormap-1.1.1/jquery-jvectormap-world-mill-en.js')}"></script>
   <script type="text/javascript" src="${static.url('js/course_groups/cohorts.js')}"></script>
-
+%if instructor_tasks is not None:
+  <script type="text/javascript" src="${static.url('js/pending_tasks.js')}"></script>>
+%endif
 </%block>
 
 <%include file="/courseware/course_navigation.html" args="active_page='instructor'" />
@@ -194,19 +196,77 @@ function goto( mode)
     <hr width="40%" style="align:left">
 
   %endif
+  %if settings.MITX_FEATURES.get('ENABLE_INSTRUCTOR_BACKGROUND_TASKS'):
+    <H2>Course-specific grade adjustment</h2>
+
+    <p>
+      Specify a particular problem in the course here by its url:
+      <input type="text" name="problem_for_all_students" size="60">
+    </p>
+    <p>
+      You may use just the "urlname" if a problem, or "modulename/urlname" if not.
+      (For example, if the location is <tt>i4x://university/course/problem/problemname</tt>,
+      then just provide the <tt>problemname</tt>.
+      If the location is <tt>i4x://university/course/notaproblem/someothername</tt>, then
+      provide <tt>notaproblem/someothername</tt>.)
+    </p>
+    <p>
+      Then select an action:
+      <input type="submit" name="action" value="Reset ALL students' attempts">
+      <input type="submit" name="action" value="Rescore ALL students' problem submissions">
+    </p>
+    <p>
+    <p>These actions run in the background, and status for active tasks will appear in a table below.
+       To see status for all tasks submitted for this problem, click on this button:
+    </p>
+    <p>
+      <input type="submit" name="action" value="Show Background Task History">
+    </p>
+
+    <hr width="40%" style="align:left">
+  %endif
 
     <H2>Student-specific grade inspection and adjustment</h2>
-    <p>edX email address or their username: </p>
-    <p><input type="text" name="unique_student_identifier">  <input type="submit" name="action" value="Get link to student's progress page"></p>
-    <p>and, if you want to reset the number of attempts for a problem, the urlname of that problem 
-    (e.g. if the location is <tt>i4x://university/course/problem/problemname</tt>, then the urlname is <tt>problemname</tt>).</p>
-    <p> <input type="text" name="problem_to_reset" size="60"> <input type="submit" name="action" value="Reset student's attempts">  </p>
+    <p>
+      Specify the edX email address or username of a student here:
+      <input type="text" name="unique_student_identifier">
+    </p>
+    <p>
+      Click this, and a link to student's progress page will appear below:
+      <input type="submit" name="action" value="Get link to student's progress page">
+    </p>
+    <p>
+      Specify a particular problem in the course here by its url:
+      <input type="text" name="problem_for_student" size="60">
+    </p>
+    <p>
+      You may use just the "urlname" if a problem, or "modulename/urlname" if not.
+      (For example, if the location is <tt>i4x://university/course/problem/problemname</tt>,
+      then just provide the <tt>problemname</tt>.
+      If the location is <tt>i4x://university/course/notaproblem/someothername</tt>, then
+      provide <tt>notaproblem/someothername</tt>.)
+    </p>
+    <p>
+      Then select an action:
+      <input type="submit" name="action" value="Reset student's attempts">
+      %if settings.MITX_FEATURES.get('ENABLE_COURSE_BACKGROUND_TASKS'):
+      <input type="submit" name="action" value="Rescore student's problem submission">
+      %endif
+    </p>
 
     %if instructor_access:
-    <p> You may also delete the entire state of a student for a problem:
-    <input type="submit" name="action" value="Delete student state for problem">  </p>
-    <p>To delete the state of other XBlocks specify modulename/urlname, eg
-       <tt>combinedopenended/Humanities_SA_Peer</tt></p>
+    <p>
+      You may also delete the entire state of a student for the specified module:
+      <input type="submit" name="action" value="Delete student state for module">
+    </p>
+    %endif
+    %if settings.MITX_FEATURES.get('ENABLE_COURSE_BACKGROUND_TASKS'):
+    <p>Rescoring runs in the background, and status for active tasks will appear in a table below.
+       To see status for all tasks submitted for this course and student, click on this button:
+    </p>
+    <p>
+      <input type="submit" name="action" value="Show Background Task History for Student">
+    </p>
     %endif
 
  %endif
@@ -234,6 +294,7 @@ function goto( mode)
 
 ##-----------------------------------------------------------------------------
 %if modeflag.get('Admin'):
+
   %if instructor_access:
     <hr width="40%" style="align:left">
     <p>
@@ -373,6 +434,7 @@ function goto( mode)
 %if msg:
     <p></p><p>${msg}</p>
 %endif
+
 ##-----------------------------------------------------------------------------
 
 %if modeflag.get('Analytics'):
@@ -559,6 +621,69 @@ function goto( mode)
     </p>
 %endif
 
+## Output tasks in progress
+
+%if instructor_tasks is not None and len(instructor_tasks) > 0:
+    <hr width="100%">
+    <h2>Pending Instructor Tasks</h2>
+    <div id="task-progress-wrapper">
+      <table class="stat_table">
+        <tr>
+          <th>Task Type</th>
+          <th>Task inputs</th>
+          <th>Task Id</th>
+          <th>Requester</th>
+          <th>Submitted</th>
+          <th>Task State</th>
+          <th>Duration (sec)</th>
+          <th>Task Progress</th>
+        </tr>
+      %for tasknum, instructor_task in enumerate(instructor_tasks):
+        <tr id="task-progress-entry-${tasknum}" class="task-progress-entry"
+	    data-task-id="${instructor_task.task_id}"
+	    data-in-progress="true">
+          <td>${instructor_task.task_type}</td>
+          <td>${instructor_task.task_input}</td>
+          <td class="task-id">${instructor_task.task_id}</td>
+          <td>${instructor_task.requester}</td>
+          <td>${instructor_task.created}</td>
+          <td class="task-state">${instructor_task.task_state}</td>
+          <td class="task-duration">unknown</td>
+          <td class="task-progress">unknown</td>
+        </tr>
+      %endfor
+      </table>
+    </div>
+  <br/>
+
+%endif
+
+##-----------------------------------------------------------------------------
+
+%if course_stats and modeflag.get('Psychometrics') is None:
+
+    <br/>
+    <br/>
+    <p>
+      <hr width="100%">
+      <h2>${course_stats['title'] | h}</h2>
+      <table class="stat_table">
+        <tr>
+	%for hname in course_stats['header']:
+	  <th>${hname | h}</th>
+	%endfor
+	</tr>
+        %for row in course_stats['data']:
+          <tr>
+	    %for value in row:
+	      <td>${value | h}</td>
+	    %endfor
+	  </tr>
+        %endfor
+      </table>
+    </p>
+%endif
+
 ##-----------------------------------------------------------------------------
 %if modeflag.get('Psychometrics'):
 

lms/urls.py

@@ -394,6 +394,11 @@ if settings.MITX_FEATURES.get('ENABLE_SERVICE_STATUS'):
         url(r'^status/', include('service_status.urls')),
     )
 
+if settings.MITX_FEATURES.get('ENABLE_INSTRUCTOR_BACKGROUND_TASKS'):
+    urlpatterns += (
+        url(r'^instructor_task_status/$', 'instructor_task.views.instructor_task_status', name='instructor_task_status'),
+    )
+
 # FoldIt views
 urlpatterns += (
     # The path is hardcoded into their app...

requirements/edx/github.txt

@@ -3,11 +3,11 @@
 # Third-party:
 -e git://github.com/edx/django-staticfiles.git@6d2504e5c8#egg=django-staticfiles
 -e git://github.com/edx/django-pipeline.git#egg=django-pipeline
--e git://github.com/edx/django-wiki.git@e2e84558#egg=django-wiki
+-e git://github.com/edx/django-wiki.git@ac906abe#egg=django-wiki
 -e git://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev
 -e git://github.com/eventbrite/zendesk.git@d53fe0e81b623f084e91776bcf6369f8b7b63879#egg=zendesk
 
 # Our libraries:
 -e git+https://github.com/edx/XBlock.git@4d8735e883#egg=XBlock
 -e git+https://github.com/edx/codejail.git@0a1b468#egg=codejail
--e git+https://github.com/edx/diff-cover.git@v0.1.1#egg=diff_cover
+-e git+https://github.com/edx/diff-cover.git@v0.1.2#egg=diff_cover