+ our content
tree = etree.Element('span')
@@ -195,6 +196,11 @@ class LoncapaResponse(object):
if item_xhtml is not None:
tree.append(item_xhtml)
tree.tail = self.xml.tail
+
+ # Add a for the message at the end of the response
+ if response_msg:
+ tree.append(self._render_response_msg_html(response_msg))
+
return tree
def evaluate_answers(self, student_answers, old_cmap):
@@ -225,16 +231,14 @@ class LoncapaResponse(object):
# hint specified by function?
hintfn = hintgroup.get('hintfn')
if hintfn:
- '''
- Hint is determined by a function defined in the
'''
- snippets = [{'snippet': """
+ snippets = [{'snippet': r"""
Suppose that \(I(t)\) rises from \(0\) to \(I_S\) at a time \(t_0 \neq 0\)
@@ -882,7 +909,8 @@ def sympy_check2():
allowed_inputfields = ['textline', 'textbox', 'crystallography',
'chemicalequationinput', 'vsepr_input',
'drag_and_drop_input', 'editamoleculeinput',
- 'designprotein2dinput', 'editageneinput']
+ 'designprotein2dinput', 'editageneinput',
+ 'annotationinput']
def setup_response(self):
xml = self.xml
@@ -965,6 +993,7 @@ def sympy_check2():
# not expecting 'unknown's
correct = ['unknown'] * len(idset)
messages = [''] * len(idset)
+ overall_message = ""
# put these in the context of the check function evaluator
# note that this doesn't help the "cfn" version - only the exec version
@@ -996,6 +1025,10 @@ def sympy_check2():
# the list of messages to be filled in by the check function
'messages': messages,
+ # a message that applies to the entire response
+ # instead of a particular input
+ 'overall_message': overall_message,
+
# any options to be passed to the cfn
'options': self.xml.get('options'),
'testdat': 'hello world',
@@ -1010,6 +1043,7 @@ def sympy_check2():
exec self.code in self.context['global_context'], self.context
correct = self.context['correct']
messages = self.context['messages']
+ overall_message = self.context['overall_message']
except Exception as err:
print "oops in customresponse (code) error %s" % err
print "context = ", self.context
@@ -1044,34 +1078,100 @@ def sympy_check2():
log.error(traceback.format_exc())
raise Exception("oops in customresponse (cfn) error %s" % err)
log.debug("[courseware.capa.responsetypes.customresponse.get_score] ret = %s" % ret)
+
if type(ret) == dict:
- correct = ['correct'] * len(idset) if ret['ok'] else ['incorrect'] * len(idset)
- msg = ret['msg']
- if 1:
- # try to clean up message html
- msg = '' + msg + ''
- msg = msg.replace('<', '<')
- #msg = msg.replace('<','<')
- msg = etree.tostring(fromstring_bs(msg, convertEntities=None),
- pretty_print=True)
- #msg = etree.tostring(fromstring_bs(msg),pretty_print=True)
- msg = msg.replace('
', '')
- #msg = re.sub('(.*)','\\1',msg,flags=re.M|re.DOTALL) # python 2.7
- msg = re.sub('(?ms)(.*)', '\\1', msg)
+ # One kind of dictionary the check function can return has the
+ # form {'ok': BOOLEAN, 'msg': STRING}
+ # If there are multiple inputs, they all get marked
+ # to the same correct/incorrect value
+ if 'ok' in ret:
+ correct = ['correct'] * len(idset) if ret['ok'] else ['incorrect'] * len(idset)
+ msg = ret.get('msg', None)
+ msg = self.clean_message_html(msg)
- messages[0] = msg
+ # If there is only one input, apply the message to that input
+ # Otherwise, apply the message to the whole problem
+ if len(idset) > 1:
+ overall_message = msg
+ else:
+ messages[0] = msg
+
+
+ # Another kind of dictionary the check function can return has
+ # the form:
+ # {'overall_message': STRING,
+ # 'input_list': [{ 'ok': BOOLEAN, 'msg': STRING }, ...] }
+ #
+ # This allows the function to return an 'overall message'
+ # that applies to the entire problem, as well as correct/incorrect
+ # status and messages for individual inputs
+ elif 'input_list' in ret:
+ overall_message = ret.get('overall_message', '')
+ input_list = ret['input_list']
+
+ correct = []
+ messages = []
+ for input_dict in input_list:
+ correct.append('correct' if input_dict['ok'] else 'incorrect')
+ msg = self.clean_message_html(input_dict['msg']) if 'msg' in input_dict else None
+ messages.append(msg)
+
+ # Otherwise, we do not recognize the dictionary
+ # Raise an exception
+ else:
+ log.error(traceback.format_exc())
+ raise Exception("CustomResponse: check function returned an invalid dict")
+
+ # The check function can return a boolean value,
+ # indicating whether all inputs should be marked
+ # correct or incorrect
else:
correct = ['correct'] * len(idset) if ret else ['incorrect'] * len(idset)
# build map giving "correct"ness of the answer(s)
correct_map = CorrectMap()
+
+ overall_message = self.clean_message_html(overall_message)
+ correct_map.set_overall_message(overall_message)
+
for k in range(len(idset)):
npoints = self.maxpoints[idset[k]] if correct[k] == 'correct' else 0
correct_map.set(idset[k], correct[k], msg=messages[k],
npoints=npoints)
return correct_map
+ def clean_message_html(self, msg):
+
+ # If *msg* is an empty string, then the code below
+ # will return "