feedback-icon-only: Only send tips of the submitted MCQ choice

mentoring/mcq.py

@@ -53,34 +53,23 @@ class MCQBlock(QuestionnaireAbstractBlock):
         log.debug(u'Received MCQ submission: "%s"', submission)
 
         completed = True
-        tips = []
-
-        choices = [choice.value for choice in self.custom_choices]
-        # ensure rating tips are included
-        if self.type == 'rating':
-            choices +=  [str(n) for n in range(1,6)]
-
-        for choice in choices:
-            choice_tips_fragments = []
+        tips_fragments = []
         for tip in self.get_tips():
             completed = completed and self.is_tip_completed(tip, submission)
-                if choice in tip.display_with_defaults:
-                    choice_tips_fragments.append(tip.render())
+            if submission in tip.display_with_defaults:
+                tips_fragments.append(tip.render())
 
-            tips.append({
-                'choice': choice,
-                'tips': render_template('templates/html/tip_choice_group.html', {
+        formatted_tips = render_template('templates/html/tip_choice_group.html', {
             'self': self,
-                    'tips_fragments': choice_tips_fragments,
+            'tips_fragments': tips_fragments,
             'completed': completed,
         })
-            })
 
         self.student_choice = submission
         result = {
             'submission': submission,
             'completed': completed,
-            'tips': tips,
+            'tips': formatted_tips,
             'weight': self.weight,
             'score': 1 if completed else 0,
         }

mentoring/public/js/questionnaire.js

@@ -101,11 +101,8 @@ function MCQBlock(runtime, element, mentoring) {
                     choiceResultDOM.addClass('checkmark-incorrect icon-exclamation fa-exclamation');
                 }
 
-                var tips = _.find(result.tips, function(obj) {
-                    return obj.choice === choiceInputDOM.val();
-                });
-                if (tips) {
-                    mentoring.setContent(choiceTipsDOM, tips.tips);
+                if (result.tips) {
+                    mentoring.setContent(choiceTipsDOM, result.tips);
                 }
 
                 choiceTipsCloseDOM = $('.close', choiceTipsDOM);
@@ -121,14 +118,7 @@ function MCQBlock(runtime, element, mentoring) {
                                         '<div class="close icon-remove-sign fa-times-circle"></div>');
             }
             else if (result.tips) {
-                var tips = _.find(result.tips, function(obj) {
-                    return obj.choice === result.submission;
-                });
-                if (tips) {
-                    messageView.showMessage(tips.tips);
-                } else {
-                    messageView.clearPopupEvents();
-                }
+                messageView.showMessage(result.tips);
             }
         },