Merge remote-tracking branch 'origin/master' into feature/bridger/cleanup

Conflicts:
	lms/templates/static_templates/jobs.html

common/djangoapps/student/management/commands/add_to_group.py

+from optparse import make_option
+
+from django.core.management.base import BaseCommand, CommandError
+from django.contrib.auth.models import User, Group
+
+class Command(BaseCommand):
+    option_list = BaseCommand.option_list + (
+        make_option('--list',
+                    action='store_true',
+                    dest='list',
+                    default=False,
+                    help='List available groups'),
+        make_option('--create',
+                    action='store_true',
+                    dest='create',
+                    default=False,
+                    help='Create the group if it does not exist'),
+        make_option('--remove',
+                    action='store_true',
+                    dest='remove',
+                    default=False,
+                    help='Remove the user from the group instead of adding it'),
+        )
+
+    args = '<user|email> <group>'
+    help = 'Add a user to a group'
+
+    def print_groups(self):
+        print 'Groups available:'
+        for group in Group.objects.all().distinct():
+            print '  ', group.name
+
+    def handle(self, *args, **options):
+        if options['list']:
+            self.print_groups()
+            return
+
+        if len(args) != 2:
+            raise CommandError('Usage is add_to_group {0}'.format(self.args))
+
+        name_or_email, group_name = args
+
+        if '@' in name_or_email:
+            user = User.objects.get(email=name_or_email)
+        else:
+            user = User.objects.get(username=name_or_email)
+
+        try:
+            group = Group.objects.get(name=group_name)
+        except Group.DoesNotExist:
+            if options['create']:
+                group = Group(name=group_name)
+                group.save()
+            else:
+                raise CommandError('Group {} does not exist'.format(group_name))
+
+        if options['remove']:
+            user.groups.remove(group)
+        else:
+            user.groups.add(group)
+
+        print 'Success!'

common/djangoapps/student/management/commands/set_staff.py

+from optparse import make_option
+
 from django.contrib.auth.models import User
 from django.core.management.base import BaseCommand, CommandError
 import re
 
 
 class Command(BaseCommand):
-
-    args = '<user/email user/email ...>'
+    option_list = BaseCommand.option_list + (
+        make_option('--unset',
+                    action='store_true',
+                    dest='unset',
+                    default=False,
+                    help='Set is_staff to False instead of True'),
+        )
+
+    args = '<user|email> [user|email ...]>'
     help = """
-    This command will set isstaff to true for one or more users.
+    This command will set is_staff to true for one or more users.
     Lookup by username or email address, assumes usernames
     do not look like email addresses.
     """
 
-    def handle(self, *args, **kwargs):
-
+    def handle(self, *args, **options):
         if len(args) < 1:
-            print Command.help
-            return
+            raise CommandError('Usage is set_staff {0}'.format(self.args))
 
         for user in args:
-
             if re.match('[^@]+@[^@]+\.[^@]+', user):
                 try:
                     v = User.objects.get(email=user)
                 except:
-                    raise CommandError("User {0} does not exist".format(
-                        user))
+                    raise CommandError("User {0} does not exist".format(user))
             else:
                 try:
                     v = User.objects.get(username=user)
                 except:
-                    raise CommandError("User {0} does not exist".format(
-                        user))
+                    raise CommandError("User {0} does not exist".format(user))
+
+            if options['unset']:
+                v.is_staff = False
+            else:
+                v.is_staff = True
 
-            v.is_staff = True
             v.save()
+
+        print 'Success!'

common/djangoapps/student/views.py

@@ -39,6 +39,8 @@ from collections import namedtuple
 from courseware.courses import get_courses_by_university
 from courseware.access import has_access
 
+from statsd import statsd
+
 log = logging.getLogger("mitx.student")
 Article = namedtuple('Article', 'title url author image deck publication publish_date')
 
@@ -204,7 +206,13 @@ def change_enrollment(request):
             return {'success': False,
                     'error': 'enrollment in {} not allowed at this time'
                     .format(course.display_name)}
-
+                    
+        org, course_num, run=course_id.split("/")        
+        statsd.increment("common.student.enrollment",
+                        tags=["org:{0}".format(org),
+                              "course:{0}".format(course_num),
+                              "run:{0}".format(run)])
+        
         enrollment, created = CourseEnrollment.objects.get_or_create(user=user, course_id=course.id)
         return {'success': True}
 
@@ -212,6 +220,13 @@ def change_enrollment(request):
         try:
             enrollment = CourseEnrollment.objects.get(user=user, course_id=course_id)
             enrollment.delete()
+            
+            org, course_num, run=course_id.split("/")        
+            statsd.increment("common.student.unenrollment",
+                            tags=["org:{0}".format(org),
+                                  "course:{0}".format(course_num),
+                                  "run:{0}".format(run)])
+                              
             return {'success': True}
         except CourseEnrollment.DoesNotExist:
             return {'success': False, 'error': 'You are not enrolled for this course.'}
@@ -260,7 +275,9 @@ def login_user(request, error=""):
         log.info("Login success - {0} ({1})".format(username, email))
 
         try_change_enrollment(request)
-
+        
+        statsd.increment("common.student.successful_login")
+        
         return HttpResponse(json.dumps({'success': True}))
     
     log.warning("Login failed - Account not active for user {0}, resending activation".format(username))
@@ -466,7 +483,9 @@ def create_account(request, post_override=None):
             log.debug('bypassing activation email')
             login_user.is_active = True
             login_user.save()
-
+            
+    statsd.increment("common.student.account_created")
+    
     js = {'success': True}
     return HttpResponse(json.dumps(js), mimetype="application/json")
 

common/lib/capa/capa/capa_problem.py

@@ -32,10 +32,13 @@ from xml.sax.saxutils import unescape
 
 import chem
 import chem.chemcalc
+import chem.chemtools
+
 import calc
 from correctmap import CorrectMap
 import eia
 import inputtypes
+import customrender
 from util import contextualize_text, convert_files_to_filenames
 import xqueue_interface
 
@@ -45,22 +48,8 @@ import responsetypes
 # dict of tagname, Response Class -- this should come from auto-registering
 response_tag_dict = dict([(x.response_tag, x) for x in responsetypes.__all__])
 
-# Different ways students can input code
-entry_types = ['textline',
-               'schematic',
-               'textbox',
-               'imageinput',
-               'optioninput',
-               'choicegroup',
-               'radiogroup',
-               'checkboxgroup',
-               'filesubmission',
-               'javascriptinput',
-               'crystallography',
-               'chemicalequationinput',]
-
 # extra things displayed after "show answers" is pressed
-solution_types = ['solution']
+solution_tags = ['solution']
 
 # these get captured as student responses
 response_properties = ["codeparam", "responseparam", "answer"]
@@ -77,7 +66,8 @@ global_context = {'random': random,
                   'scipy': scipy,
                   'calc': calc,
                   'eia': eia,
-                  'chemcalc': chem.chemcalc}
+                  'chemcalc': chem.chemcalc,
+                  'chemtools': chem.chemtools}
 
 # These should be removed from HTML output, including all subelements
 html_problem_semantics = ["codeparam", "responseparam", "answer", "script", "hintgroup"]
@@ -305,7 +295,7 @@ class LoncapaProblem(object):
             answer_map.update(results)
 
         # include solutions from <solution>...</solution> stanzas
-        for entry in self.tree.xpath("//" + "|//".join(solution_types)):
+        for entry in self.tree.xpath("//" + "|//".join(solution_tags)):
             answer = etree.tostring(entry)
             if answer:
                 answer_map[entry.get('id')] = contextualize_text(answer, self.context)
@@ -483,7 +473,7 @@ class LoncapaProblem(object):
 
         problemid = problemtree.get('id')    # my ID
 
-        if problemtree.tag in inputtypes.registered_input_tags():
+        if problemtree.tag in inputtypes.registry.registered_tags():
             # If this is an inputtype subtree, let it render itself.
             status = "unsubmitted"
             msg = ''
@@ -509,7 +499,7 @@ class LoncapaProblem(object):
                                 'hint': hint,
                                 'hintmode': hintmode,}}
 
-            input_type_cls = inputtypes.get_class_for_tag(problemtree.tag)
+            input_type_cls = inputtypes.registry.get_class_for_tag(problemtree.tag)
             the_input = input_type_cls(self.system, problemtree, state)
             return the_input.get_html()
 
@@ -517,9 +507,15 @@ class LoncapaProblem(object):
         if problemtree in self.responders:
             return self.responders[problemtree].render_html(self._extract_html)
 
+        # let each custom renderer render itself:
+        if problemtree.tag in customrender.registry.registered_tags():
+            renderer_class = customrender.registry.get_class_for_tag(problemtree.tag)
+            renderer = renderer_class(self.system, problemtree)
+            return renderer.get_html()
+
+        # otherwise, render children recursively, and copy over attributes
         tree = etree.Element(problemtree.tag)
         for item in problemtree:
-            # render child recursively
             item_xhtml = self._extract_html(item)
             if item_xhtml is not None:
                     tree.append(item_xhtml)
@@ -556,11 +552,12 @@ class LoncapaProblem(object):
             response_id += 1
 
             answer_id = 1
+            input_tags = inputtypes.registry.registered_tags()
             inputfields = tree.xpath("|".join(['//' + response.tag + '[@id=$id]//' + x
-                                               for x in (entry_types + solution_types)]),
+                                               for x in (input_tags + solution_tags)]),
                                     id=response_id_str)
 
-            # assign one answer_id for each entry_type or solution_type
+            # assign one answer_id for each input type or solution type
             for entry in inputfields:
                 entry.attrib['response_id'] = str(response_id)
                 entry.attrib['answer_id'] = str(answer_id)

common/lib/capa/capa/chem/chemtools.py

+from collections import OrderedDict
+import json
+import unittest
+
+
+def vsepr_parse_user_answer(user_input):
+    d = OrderedDict(json.loads(user_input))
+    d['atoms'] = OrderedDict(sorted(d['atoms'].items()))
+    return d
+
+
+def vsepr_build_correct_answer(geometry, atoms):
+    correct_answer = OrderedDict()
+    correct_answer['geometry'] = geometry
+    correct_answer['atoms'] = OrderedDict(sorted(atoms.items()))
+    return correct_answer
+
+
+def vsepr_grade(user_input, correct_answer, ignore_p_order=False, ignore_a_order=False, ignore_e_order=False):
+    """ Flags ignore_(a,p,e)_order are for checking order in axial, perepherial or equatorial positions.
+        Allowed cases:
+            c0, a, e
+            c0, p
+        Not implemented and not tested cases when p with a or e (no need for now)
+    """
+    # print user_input, type(user_input)
+    # print correct_answer, type(correct_answer)
+    if user_input['geometry'] != correct_answer['geometry']:
+        return False
+
+    if user_input['atoms']['c0'] != correct_answer['atoms']['c0']:
+        return False
+
+    # not order-aware comparisons
+    for ignore in [(ignore_p_order, 'p'), (ignore_e_order, 'e'), (ignore_a_order, 'a')]:
+        if ignore[0]:
+            # collecting atoms:
+            a_user = [v for k, v in user_input['atoms'].items() if k.startswith(ignore[1])]
+            a_correct = [v for k, v in correct_answer['atoms'].items() if k.startswith(ignore[1])]
+            # print ignore[0], ignore[1], a_user, a_correct
+            if len(a_user) != len(a_correct):
+                return False
+            if sorted(a_user) != sorted(a_correct):
+                return False
+
+    # order-aware comparisons
+    for ignore in [(ignore_p_order, 'p'), (ignore_e_order, 'e'), (ignore_a_order, 'a')]:
+        if not ignore[0]:
+            # collecting atoms:
+            a_user = [v for k, v in user_input['atoms'].items() if k.startswith(ignore[1])]
+            a_correct = [v for k, v in correct_answer['atoms'].items() if k.startswith(ignore[1])]
+            # print '2nd', ignore[0], ignore[1], a_user, a_correct
+            if len(a_user) != len(a_correct):
+                return False
+            if len(a_correct) == 0:
+                continue
+            if a_user != a_correct:
+                return False
+
+    return True
+
+
+class Test_Grade(unittest.TestCase):
+    ''' test grade function '''
+
+    def test_incorrect_geometry(self):
+        correct_answer = vsepr_build_correct_answer(geometry="AX4E0", atoms={"c0": "N", "p0": "H", "p1": "(ep)", "p2": "H", "p3": "H"})
+        user_answer = vsepr_parse_user_answer(u'{"geometry":"AX3E0","atoms":{"c0":"B","p0":"F","p1":"B","p2":"F"}}')
+        self.assertFalse(vsepr_grade(user_answer, correct_answer))
+
+    def test_incorrect_positions(self):
+        correct_answer = vsepr_build_correct_answer(geometry="AX4E0", atoms={"c0": "N", "p0": "H", "p1": "(ep)", "p2": "H", "p3": "H"})
+        user_answer = vsepr_parse_user_answer(u'{"geometry":"AX4E0","atoms":{"c0":"B","p0":"F","p1":"B","p2":"F"}}')
+        self.assertFalse(vsepr_grade(user_answer, correct_answer))
+
+    def test_correct_answer(self):
+        correct_answer = vsepr_build_correct_answer(geometry="AX4E0", atoms={"c0": "N", "p0": "H", "p1": "(ep)", "p2": "H", "p3": "H"})
+        user_answer = vsepr_parse_user_answer(u'{"geometry":"AX4E0","atoms":{"c0":"N","p0":"H","p1":"(ep)","p2":"H", "p3":"H"}}')
+        self.assertTrue(vsepr_grade(user_answer, correct_answer))
+
+    def test_incorrect_position_order_p(self):
+        correct_answer = vsepr_build_correct_answer(geometry="AX4E0", atoms={"c0": "N", "p0": "H", "p1": "(ep)", "p2": "H", "p3": "H"})
+        user_answer = vsepr_parse_user_answer(u'{"geometry":"AX4E0","atoms":{"c0":"N","p0":"H","p1":"H","p2":"(ep)", "p3":"H"}}')
+        self.assertFalse(vsepr_grade(user_answer, correct_answer))
+
+    def test_correct_position_order_with_ignore_p_order(self):
+        correct_answer = vsepr_build_correct_answer(geometry="AX4E0", atoms={"c0": "N", "p0": "H", "p1": "(ep)", "p2": "H", "p3": "H"})
+        user_answer = vsepr_parse_user_answer(u'{"geometry":"AX4E0","atoms":{"c0":"N","p0":"H","p1":"H","p2":"(ep)", "p3":"H"}}')
+        self.assertTrue(vsepr_grade(user_answer, correct_answer, ignore_p_order=True))
+
+    def test_incorrect_position_order_ae(self):
+        correct_answer = vsepr_build_correct_answer(geometry="AX6E0", atoms={"c0": "Br", "a0": "test", "a1": "(ep)", "e0": "H", "e1": "H", "e2": "(ep)", "e3": "(ep)"})
+        user_answer = vsepr_parse_user_answer(u'{"geometry":"AX6E0","atoms":{"c0":"Br","a0":"test","a1":"(ep)","e0":"H","e1":"(ep)","e2":"(ep)","e3":"(ep)"}}')
+        self.assertFalse(vsepr_grade(user_answer, correct_answer))
+
+    def test_correct_position_order_with_ignore_a_order_not_e(self):
+        correct_answer = vsepr_build_correct_answer(geometry="AX6E0", atoms={"c0": "Br", "a0": "(ep)", "a1": "test", "e0": "H", "e1": "H", "e2": "(ep)", "e3": "(ep)"})
+        user_answer = vsepr_parse_user_answer(u'{"geometry":"AX6E0","atoms":{"c0":"Br","a0":"test","a1":"(ep)","e0":"H","e1":"H","e2":"(ep)","e3":"(ep)"}}')
+        self.assertTrue(vsepr_grade(user_answer, correct_answer, ignore_a_order=True))
+
+    def test_incorrect_position_order_with_ignore_a_order_not_e(self):
+        correct_answer = vsepr_build_correct_answer(geometry="AX6E0", atoms={"c0": "Br", "a0": "(ep)", "a1": "test", "e0": "H", "e1": "H", "e2": "H", "e3": "(ep)"})
+        user_answer = vsepr_parse_user_answer(u'{"geometry":"AX6E0","atoms":{"c0":"Br","a0":"test","a1":"(ep)","e0":"H","e1":"H","e2":"(ep)","e3":"H"}}')
+        self.assertFalse(vsepr_grade(user_answer, correct_answer, ignore_a_order=True))
+
+    def test_correct_position_order_with_ignore_e_order_not_a(self):
+        correct_answer = vsepr_build_correct_answer(geometry="AX6E0", atoms={"c0": "Br", "a0": "(ep)", "a1": "test", "e0": "H", "e1": "H", "e2": "H", "e3": "(ep)"})
+        user_answer = vsepr_parse_user_answer(u'{"geometry":"AX6E0","atoms":{"c0":"Br","a0":"(ep)","a1":"test","e0":"H","e1":"H","e2":"(ep)","e3":"H"}}')
+        self.assertTrue(vsepr_grade(user_answer, correct_answer, ignore_e_order=True))
+
+    def test_incorrect_position_order_with_ignore_e_order__not_a(self):
+        correct_answer = vsepr_build_correct_answer(geometry="AX6E0", atoms={"c0": "Br", "a0": "(ep)", "a1": "test", "e0": "H", "e1": "H", "e2": "H", "e3": "(ep)"})
+        user_answer = vsepr_parse_user_answer(u'{"geometry":"AX6E0","atoms":{"c0":"Br","a0":"test","a1":"(ep)","e0":"H","e1":"H","e2":"(ep)","e3":"H"}}')
+        self.assertFalse(vsepr_grade(user_answer, correct_answer, ignore_e_order=True))
+
+    def test_correct_position_order_with_ignore_ae_order(self):
+        correct_answer = vsepr_build_correct_answer(geometry="AX6E0", atoms={"c0": "Br", "a0": "(ep)", "a1": "test", "e0": "H", "e1": "H", "e2": "H", "e3": "(ep)"})
+        user_answer = vsepr_parse_user_answer(u'{"geometry":"AX6E0","atoms":{"c0":"Br","a0":"test","a1":"(ep)","e0":"H","e1":"H","e2":"(ep)","e3":"H"}}')
+        self.assertTrue(vsepr_grade(user_answer, correct_answer, ignore_e_order=True, ignore_a_order=True))
+
+    def test_incorrect_c0(self):
+        correct_answer = vsepr_build_correct_answer(geometry="AX6E0", atoms={"c0": "Br", "a0": "(ep)", "a1": "test", "e0": "H", "e1": "H", "e2": "H", "e3": "(ep)"})
+        user_answer = vsepr_parse_user_answer(u'{"geometry":"AX6E0","atoms":{"c0":"H","a0":"test","a1":"(ep)","e0":"H","e1":"H","e2":"(ep)","e3":"H"}}')
+        self.assertFalse(vsepr_grade(user_answer, correct_answer, ignore_e_order=True, ignore_a_order=True))
+
+
+def suite():
+
+    testcases = [Test_Grade]
+    suites = []
+    for testcase in testcases:
+        suites.append(unittest.TestLoader().loadTestsFromTestCase(testcase))
+    return unittest.TestSuite(suites)
+
+if __name__ == "__main__":
+    unittest.TextTestRunner(verbosity=2).run(suite())

common/lib/capa/capa/correctmap.py

@@ -3,7 +3,6 @@
 #
 # Used by responsetypes and capa_problem
 
-
 class CorrectMap(object):
     """
     Stores map between answer_id and response evaluation result for each question

common/lib/capa/capa/customrender.py

+"""
+This has custom renderers: classes that know how to render certain problem tags (e.g. <math> and
+<solution>) to html.
+
+These tags do not have state, so they just get passed the system (for access to render_template),
+and the xml element.
+"""
+
+from registry import TagRegistry
+
+import logging
+import re
+import shlex  # for splitting quoted strings
+import json
+
+from lxml import etree
+import xml.sax.saxutils as saxutils
+from registry import TagRegistry
+
+log = logging.getLogger('mitx.' + __name__)
+
+registry = TagRegistry()
+
+#-----------------------------------------------------------------------------
+class MathRenderer(object):
+    tags = ['math']
+
+    def __init__(self, system, xml):
+        '''
+        Render math using latex-like formatting.
+
+        Examples:
+
+        <math>$\displaystyle U(r)=4 U_0 $</math>
+        <math>$r_0$</math>
+
+        We convert these to [mathjax]...[/mathjax] and [mathjaxinline]...[/mathjaxinline]
+
+        TODO: use shorter tags (but this will require converting problem XML files!)
+        '''
+        self.system = system
+        self.xml = xml
+
+        mathstr = re.sub('\$(.*)\$', r'[mathjaxinline]\1[/mathjaxinline]', xml.text)
+        mtag = 'mathjax'
+        if not r'\displaystyle' in mathstr:
+            mtag += 'inline'
+        else:
+            mathstr = mathstr.replace(r'\displaystyle', '')
+        self.mathstr = mathstr.replace('mathjaxinline]', '%s]' % mtag)
+
+
+    def get_html(self):
+        """
+        Return the contents of this tag, rendered to html, as an etree element.
+        """
+        # TODO: why are there nested html tags here??  Why are there html tags at all, in fact?
+        html = '<html><html>%s</html><html>%s</html></html>' % (
+            self.mathstr, saxutils.escape(self.xml.tail))
+        try:
+            xhtml = etree.XML(html)
+        except Exception as err:
+            if self.system.DEBUG:
+                msg = '<html><div class="inline-error"><p>Error %s</p>' % (
+                    str(err).replace('<', '&lt;'))
+                msg += ('<p>Failed to construct math expression from <pre>%s</pre></p>' %
+                        html.replace('<', '&lt;'))
+                msg += "</div></html>"
+                log.error(msg)
+                return etree.XML(msg)
+            else:
+                raise
+        return xhtml
+
+
+registry.register(MathRenderer)
+
+#-----------------------------------------------------------------------------
+
+class SolutionRenderer(object):
+    '''
+    A solution is just a <span>...</span> which is given an ID, that is used for displaying an
+    extended answer (a problem "solution") after "show answers" is pressed.
+
+    Note that the solution content is NOT rendered and returned in the HTML. It is obtained by an
+    ajax call.
+    '''
+    tags = ['solution']
+
+    def __init__(self, system, xml):
+        self.system = system
+        self.id = xml.get('id')
+
+    def get_html(self):
+        context = {'id': self.id}
+        html = self.system.render_template("solutionspan.html", context)
+        return etree.XML(html)
+
+registry.register(SolutionRenderer)
+

common/lib/capa/capa/registry.py

+class TagRegistry(object):
+    """
+    A registry mapping tags to handlers.
+
+    (A dictionary with some extra error checking.)
+    """
+    def __init__(self):
+        self._mapping = {}
+
+    def register(self, cls):
+        """
+        Register cls as a supported tag type.  It is expected to define cls.tags as a list of tags
+        that it implements.
+
+        If an already-registered type has registered one of those tags, will raise ValueError.
+
+        If there are no tags in cls.tags, will also raise ValueError.
+        """
+
+        # Do all checks and complain before changing any state.
+        if len(cls.tags) == 0:
+            raise ValueError("No tags specified for class {0}".format(cls.__name__))
+
+        for t in cls.tags:
+            if t in self._mapping:
+                other_cls = self._mapping[t]
+                if cls == other_cls:
+                    # registering the same class multiple times seems silly, but ok
+                    continue
+                raise ValueError("Tag {0} already registered by class {1}."
+                                 " Can't register for class {2}"
+                                     .format(t, other_cls.__name__, cls.__name__))
+
+        # Ok, should be good to change state now.
+        for t in cls.tags:
+            self._mapping[t] = cls
+
+    def registered_tags(self):
+        """
+        Get a list of all the tags that have been registered.
+        """
+        return self._mapping.keys()
+
+    def get_class_for_tag(self, tag):
+        """
+        For any tag in registered_tags(), returns the corresponding class.  Otherwise, will raise
+        KeyError.
+        """
+        return self._mapping[tag]

common/lib/capa/capa/responsetypes.py

@@ -867,7 +867,8 @@ def sympy_check2():
   </customresponse>"""}]
 
     response_tag = 'customresponse'
-    allowed_inputfields = ['textline', 'textbox', 'crystallography', 'chemicalequationinput']
+
+    allowed_inputfields = ['textline', 'textbox', 'crystallography', 'chemicalequationinput', 'vsepr_input']
 
     def setup_response(self):
         xml = self.xml
@@ -1716,7 +1717,7 @@ class ImageResponse(LoncapaResponse):
     """
     Handle student response for image input: the input is a click on an image,
     which produces an [x,y] coordinate pair.  The click is correct if it falls
-    within a region specified.  This region is nominally a rectangle.
+    within a region specified.  This region is a union of rectangles.
 
     Lon-CAPA requires that each <imageresponse> has a <foilgroup> inside it.  That
     doesn't make sense to me (Ike).  Instead, let's have it such that <imageresponse>
@@ -1726,6 +1727,7 @@ class ImageResponse(LoncapaResponse):
     snippets = [{'snippet': '''<imageresponse>
       <imageinput src="image1.jpg" width="200" height="100" rectangle="(10,10)-(20,30)" />
       <imageinput src="image2.jpg" width="210" height="130" rectangle="(12,12)-(40,60)" />
+      <imageinput src="image2.jpg" width="210" height="130" rectangle="(10,10)-(20,30);(12,12)-(40,60)" />
     </imageresponse>'''}]
 
     response_tag = 'imageresponse'
@@ -1742,20 +1744,10 @@ class ImageResponse(LoncapaResponse):
         for aid in self.answer_ids:	 # loop through IDs of <imageinput> fields in our stanza
             given = student_answers[aid]	 # this should be a string of the form '[x,y]'
 
+            correct_map.set(aid, 'incorrect')
             if not given: # No answer to parse. Mark as incorrect and move on
-                correct_map.set(aid, 'incorrect')
                 continue
 
-            # parse expected answer
-            # TODO: Compile regexp on file load
-            m = re.match('[\(\[]([0-9]+),([0-9]+)[\)\]]-[\(\[]([0-9]+),([0-9]+)[\)\]]',
-                         expectedset[aid].strip().replace(' ', ''))
-            if not m:
-                msg = 'Error in problem specification! cannot parse rectangle in %s' % (
-                    etree.tostring(self.ielements[aid], pretty_print=True))
-                raise Exception('[capamodule.capa.responsetypes.imageinput] ' + msg)
-            (llx, lly, urx, ury) = [int(x) for x in m.groups()]
-
             # parse given answer
             m = re.match('\[([0-9]+),([0-9]+)]', given.strip().replace(' ', ''))
             if not m:
@@ -1763,11 +1755,24 @@ class ImageResponse(LoncapaResponse):
                                 'error grading %s (input=%s)' % (aid, given))
             (gx, gy) = [int(x) for x in m.groups()]
 
-            # answer is correct if (x,y) is within the specified rectangle
-            if (llx <= gx <= urx) and (lly <= gy <= ury):
-                correct_map.set(aid, 'correct')
-            else:
-                correct_map.set(aid, 'incorrect')
+            # Check whether given point lies in any of the solution rectangles
+            solution_rectangles = expectedset[aid].split(';')
+            for solution_rectangle in solution_rectangles:
+                # parse expected answer
+                # TODO: Compile regexp on file load
+                m = re.match('[\(\[]([0-9]+),([0-9]+)[\)\]]-[\(\[]([0-9]+),([0-9]+)[\)\]]',
+                             solution_rectangle.strip().replace(' ', ''))
+                if not m:
+                    msg = 'Error in problem specification! cannot parse rectangle in %s' % (
+                        etree.tostring(self.ielements[aid], pretty_print=True))
+                    raise Exception('[capamodule.capa.responsetypes.imageinput] ' + msg)
+                (llx, lly, urx, ury) = [int(x) for x in m.groups()]
+
+                # answer is correct if (x,y) is within the specified rectangle
+                if (llx <= gx <= urx) and (lly <= gy <= ury):
+                    correct_map.set(aid, 'correct')
+                    break
+
         return correct_map
 
     def get_answers(self):

common/lib/capa/capa/templates/choicegroup.html

 <form class="choicegroup capa_inputtype" id="inputtype_${id}">
   <div class="indicator_container">
-    % if state == 'unsubmitted':
+    % if status == 'unsubmitted':
     <span class="unanswered" style="display:inline-block;" id="status_${id}"></span>
-    % elif state == 'correct': 
+    % elif status == 'correct': 
     <span class="correct" id="status_${id}"></span>
-    % elif state == 'incorrect':
+    % elif status == 'incorrect':
     <span class="incorrect" id="status_${id}"></span>
-    % elif state == 'incomplete':
+    % elif status == 'incomplete':
     <span class="incorrect" id="status_${id}"></span>
     % endif
   </div>

common/lib/capa/capa/templates/textbox.html → common/lib/capa/capa/templates/codeinput.html

@@ -6,13 +6,13 @@
   >${value|h}</textarea>
 
   <div class="grader-status">
-    % if state == 'unsubmitted':
+    % if status == 'unsubmitted':
       <span class="unanswered" style="display:inline-block;" id="status_${id}">Unanswered</span>
-    % elif state == 'correct':
+    % elif status == 'correct':
       <span class="correct" id="status_${id}">Correct</span>
-    % elif state == 'incorrect':
+    % elif status == 'incorrect':
       <span class="incorrect" id="status_${id}">Incorrect</span>
-    % elif state == 'queued':
+    % elif status == 'queued':
       <span class="processing" id="status_${id}">Queued</span>
       <span style="display:none;" class="xqueue" id="${id}" >${queue_len}</span>
     % endif
@@ -21,7 +21,7 @@
       <div style="display:none;" name="${hidden}" inputid="input_${id}" />
     % endif
 
-    <p class="debug">${state}</p>
+    <p class="debug">${status}</p>
   </div>
 
   <span id="answer_${id}"></span>

common/lib/capa/capa/templates/crystallography.html

-<% doinline = "inline" if inline else "" %>
-
-<section id="textinput_${id}" class="textinput ${doinline}" >
+<section id="inputtype_${id}" class="capa_inputtype" >
      <div id="holder" style="width:${width};height:${height}"></div>
-    <div class="script_placeholder" data-src="/static/js/raphael.js"></div><div class="script_placeholder" data-src="/static/js/sylvester.js"></div><div class="script_placeholder" data-src="/static/js/underscore-min.js"></div>
+    <div class="script_placeholder" data-src="/static/js/raphael.js"></div>
+    <div class="script_placeholder" data-src="/static/js/sylvester.js"></div>
+    <div class="script_placeholder" data-src="/static/js/underscore-min.js"></div>
     <div class="script_placeholder" data-src="/static/js/crystallography.js"></div>
 
 
-    % if state == 'unsubmitted':
-    <div class="unanswered ${doinline}" id="status_${id}">
-    % elif state == 'correct':
-    <div class="correct ${doinline}" id="status_${id}">
-    % elif state == 'incorrect':
-    <div class="incorrect ${doinline}" id="status_${id}">
-    % elif state == 'incomplete':
-    <div class="incorrect ${doinline}" id="status_${id}">
+    % if status == 'unsubmitted':
+    <div class="unanswered" id="status_${id}">
+    % elif status == 'correct':
+    <div class="correct" id="status_${id}">
+    % elif status == 'incorrect':
+    <div class="incorrect" id="status_${id}">
+    % elif status == 'incomplete':
+    <div class="incorrect" id="status_${id}">
     % endif
     % if hidden:
       <div style="display:none;" name="${hidden}" inputid="input_${id}" />
@@ -29,13 +29,13 @@
    />
 
       <p class="status">
-        % if state == 'unsubmitted':
+        % if status == 'unsubmitted':
         unanswered
-        % elif state == 'correct':
+        % elif status == 'correct':
         correct
-        % elif state == 'incorrect':
+        % elif status == 'incorrect':
         incorrect
-        % elif state == 'incomplete':
+        % elif status == 'incomplete':
         incomplete
         % endif
       </p>
@@ -45,7 +45,7 @@
   % if msg:
       <span class="message">${msg|n}</span>
   % endif
-% if state in ['unsubmitted', 'correct', 'incorrect', 'incomplete'] or hidden:
+% if status in ['unsubmitted', 'correct', 'incorrect', 'incomplete']:
 </div>
 % endif
 </section>

common/lib/capa/capa/templates/filesubmission.html

 <section id="filesubmission_${id}" class="filesubmission">
   <div class="grader-status file">
-    % if state == 'unsubmitted':
+    % if status == 'unsubmitted':
     <span class="unanswered" style="display:inline-block;" id="status_${id}">Unanswered</span>
-    % elif state == 'correct':
+    % elif status == 'correct':
     <span class="correct" id="status_${id}">Correct</span>
-    % elif state == 'incorrect':
+    % elif status == 'incorrect':
     <span class="incorrect" id="status_${id}">Incorrect</span>
-    % elif state == 'queued':
+    % elif status == 'queued':
     <span class="processing" id="status_${id}">Queued</span>
     <span style="display:none;" class="xqueue" id="${id}" >${queue_len}</span>
     % endif
-    <p class="debug">${state}</p>
+    <p class="debug">${status}</p>
 
     <input type="file" name="input_${id}" id="input_${id}" value="${value}" multiple="multiple" data-required_files="${required_files}" data-allowed_files="${allowed_files}"/>
   </div>

common/lib/capa/capa/templates/imageinput.html

@@ -4,13 +4,13 @@
       <img src="/static/green-pointer.png" id="cross_${id}" style="position: absolute;top: ${gy}px;left: ${gx}px;" />
   </div>
 
-  % if state == 'unsubmitted':
+  % if status == 'unsubmitted':
   <span class="unanswered" style="display:inline-block;" id="status_${id}"></span>
-  % elif state == 'correct': 
+  % elif status == 'correct': 
   <span class="correct" id="status_${id}"></span>
-  % elif state == 'incorrect':
+  % elif status == 'incorrect':
   <span class="incorrect" id="status_${id}"></span>
-  % elif state == 'incomplete':
+  % elif status == 'incomplete':
   <span class="incorrect" id="status_${id}"></span>
   % endif
 </span>

common/lib/capa/capa/templates/jstextline.html

@@ -18,13 +18,13 @@
     <textarea style="display:none" id="input_${id}_fromjs" name="input_${id}_fromjs"></textarea>
   % endif
 
-  % if state == 'unsubmitted':
+  % if status == 'unsubmitted':
   <span class="unanswered" style="display:inline-block;" id="status_${id}"></span>
-  % elif state == 'correct':
+  % elif status == 'correct':
   <span class="correct" id="status_${id}"></span>
-  % elif state == 'incorrect':
+  % elif status == 'incorrect':
   <span class="incorrect" id="status_${id}"></span>
-  % elif state == 'incomplete':
+  % elif status == 'incomplete':
   <span class="incorrect" id="status_${id}"></span>
   % endif
   % if msg:

common/lib/capa/capa/templates/optioninput.html

@@ -12,13 +12,13 @@
 
   <span id="answer_${id}"></span>
 
-  % if state == 'unsubmitted':
+  % if status == 'unsubmitted':
   <span class="unanswered" style="display:inline-block;" id="status_${id}"></span>
-  % elif state == 'correct': 
+  % elif status == 'correct': 
   <span class="correct" id="status_${id}"></span>
-  % elif state == 'incorrect':
+  % elif status == 'incorrect':
   <span class="incorrect" id="status_${id}"></span>
-  % elif state == 'incomplete':
+  % elif status == 'incomplete':
   <span class="incorrect" id="status_${id}"></span>
   % endif
 </form>

common/lib/capa/capa/templates/schematicinput.html

@@ -12,13 +12,13 @@
   </script>
 
   <span id="answer_${id}"></span>
-  % if state == 'unsubmitted':
+  % if status == 'unsubmitted':
   <span class="ui-icon ui-icon-bullet" style="display:inline-block;" id="status_${id}"></span>
-  % elif state == 'correct': 
+  % elif status == 'correct': 
   <span class="ui-icon ui-icon-check" style="display:inline-block;" id="status_${id}"></span>
-  % elif state == 'incorrect':
+  % elif status == 'incorrect':
   <span class="ui-icon ui-icon-close" style="display:inline-block;" id="status_${id}"></span>
-  % elif state == 'incomplete':
+  % elif status == 'incomplete':
   <span class="ui-icon ui-icon-close" style="display:inline-block;" id="status_${id}"></span>
   % endif
 </span>

common/lib/capa/capa/templates/textinput_dynamath.html

-###
-### version of textline.html which does dynamic math
-###
-<section class="text-input-dynamath capa_inputtype" id="inputtype_${id}">
-
-    % if preprocessor is not None:
-    <div class="text-input-dynamath_data" data-preprocessor="${preprocessor['class_name']}"/>
-    <div class="script_placeholder" data-src="${preprocessor['script_src']}"/>
-    % endif
-
-    % if state == 'unsubmitted':
-    <div class="unanswered" id="status_${id}">
-    % elif state == 'correct':
-    <div class="correct" id="status_${id}">
-    % elif state == 'incorrect':
-    <div class="incorrect" id="status_${id}">
-    % elif state == 'incomplete':
-    <div class="incorrect" id="status_${id}">
-    % endif
-    % if hidden:
-      <div style="display:none;" name="${hidden}" inputid="input_${id}" />
-    % endif
-
-    <input type="text" name="input_${id}" id="input_${id}" value="${value}" class="math" size="${size if size else ''}" 
-    % if hidden:
-        style="display:none;"
-    % endif
-    />
-    <p class="status">
-    % if state == 'unsubmitted':
-    unanswered
-    % elif state == 'correct':
-    correct
-    % elif state == 'incorrect':
-    incorrect
-    % elif state == 'incomplete':
-    incomplete
-    % endif
-    </p>
-
-    <p id="answer_${id}" class="answer"></p>
-
-    <div id="display_${id}" class="equation">`{::}`</div>
-
-    </div>
-    <textarea style="display:none" id="input_${id}_dynamath" name="input_${id}_dynamath">  </textarea>
-    % if msg:
-    <span class="message">${msg|n}</span>
-    % endif
-</section>

common/lib/capa/capa/templates/textinput.html → common/lib/capa/capa/templates/textline.html

 <% doinline = "inline" if inline else "" %>
 
-<section id="textinput_${id}" class="textinput ${doinline}" >
-    % if state == 'unsubmitted':
+<section id="inputtype_${id}" class="${'text-input-dynamath' if do_math else ''} capa_inputtype ${doinline}" >
+
+    % if preprocessor is not None:
+    <div class="text-input-dynamath_data" data-preprocessor="${preprocessor['class_name']}"/>
+    <div class="script_placeholder" data-src="${preprocessor['script_src']}"/>
+    % endif
+
+    % if status == 'unsubmitted':
     <div class="unanswered ${doinline}" id="status_${id}">
-    % elif state == 'correct':
+    % elif status == 'correct':
     <div class="correct ${doinline}" id="status_${id}">
-    % elif state == 'incorrect':
+    % elif status == 'incorrect':
     <div class="incorrect ${doinline}" id="status_${id}">
-    % elif state == 'incomplete':
+    % elif status == 'incomplete':
     <div class="incorrect ${doinline}" id="status_${id}">
     % endif
     % if hidden:
@@ -15,32 +21,44 @@
     % endif
 
   <input type="text" name="input_${id}" id="input_${id}" value="${value}"
-   % if size:
-   size="${size}"
-   % endif
-   % if hidden:
-	style="display:none;"
-   % endif
+        % if do_math:
+            class="math"
+        % endif
+        % if size:
+            size="${size}"
+        % endif
+        % if hidden:
+            style="display:none;"
+        % endif
    />
 
       <p class="status">
-        % if state == 'unsubmitted':
+        % if status == 'unsubmitted':
         unanswered
-        % elif state == 'correct':
+        % elif status == 'correct':
         correct
-        % elif state == 'incorrect':
+        % elif status == 'incorrect':
         incorrect
-        % elif state == 'incomplete':
+        % elif status == 'incomplete':
         incomplete
         % endif
       </p>
 
-  <p id="answer_${id}" class="answer"></p>
+      <p id="answer_${id}" class="answer"></p>
+
+      % if do_math:
+      <div id="display_${id}" class="equation">`{::}`</div>
+      <textarea style="display:none" id="input_${id}_dynamath" name="input_${id}_dynamath">
+      </textarea>
+
+      % endif
+
+% if status in ['unsubmitted', 'correct', 'incorrect', 'incomplete']:
+</div>
+% endif
 
   % if msg:
       <span class="message">${msg|n}</span>
   % endif
-% if state in ['unsubmitted', 'correct', 'incorrect', 'incomplete'] or hidden:
-</div>
-% endif
+
 </section>

common/lib/capa/capa/templates/vsepr_input.html

+<section id="inputtype_${id}" class="capa_inputtype" >
+     <table><tr><td height='600'>
+    <div id="vsepr_div_${id}" style="position:relative;" data-molecules="${molecules}" data-geometries="${geometries}">
+    <canvas id="vsepr_canvas_${id}" width="${width}" height="${height}">
+    </canvas>
+    </div>
+    </td><td valign ='top'>
+    <select class="molecule_select" id="molecule_select_${id}" size="18">
+    </select>
+    </td></tr></table>
+
+    <div class="script_placeholder" data-src="/static/js/vsepr/vsepr.js"></div>
+
+    % if status == 'unsubmitted':
+    <div class="unanswered" id="status_${id}">
+    % elif status == 'correct':
+    <div class="correct" id="status_${id}">
+    % elif status == 'incorrect':
+    <div class="incorrect" id="status_${id}">
+    % elif status == 'incomplete':
+    <div class="incorrect" id="status_${id}">
+    % endif
+
+  <input type="text" name="input_${id}" id="input_${id}" value="${value}"
+      style="display:none;"
+   />
+
+      <p class="status">
+        % if status == 'unsubmitted':
+        unanswered
+        % elif status == 'correct':
+        correct
+        % elif status == 'incorrect':
+        incorrect
+        % elif status == 'incomplete':
+        incomplete
+        % endif
+      </p>
+
+  <p id="answer_${id}" class="answer"></p>
+
+  % if msg:
+      <span class="message">${msg|n}</span>
+  % endif
+% if status in ['unsubmitted', 'correct', 'incorrect', 'incomplete']:
+</div>
+% endif
+</section>

common/lib/capa/capa/tests/__init__.py

@@ -4,13 +4,23 @@ import os
 
 from mock import Mock
 
+import xml.sax.saxutils as saxutils
+
 TEST_DIR = os.path.dirname(os.path.realpath(__file__))
 
+def tst_render_template(template, context):
+    """
+    A test version of render to template.  Renders to the repr of the context, completely ignoring
+    the template name.  To make the output valid xml, quotes the content, and wraps it in a <div>
+    """
+    return '<div>{0}</div>'.format(saxutils.escape(repr(context)))
+
+
 test_system = Mock(
     ajax_url='courses/course_id/modx/a_location',
     track_function=Mock(),
     get_module=Mock(),
-    render_template=Mock(),
+    render_template=tst_render_template,
     replace_urls=Mock(),
     user=Mock(),
     filestore=fs.osfs.OSFS(os.path.join(TEST_DIR, "test_files")),

common/lib/capa/capa/tests/test_customrender.py

+from lxml import etree
+import unittest
+import xml.sax.saxutils as saxutils
+
+from . import test_system
+from capa import customrender
+
+# just a handy shortcut
+lookup_tag = customrender.registry.get_class_for_tag
+
+def extract_context(xml):
+    """
+    Given an xml element corresponding to the output of test_system.render_template, get back the
+    original context
+    """
+    return eval(xml.text)
+
+def quote_attr(s):
+    return saxutils.quoteattr(s)[1:-1]  # don't want the outer quotes
+
+class HelperTest(unittest.TestCase):
+    '''
+    Make sure that our helper function works!
+    '''
+    def check(self, d):
+        xml = etree.XML(test_system.render_template('blah', d))
+        self.assertEqual(d, extract_context(xml))
+
+    def test_extract_context(self):
+        self.check({})
+        self.check({1, 2})
+        self.check({'id', 'an id'})
+        self.check({'with"quote', 'also"quote'})
+
+
+class SolutionRenderTest(unittest.TestCase):
+    '''
+    Make sure solutions render properly.
+    '''
+
+    def test_rendering(self):
+        solution = 'To compute unicorns, count them.'
+        xml_str = """<solution id="solution_12">{s}</solution>""".format(s=solution)
+        element = etree.fromstring(xml_str)
+
+        renderer = lookup_tag('solution')(test_system, element)
+
+        self.assertEqual(renderer.id, 'solution_12')
+
+        # our test_system "renders" templates to a div with the repr of the context
+        xml = renderer.get_html()
+        context = extract_context(xml)
+        self.assertEqual(context, {'id' : 'solution_12'})
+
+
+class MathRenderTest(unittest.TestCase):
+    '''
+    Make sure math renders properly.
+    '''
+
+    def check_parse(self, latex_in, mathjax_out):
+        xml_str = """<math>{tex}</math>""".format(tex=latex_in)
+        element = etree.fromstring(xml_str)
+
+        renderer = lookup_tag('math')(test_system, element)
+
+        self.assertEqual(renderer.mathstr, mathjax_out)
+    
+    def test_parsing(self):
+        self.check_parse('$abc$', '[mathjaxinline]abc[/mathjaxinline]')
+        self.check_parse('$abc', '$abc')
+        self.check_parse(r'$\displaystyle 2+2$', '[mathjax] 2+2[/mathjax]')
+        
+
+    # NOTE: not testing get_html yet because I don't understand why it's doing what it's doing.
+        

common/lib/capa/capa/tests/test_files/imageresponse.xml

@@ -8,8 +8,14 @@ Hello</p></text>
 <text>Click on the image where the top skier will stop momentarily if the top skier starts from rest.</text>
 <imageinput src="/static/Physics801/Figures/Skier-conservation of energy.jpg" width="560" height="388" rectangle="(242,202)-(296,276)"/>
 <text>Click on the image where the lower skier will stop momentarily if the lower skier starts from rest.</text>
+<imageinput src="/static/Physics801/Figures/Skier-conservation of energy.jpg" width="560" height="388" rectangle="(490,11)-(556,98);(242,202)-(296,276)"/>
+<text>Click on either of the two positions as discussed previously.</text>
+<imageinput src="/static/Physics801/Figures/Skier-conservation of energy.jpg" width="560" height="388" rectangle="(490,11)-(556,98);(242,202)-(296,276)"/>
+<text>Click on either of the two positions as discussed previously.</text>
+<imageinput src="/static/Physics801/Figures/Skier-conservation of energy.jpg" width="560" height="388" rectangle="(490,11)-(556,98);(242,202)-(296,276)"/>
+<text>Click on either of the two positions as discussed previously.</text>
 <hintgroup showoncorrect="no">
 <text><p>Use conservation of energy.</p></text>
 </hintgroup>
 </imageresponse>
-</problem>
\ No newline at end of file
+</problem>

common/lib/capa/capa/tests/test_responsetypes.py

@@ -53,12 +53,22 @@ class ImageResponseTest(unittest.TestCase):
         imageresponse_file = os.path.dirname(__file__) + "/test_files/imageresponse.xml"
         test_lcp = lcp.LoncapaProblem(open(imageresponse_file).read(), '1', system=test_system)
         correct_answers = {'1_2_1': '(490,11)-(556,98)',
-                           '1_2_2': '(242,202)-(296,276)'}
+                           '1_2_2': '(242,202)-(296,276)',
+                           '1_2_3': '(490,11)-(556,98);(242,202)-(296,276)',
+                           '1_2_4': '(490,11)-(556,98);(242,202)-(296,276)',
+                           '1_2_5': '(490,11)-(556,98);(242,202)-(296,276)',
+                          }
         test_answers = {'1_2_1': '[500,20]',
                         '1_2_2': '[250,300]',
+                        '1_2_3': '[500,20]',
+                        '1_2_4': '[250,250]',
+                        '1_2_5': '[10,10]',
                         }
         self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_2_1'), 'correct')
         self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_2_2'), 'incorrect')
+        self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_2_3'), 'correct')
+        self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_2_4'), 'correct')
+        self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_2_5'), 'incorrect')
 
 
 class SymbolicResponseTest(unittest.TestCase):

common/lib/xmodule/setup.py

@@ -26,7 +26,7 @@ setup(
             "image = xmodule.backcompat_module:TranslateCustomTagDescriptor",
             "error = xmodule.error_module:ErrorDescriptor",
             "problem = xmodule.capa_module:CapaDescriptor",
-            "problemset = xmodule.vertical_module:VerticalDescriptor",
+            "problemset = xmodule.seq_module:SequenceDescriptor",
             "section = xmodule.backcompat_module:SemanticSectionDescriptor",
             "sequential = xmodule.seq_module:SequenceDescriptor",
             "slides = xmodule.backcompat_module:TranslateCustomTagDescriptor",

common/lib/xmodule/xmodule/capa_module.py

@@ -120,6 +120,8 @@ class CapaModule(XModule):
 
         self.show_answer = self.metadata.get('showanswer', 'closed')
 
+        self.force_save_button = self.metadata.get('force_save_button', 'false')
+
         if self.show_answer == "":
             self.show_answer = "closed"
 
@@ -320,9 +322,10 @@ class CapaModule(XModule):
         if not self.lcp.done:
             reset_button = False
 
-        # We don't need a "save" button if infinite number of attempts and
-        # non-randomized
-        if self.max_attempts is None and self.rerandomize != "always":
+        # We may not need a "save" button if infinite number of attempts and
+        # non-randomized. The problem author can force it. It's a bit weird for
+        # randomization to control this; should perhaps be cleaned up.
+        if (self.force_save_button == "false") and (self.max_attempts is None and self.rerandomize != "always"):
             save_button = False
 
         context = {'problem': content,

common/lib/xmodule/xmodule/course_module.py

@@ -22,13 +22,13 @@ class CourseDescriptor(SequenceDescriptor):
             self.book_url = book_url
             self.table_of_contents = self._get_toc_from_s3()
             self.start_page = int(self.table_of_contents[0].attrib['page'])
-            
+
             # The last page should be the last element in the table of contents,
             # but it may be nested. So recurse all the way down the last element
             last_el = self.table_of_contents[-1]
             while last_el.getchildren():
                 last_el = last_el[-1]
-            
+
             self.end_page = int(last_el.attrib['page'])
 
         @property
@@ -87,6 +87,7 @@ class CourseDescriptor(SequenceDescriptor):
 
         self.enrollment_start = self._try_parse_time("enrollment_start")
         self.enrollment_end = self._try_parse_time("enrollment_end")
+        self.end = self._try_parse_time("end")
 
         # NOTE: relies on the modulestore to call set_grading_policy() right after
         # init.  (Modulestore is in charge of figuring out where to load the policy from)
@@ -127,6 +128,16 @@ class CourseDescriptor(SequenceDescriptor):
 
         return definition
 
+    def has_ended(self):
+        """
+        Returns True if the current time is after the specified course end date.
+        Returns False if there is no end date specified.
+        """
+        if self.end_date is None:
+            return False
+
+        return time.gmtime() > self.end
+
     def has_started(self):
         return time.gmtime() > self.start
 
@@ -236,7 +247,8 @@ class CourseDescriptor(SequenceDescriptor):
 
     @property
     def start_date_text(self):
-        return time.strftime("%b %d, %Y", self.start)
+        displayed_start = self._try_parse_time('advertised_start') or self.start
+        return time.strftime("%b %d, %Y", displayed_start)
 
     # An extra property is used rather than the wiki_slug/number because
     # there are courses that change the number for different runs. This allows

common/lib/xmodule/xmodule/js/src/capa/display.coffee

@@ -216,7 +216,9 @@ class @Problem
             for choice in value
               @$("label[for='input_#{key}_#{choice}']").attr correct_answer: 'true'
           else
-            @$("#answer_#{key}, #solution_#{key}").html(value)
+            answer = @$("#answer_#{key}, #solution_#{key}")
+            answer.html(value)
+            Collapsible.setCollapsibles(answer)
 
         # TODO remove the above once everything is extracted into its own
         # inputtype functions.

common/lib/xmodule/xmodule/js/src/capa/imageinput.js

@@ -11,8 +11,8 @@
 
 function image_input_click(id,event){
     iidiv = document.getElementById("imageinput_"+id);
-    pos_x = event.offsetX?(event.offsetX):event.pageX-document.iidiv.offsetLeft;
-    pos_y = event.offsetY?(event.offsetY):event.pageY-document.iidiv.offsetTop;
+    pos_x = event.offsetX?(event.offsetX):event.pageX-iidiv.offsetLeft;
+    pos_y = event.offsetY?(event.offsetY):event.pageY-iidiv.offsetTop;
     result = "[" + pos_x + "," + pos_y + "]";
     cx = (pos_x-15) +"px";
     cy = (pos_y-15)  +"px" ;

create-dev-env.sh

@@ -190,7 +190,7 @@ case `uname -s` in
         }
         distro=`lsb_release -cs`
         case $distro in
-            maya|lisa|natty|oneiric|precise)
+            maya|lisa|natty|oneiric|precise|quantal)
                 output "Installing ubuntu requirements"
                 sudo apt-get -y update
                 sudo apt-get -y install $APT_PKGS

doc/xml-format.md

@@ -251,6 +251,7 @@ Supported fields at the course level:
 
 * "start" -- specify the start date for the course.  Format-by-example: "2012-09-05T12:00".
 * "enrollment_start", "enrollment_end" -- when can students enroll?  (if not specified, can enroll anytime).   Same format as "start".
+* "end" -- specify the end date for the course.  Format-by-example: "2012-11-05T12:00".
 * "tabs" -- have custom tabs in the courseware.  See below for details on config.
 * TODO: there are others
 
@@ -308,7 +309,7 @@ __Inherited:__
 * `start` -- when this content should be shown to students.  Note that anyone with staff access to the course will always see everything.
 *	`showanswer` - When to show answer. For 'attempted', will show answer after first attempt. Values: never, attempted, answered, closed. Default: closed. Optional.
 *	`graded` - Whether this section will count towards the students grade. "true" or "false". Defaults to "false".
-*	`rerandomise` - Randomize question on each attempt. Values: 'always' (students see a different version of the problem after each attempt to solve it)
+*	`rerandomize` - Randomize question on each attempt. Values: 'always' (students see a different version of the problem after each attempt to solve it)
                                                             'onreset' (randomize question when reset button is pressed by the student)
                                                             'never' (all students see the same version of the problem)
                                                             'per_student' (individual students see the same version of the problem each time the look at it, but that version is different from what other students see)

lms/djangoapps/courseware/module_render.py

@@ -28,6 +28,8 @@ from xmodule.x_module import ModuleSystem
 from xmodule.error_module import ErrorDescriptor, NonStaffErrorDescriptor
 from xmodule_modifiers import replace_course_urls, replace_static_urls, add_histogram, wrap_xmodule
 
+from statsd import statsd
+
 log = logging.getLogger("mitx.courseware")
 
 
@@ -382,6 +384,15 @@ def xqueue_callback(request, course_id, userid, id, dispatch):
     if instance_module.grade != oldgrade or instance_module.state != old_instance_state:
         instance_module.save()
 
+        #Bin score into range and increment stats
+        score_bucket=get_score_bucket(instance_module.grade, instance_module.max_grade)
+        org, course_num, run=course_id.split("/")        
+        statsd.increment("lms.courseware.question_answered",
+                        tags=["org:{0}".format(org),
+                              "course:{0}".format(course_num),
+                              "run:{0}".format(run), 
+                              "score_bucket:{0}".format(score_bucket), 
+                              "type:xqueue"])
     return HttpResponse("")
 
 
@@ -466,6 +477,17 @@ def modx_dispatch(request, dispatch, location, course_id):
             instance_module.max_grade != old_instance_max_grade):
             instance_module.save()
 
+            #Bin score into range and increment stats
+            score_bucket=get_score_bucket(instance_module.grade, instance_module.max_grade)
+            org, course_num, run=course_id.split("/")        
+            statsd.increment("lms.courseware.question_answered",
+                            tags=["org:{0}".format(org),
+                                  "course:{0}".format(course_num),
+                                  "run:{0}".format(run), 
+                                  "score_bucket:{0}".format(score_bucket), 
+                                  "type:ajax"])
+
+
     if shared_module is not None:
         shared_module.state = instance.get_shared_state()
         if shared_module.state != old_shared_state:
@@ -511,4 +533,17 @@ def preview_chemcalc(request):
     return HttpResponse(json.dumps(result))
 
 
+def get_score_bucket(grade,max_grade):
+    """
+    Function to split arbitrary score ranges into 3 buckets.
+    Used with statsd tracking.
+    """
+    score_bucket="incorrect"
+    if(grade>0 and grade<max_grade):
+        score_bucket="partial"
+    elif(grade==max_grade):
+        score_bucket="correct"
+
+    return score_bucket
+
 

lms/djangoapps/django_comment_client/management/commands/assign_role.py

+from optparse import make_option
+
 from django.core.management.base import BaseCommand, CommandError
-from django_comment_client.models import Permission, Role
+from django_comment_client.models import Role
 from django.contrib.auth.models import User
 
 
 class Command(BaseCommand):
-    args = 'user role course_id'
-    help = 'Assign a role to a user'
+    option_list = BaseCommand.option_list + (
+        make_option('--remove',
+                    action='store_true',
+                    dest='remove',
+                    default=False,
+                    help='Remove the role instead of adding it'),
+        )
+
+    args = '<user|email> <role> <course_id>'
+    help = 'Assign a discussion forum role to a user '
 
     def handle(self, *args, **options):
-        role = Role.objects.get(name=args[1], course_id=args[2])
+        if len(args) != 3:
+            raise CommandError('Usage is assign_role {0}'.format(self.args))
+
+        name_or_email, role, course_id = args
+
+        role = Role.objects.get(name=role, course_id=course_id)
+
+        if '@' in name_or_email:
+            user = User.objects.get(email=name_or_email)
+        else:
+            user = User.objects.get(username=name_or_email)
 
-        if '@' in args[0]:
-            user = User.objects.get(email=args[0])
+        if options['remove']:
+            user.roles.remove(role)
         else:
-            user = User.objects.get(username=args[0])
+            user.roles.add(role)
 
-        user.roles.add(role)
\ No newline at end of file
+        print 'Success!'

lms/djangoapps/licenses/models.py

@@ -42,7 +42,10 @@ def get_courses_licenses(user, courses):
 
 def get_license(user, software):
     try:
-        license = UserLicense.objects.get(user=user, software=software)
+        # TODO: temporary fix for when somehow a user got more that one license.
+        # The proper fix should use Meta.unique_together in the UserLicense model.
+        licenses = UserLicense.objects.filter(user=user, software=software)
+        license = licenses[0] if licenses else None
     except UserLicense.DoesNotExist:
         license = None
 

lms/envs/common.py

@@ -172,7 +172,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
 )
 
 STUDENT_FILEUPLOAD_MAX_SIZE = 4*1000*1000 # 4 MB
-MAX_FILEUPLOADS_PER_INPUT = 10
+MAX_FILEUPLOADS_PER_INPUT = 20
 
 # FIXME:
 # We should have separate S3 staged URLs in case we need to make changes to

lms/envs/test.py

@@ -27,12 +27,18 @@ SOUTH_TESTS_MIGRATE = False # To disable migrations and use syncdb instead
 
 # Nose Test Runner
 INSTALLED_APPS += ('django_nose',)
-NOSE_ARGS = ['--cover-erase', '--with-xunit', '--with-xcoverage', '--cover-html',
-             # '-v', '--pdb',     # When really stuck, uncomment to start debugger on error
-             '--cover-inclusive', '--cover-html-dir',
-             os.environ.get('NOSE_COVER_HTML_DIR', 'cover_html')]
-for app in os.listdir(PROJECT_ROOT / 'djangoapps'):
-    NOSE_ARGS += ['--cover-package', app]
+NOSE_ARGS = []
+
+# Turning off coverage speeds up tests dramatically... until we have better config,
+# leave it here for manual fiddling.
+_coverage = True
+if _coverage:
+    NOSE_ARGS = ['--cover-erase', '--with-xunit', '--with-xcoverage', '--cover-html',
+                 # '-v', '--pdb',     # When really stuck, uncomment to start debugger on error
+                 '--cover-inclusive', '--cover-html-dir',
+                 os.environ.get('NOSE_COVER_HTML_DIR', 'cover_html')]
+    for app in os.listdir(PROJECT_ROOT / 'djangoapps'):
+        NOSE_ARGS += ['--cover-package', app]
 TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
 
 # Local Directories
@@ -98,22 +104,6 @@ DATABASES = {
         'NAME': PROJECT_ROOT / "db" / "mitx.db",
     },
 
-    # The following are for testing purposes...
-    'edX/toy/2012_Fall': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': ENV_ROOT / "db" / "course1.db",
-    },
-
-    'edx/full/6.002_Spring_2012': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': ENV_ROOT / "db" / "course2.db",
-    },
-
-    'edX/toy/TT_2012_Fall': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': ENV_ROOT / "db" / "course3.db",
-    },
-
 }
 
 CACHES = {
@@ -172,3 +162,15 @@ FILE_UPLOAD_HANDLERS = (
     'django.core.files.uploadhandler.MemoryFileUploadHandler',
     'django.core.files.uploadhandler.TemporaryFileUploadHandler',
 )
+
+################### Make tests faster
+
+#http://slacy.com/blog/2012/04/make-your-tests-faster-in-django-1-4/
+PASSWORD_HASHERS = (
+    # 'django.contrib.auth.hashers.PBKDF2PasswordHasher',
+    # 'django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher',
+    # 'django.contrib.auth.hashers.BCryptPasswordHasher',
+    'django.contrib.auth.hashers.SHA1PasswordHasher',
+    'django.contrib.auth.hashers.MD5PasswordHasher',
+    # 'django.contrib.auth.hashers.CryptPasswordHasher',
+)

lms/static/sass/multicourse/_jobs.scss

@@ -136,6 +136,14 @@
           margin-bottom: 15px;
         }
 
+        h4 {
+          font-size: 1.0em;
+          font-family: $sans-serif;
+          font-weight: 700;
+          margin-top: 25px;
+          margin-bottom: 10px;
+        }
+
         ul {
           padding-left: 50px;
         }

lms/templates/static_templates/jobs.html

 <%namespace name='static' file='/static_content.html'/>
-
 <%inherit file="/main.html" />
 
 <%block name="title"><title>Jobs</title></%block>
@@ -50,12 +49,79 @@
           <p>If you are interested in this position, please send an email to <a href="mailto:jobs@edx.org">jobs@edx.org</a></p>
         </div>
       </article>
+      <article id="learning-designer" class="job">
+        <div class="inner-wrapper">
+          <h3>Learning Designer/Interaction Learning Designer </h3>
+          <p>The Learning Designer will work as part of the content and development team to plan, develop and deliver highly engaging and media rich online courses. The learning designer will be a flexible thinker, able to determine and apply sound pedagogical strategies to unique situations and a diverse set of academic disciplines. This is a 6-12 months contract opportunity.</p>
+          <h4>Specific Responsibilities include: </h4>
+          <ul>
+            <li>Work with producers, product developers and course staff on implementing instructional design approaches in the development of media and other course materials. </li>
+            <li>Articulate learning objectives and align them to content design strategy and assessments. </li>
+            <li>Write effective instructional text, and audio and video scripts. </li>
+            <li>Coordinate workflows with video and content development team</li>
+            <li>Identify best practices and share these with the course staff and faculty as needed. </li>
+            <li>Create course communication style guides. Train and coach teaching staff on best practices for communication and discussion management. </li>
+            <li>Develop use case guides as needed on the use of edX courseware and new technologies. </li>
+            <li>Serve as a liaison to instructional design teams located at X universities. </li>
+            <li>Design peer review processes to be used by learners in selected courses. </li>
+            <li>Ability to apply game-based learning theory and design into selected courses as appropriate.</li>
+            <li>Use learning analytics and metrics to inform course design and revision process. </li>
+            <li>Work closely with the Content Research Director on articulating best practices for MOOC teaching and learning and course design.</li>
+            <li>Assist in the development of pilot courses used for sponsored research initiatives. </li>
+          </ul>
+          <h4>Qualifications:</h4>
+          <p>Master's Degree in Educational Technology, Instructional Design or related field. Experience in higher education with additional experience in a start-up or research environment desirable. Excellent interpersonal and communication (written and verbal), project management, problem-solving and time management skills. The ability to be flexible with projects and to work on multiple courses essential. Ability to meet deadlines and manage expectations of constituents. Capacity to develop new and relevant technology skills. &nbsp;Experience using game theory design and learning analytics to inform instructional design decisions and strategy.</p>
+          <h4>Technical Skills:</h4>
+          <p>Video and screencasting experience. LMS Platform experience, xml, HTML, CSS, Adobe Design Suite, Camtasia or Captivate experience. Experience with web 2.0 collaboration tools.</p>
+          <p>If you are interested in this position, please send an email to <a href="mailto:jobs@edx.org">jobs@edx.org</a></p>
+        </div>
+      </article>
+      <article id="production-coordinator" class="job">
+        <div class="inner-wrapper">
+          <h3>Production Coordinator</h3>
+          <p>The Production Coordinator supports video editors and course staff in all video related tasks, such as ingesting footage, transcoding, tracking live dates, transcriptions, organizing project deliverables and archiving completed projects.</p>
+          <h4>Primary responsibilities:</h4>
+          <ul>
+            <li>organize, track, and manage video and associated assets across the video workflow</li>
+            <li>manage project data and spreadsheets</li>
+            <li>route incoming source footage, and apply metadata tags</li>
+            <li>run encoding/transcoding jobs </li>
+            <li>prepare and process associated video assets, such as slides and image files</li>
+            <li>manage the transcription process </li>
+            <ul type="circle">
+              <li>traffic files among project staff and video transcription services</li>
+              <li>coordinate transcript reviews with course staff</li>
+              <li>integrate transcripts in course pages</li>
+            </ul>
+            <li>other video-related tasks as assigned.</li>
+          </ul>
+          <br/>
+            <h4>Qualifications</h4>
+            <p>The ideal candidate for the Production Coordinator position will have</p>
+            <ul>
+              <li>relentless attention to detail</li>
+              <li>ability to communicate and collaborate effectively across the organization</li>
+              <li>knowledge and understanding of digital media production tools and processes</li>
+              <li>experience with compression techniques, image processing, and presentation software preferred</li>
+              <li>proficiency with standard office applications </li>
+              <ul type="circle">
+                <li>spreadsheets</li>
+                <li>word processing</li>
+                <li>presentation</li>
+              </ul>
+              <li>experience with web publishing, e.g., HTML, XML, CSS, a plus</li>
+            </ul>
+            <p>If you are interested in this position, please send an email to <a href="mailto:jobs@edx.org">jobs@edx.org</a></p>
+        </div>
+      </article>
     </section>
     <section class="jobs-sidebar">
       <h2>Positions</h2>
       <nav>
         <a href="#content-engineer">EdX Content Engineer</a>
         <a href="#platform-developer">Platform Developer</a>
+        <a href="#learning-designer">Learning Designer</a>
+        <a href="#production-coordinator">Production Coordinator</a>
       </nav>
       <h2>How to Apply</h2>
       <p>E-mail your resume, coverletter and any other materials to <a href="mailto:jobs@edx.org">jobs@edx.org</a></p>

prod-requirements.txt

@@ -50,3 +50,4 @@ pystache==0.3.1
 python-openid==2.2.5
 South==0.7.5
 Unidecode==0.04.9
+dogstatsd-python==0.2.1

rakefile

@@ -151,6 +151,13 @@ Dir["common/lib/*"].each do |lib|
         sh("nosetests #{lib} --cover-erase --with-xunit --with-xcoverage --cover-html --cover-inclusive --cover-package #{File.basename(lib)} --cover-html-dir #{File.join(report_dir, "cover")}")
     end
     TEST_TASKS << task_name
+
+    desc "Run tests for common lib #{lib} (without coverage)"
+    task "fasttest_#{lib}" do 
+        sh("nosetests #{lib}")
+    end
+
+
 end
 
 task :test do

requirements.txt

@@ -50,3 +50,5 @@ pygraphviz
 -r repo-requirements.txt
 pil
 nltk
+dogstatsd-python
+MySQL-python