From fd38223244056975ad5eea80067061ea4661277b Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Thu, 8 Aug 2013 13:31:43 -0400
Subject: [PATCH] Fix grading submitted messages

---
 .../xmodule/js/src/combinedopenended/display.coffee    | 10 ++++------
 .../open_ended_grading_classes/open_ended_module.py    |  3 ++-
 .../combinedopenended/openended/open_ended.html        | 10 +++++-----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index ee2c3589df..8c29af2c0b 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -326,9 +326,8 @@ class @CombinedOpenEnded
       if @child_type == "openended"
         @submit_button.hide()
         @queueing()
-        if @task_number==1 and @task_count==1
-          @grader_status = @$(@grader_status_sel)
-          @grader_status.html("<p>Response submitted for scoring.</p>")
+        @grader_status = @$(@grader_status_sel)
+        @grader_status.html("<span class='grading'>Your response has been submitted.  Please check back later for your grade.</span> ")
     else if @child_state == 'post_assessment'
       if @child_type=="openended"
         @skip_button.show()
@@ -341,6 +340,8 @@ class @CombinedOpenEnded
       else
         @submit_button.click @message_post
     else if @child_state == 'done'
+      @show_combined_rubric_current()
+      @show_results_current()
       @rubric_wrapper.hide()
       @answer_area.attr("disabled", true)
       @replace_text_inputs()
@@ -351,9 +352,6 @@ class @CombinedOpenEnded
       if @task_number<@task_count
         @next_problem_button.show()
       else
-        if @task_number==1 and @task_count==1
-          @show_combined_rubric_current()
-        @show_results_current()
         @reset_button.show()
 
 
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
index ec3bebac7f..e1e4643afe 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
@@ -640,6 +640,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         """
         # Once we close the problem, we should not allow students
         # to save answers
+        error_message = ""
         closed, msg = self.check_if_closed()
         if closed:
             return msg
@@ -692,7 +693,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             score = self.latest_score()
             correct = 'correct' if self.is_submission_correct(score) else 'incorrect'
             if self.child_state == self.ASSESSING:
-                eta_string = ""
+                eta_string = "Your response has been submitted.  Please check back later for your grade."
         else:
             post_assessment = ""
             correct = ""
diff --git a/lms/templates/combinedopenended/openended/open_ended.html b/lms/templates/combinedopenended/openended/open_ended.html
index f2d59c4049..b76db8cecf 100644
--- a/lms/templates/combinedopenended/openended/open_ended.html
+++ b/lms/templates/combinedopenended/openended/open_ended.html
@@ -3,11 +3,11 @@
    <div class="prompt">
     ${prompt|n}
    </div>
-  <div class="visibility-control visibility-control-response">
-    <div class="inner">
+    <div class="visibility-control visibility-control-response">
+        <div class="inner">
+        </div>
+        <span class="section-header section-header-response">Response</span>
     </div>
-    <span class="section-header section-header-response">Response</span>
-  </div>
   <textarea rows="${rows}" cols="${cols}" name="answer" class="answer short-form-response" id="input_${id}">${previous_answer|h}</textarea>
 
   <div class="message-wrapper"></div>
@@ -15,7 +15,7 @@
     % if state == 'initial':
       <span class="unanswered" style="display:inline-block;" id="status_${id}">Unanswered</span>
     % elif state == 'assessing':
-      <span class="grading" id="status_${id}">Submitted for grading.
+      <span class="grading" id="status_${id}">
       % if eta_message is not None:
          ${eta_message}
       % endif