Merge pull request #53 from aboudreault/assessment-fixes

Fix feedback message display

mentoring/mentoring.py

@@ -104,7 +104,7 @@ class MentoringBlock(XBlockWithLightChildren):
         """Compute the student score taking into account the light child weight."""
         total_child_weight = sum(float(step.weight) for step in self.steps)
         if total_child_weight == 0:
-            return (0, 0, 0)
+            return (0, 0, 0, 0)
         score = sum(r[1]['score']*r[1]['weight'] \
                     for r in self.student_results) / total_child_weight
         correct = sum(1 for r in self.student_results if r[1]['completed'] == True)

mentoring/public/js/mentoring_standard_view.js

@@ -23,6 +23,10 @@ function MentoringStandardView(runtime, element, mentoring) {
 
         // Messages should only be displayed upon hitting 'submit', not on page reload
         messagesDOM.append(results.message);
+        var template = $('#light-child-template', messagesDOM).html();
+        if (template) {
+            messagesDOM.append(template);
+        }
         if (messagesDOM.html().trim()) {
             messagesDOM.prepend('<div class="title1">Feedback</div>');
             messagesDOM.show();