From b83df64f9a0258f1475f3adb6175e7e3ddff8e98 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 18:53:36 -0500
Subject: [PATCH] Inline response to feedback

---
 common/lib/xmodule/xmodule/combined_open_ended_module.py     | 3 +++
 .../xmodule/xmodule/js/src/combinedopenended/display.coffee  | 3 ++-
 common/lib/xmodule/xmodule/open_ended_module.py              | 5 +++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index b0fb365d73..4537985d33 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -213,8 +213,11 @@ class CombinedOpenEndedModule(XModule):
         last_response=task.latest_answer()
         last_score = task.latest_score()
         last_post_assessment = task.latest_post_assessment()
+        last_post_feedback=""
         if task_type=="openended":
             last_post_assessment = task.latest_post_assessment(short_feedback=True)
+            last_post_evaluation = task.format_feedback_with_evaluation(last_post_assessment)
+            last_post_assessment = last_post_evaluation
         max_score = task.max_score()
         state = task.state
         last_response_dict={'response' : last_response, 'score' : last_score,
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index f6ad7eb22a..100905e0ae 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -30,6 +30,8 @@ class @CombinedOpenEnded
     @hint_wrapper = @$('.hint-wrapper')
     @message_wrapper = @$('.message-wrapper')
     @submit_button = @$('.submit-button')
+    @submit_evaluation_button = @$('.submit-evaluation-button')
+    @submit_evaluation_button.click @message_post
     @child_state = @el.data('state')
     @child_type = @el.data('child-type')
     if @child_type=="openended"
@@ -134,7 +136,6 @@ class @CombinedOpenEnded
     else
       @errors_area.html('Problem state got out of sync.  Try reloading the page.')
 
-
   save_hint:  (event) =>
     event.preventDefault()
     if @child_state == 'post_assessment'
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index b1931f81be..32245e710b 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -404,6 +404,11 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             correct = (score_ratio >= 0.66)
         return correct
 
+    def format_feedback_with_evaluation(self,feedback):
+        context={'msg' : feedback, id : "1", rows : 30, cols : 30}
+        html= render_to_string('open_ended_evaluation.html', context)
+        return html
+
     def handle_ajax(self, dispatch, get, system):
         '''
         This is called by courseware.module_render, to handle an AJAX call.