Add in feedback dict and render the feedback table with it

common/lib/xmodule/xmodule/combined_open_ended_modulev1.py

@@ -584,6 +584,7 @@ class CombinedOpenEndedV1Module():
         """
         self.update_task_states()
         loop_up_to_task = self.current_task_number+1
+        all_responses =[]
         for i in xrange(0,loop_up_to_task):
             all_responses.append(self.get_last_response(i))
         context_list = []
@@ -598,7 +599,7 @@ class CombinedOpenEndedV1Module():
                     'feedback' : feedback,
                 }
                 context_list.append(context)
-        feedback_table = self.system.render_template('open_ended_result_table.html', context_list)
+        feedback_table = self.system.render_template('open_ended_result_table.html', {'context_list' : context_list})
         context = {
             'results': feedback_table,
             'task_name' : "Combined Results",

common/lib/xmodule/xmodule/open_ended_module.py

@@ -486,7 +486,11 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
                 feedback_items.append(feedback_template)
                 rubric_scores.append(rubric_score)
                 grader_types.append(score_result['grader_type'])
-                feedback_dicts.append(score_result['feedback'][i])
+                try:
+                    feedback_dict = json.loads(score_result['feedback'][i])
+                except:
+                    pass
+                feedback_dicts.append(feedback_dict)
                 grader_ids.append(score_result['grader_id'][i])
                 submission_ids.append(score_result['submission_id'])
             if join_feedback:
@@ -501,7 +505,11 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             rubric_scores = [rubric_score]
             grader_types = [score_result['grader_type']]
             feedback_items = [feedback]
-            feedback_dicts = [score_result['feedback']]
+            try:
+                feedback_dict = json.loads(score_result['feedback'])
+            except:
+                pass
+            feedback_dicts = [feedback_dict]
             grader_ids = [score_result['grader_id']]
             submission_ids = [score_result['submission_id']]