Commit cb11ea0e by Xavier Antoviaque

Order tips and processing of submit answers, by XML declaration order

parent 925a31ef
......@@ -76,19 +76,16 @@ class MentoringBlock(XBlock):
log.info(u'Received submissions: {}'.format(submissions))
self.attempted = True
child_map = {}
submit_results = []
completed = True
for child_id in self.children: # pylint: disable=E1101
child = self.runtime.get_block(child_id)
if child.name:
child_map[child.name] = child
submit_results = {}
completed = True
for input_name, submission in submissions.items():
child = child_map[input_name]
submit_results[input_name] = child.submit(submission)
if child.name and child.name in submissions:
submission = submissions[child.name]
child_result = child.submit(submission)
submit_results.append([child.name, child_result])
child.save()
completed = completed and submit_results[input_name]['completed']
completed = completed and child_result['completed']
self.completed = bool(completed)
......
......@@ -17,7 +17,9 @@ function MentoringBlock(runtime, element) {
function handleSubmitResults(results) {
$('.quizz-tips', element).empty();
$.each(results.submitResults || {}, function(input, result) {
$.each(results.submitResults || [], function(index, submitResult) {
var input = submitResult[0],
result = submitResult[1];
callIfExists(runtime.childMap(element, input), 'handleSubmit', result);
});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment