From a3c1f7c9f4bb7dd088edc935a673cf8ce61159c6 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 19:00:24 -0500
Subject: [PATCH] Feedback submission moved

---
 .../xmodule/xmodule/js/src/combinedopenended/display.coffee | 6 +++---
 common/lib/xmodule/xmodule/open_ended_module.py             | 2 +-
 lms/templates/open_ended_evaluation.html                    | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 100905e0ae..aeaa765b4e 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -20,6 +20,8 @@ class @CombinedOpenEnded
     @next_problem_button.click @next_problem
     # valid states: 'initial', 'assessing', 'post_assessment', 'done'
     Collapsible.setCollapsibles(@el)
+    @submit_evaluation_button = $('.submit-evaluation-button')
+    @submit_evaluation_button.click @message_post
 
     # Where to put the rubric once we load it
     @el = $(element).find('section.open-ended-child')
@@ -30,8 +32,6 @@ 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"
@@ -207,7 +207,7 @@ class @CombinedOpenEnded
     Logger.log 'message_post', @answers
 
     fd = new FormData()
-    feedback = @$('section.evaluation textarea.feedback-on-feedback')[0].value
+    feedback = $('section.evaluation textarea.feedback-on-feedback')[0].value
     submission_id = $('div.external-grader-message div.submission_id')[0].innerHTML
     grader_id = $('div.external-grader-message div.grader_id')[0].innerHTML
     score = $(".evaluation-scoring input:radio[name='evaluation-score']:checked").val()
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 32245e710b..46b6f7e838 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -405,7 +405,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         return correct
 
     def format_feedback_with_evaluation(self,feedback):
-        context={'msg' : feedback, id : "1", rows : 30, cols : 30}
+        context={'msg' : feedback, 'id' : "1", 'rows' : 30, 'cols' : 30}
         html= render_to_string('open_ended_evaluation.html', context)
         return html
 
diff --git a/lms/templates/open_ended_evaluation.html b/lms/templates/open_ended_evaluation.html
index 018486a1d6..da3f38b6a9 100644
--- a/lms/templates/open_ended_evaluation.html
+++ b/lms/templates/open_ended_evaluation.html
@@ -17,6 +17,7 @@
             </div>
             <p>Additional comments:</p>
             <textarea rows="${rows}" cols="${cols}" name="feedback_${id}" class="feedback-on-feedback" id="feedback_${id}"></textarea>
+            <input type="button" value="Submit Feedback" class="submit-evaluation-button" name="reset"/>
         </section>
     </div>
 </div>
\ No newline at end of file