Remove hints from self-assessment and misc display fixes

common/lib/xmodule/xmodule/css/combinedopenended/display.scss

@@ -233,6 +233,7 @@ div.result-container {
 
 div.result-container, section.open-ended-child {
     .rubric {
+            margin-bottom:25px;
             tr {
                 margin:10px 0px;
                 height: 100%;
@@ -609,13 +610,15 @@ section.open-ended-child {
     }
   }
 
-  div.open-ended-alert {
+  div.open-ended-alert,
+  .message-wrapper {
     padding: 8px 12px;
     border: 1px solid #EBE8BF;
     border-radius: 3px;
     background: #FFFCDD;
     font-size: 0.9em;
     margin-top: 10px;
+    margin-bottom:5px;
   }
 
   div.capa_reset {

common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee

@@ -109,7 +109,8 @@ class @CombinedOpenEnded
     @reset_button.hide()
     @next_problem_button.hide()
     @hint_area.attr('disabled', false)
-
+    if @child_state == 'done'
+      @rubric_wrapper.hide()
     if @child_type=="openended"
       @skip_button.hide()
     if @allow_reset=="True"
@@ -139,6 +140,7 @@ class @CombinedOpenEnded
       else
         @submit_button.click @message_post
     else if @child_state == 'done'
+      @rubric_wrapper.hide()
       @answer_area.attr("disabled", true)
       @hint_area.attr('disabled', true)
       @submit_button.hide()
@@ -163,6 +165,7 @@ class @CombinedOpenEnded
       $.postWithPrefix "#{@ajax_url}/save_answer", data, (response) =>
         if response.success
           @rubric_wrapper.html(response.rubric_html)
+          @rubric_wrapper.show()
           @child_state = 'assessing'
           @find_assessment_elements()
           @rebind()
@@ -183,6 +186,7 @@ class @CombinedOpenEnded
             @hint_wrapper.html(response.hint_html)
             @find_hint_elements()
           else if @child_state == 'done'
+            @rubric_wrapper.hide()
             @message_wrapper.html(response.message_html)
 
           @rebind()
@@ -279,4 +283,4 @@ class @CombinedOpenEnded
         delete window.queuePollerID
         location.reload()
       else
-        window.queuePollerID = window.setTimeout(@poll, 10000)
\ No newline at end of file
+        window.queuePollerID = window.setTimeout(@poll, 10000)

common/lib/xmodule/xmodule/self_assessment_module.py

@@ -75,7 +75,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
             'previous_answer': previous_answer,
             'ajax_url': system.ajax_url,
             'initial_rubric': self.get_rubric_html(system),
-            'initial_hint': self.get_hint_html(system),
+            'initial_hint': "",
             'initial_message': self.get_message_html(),
             'state': self.state,
             'allow_reset': self._allow_reset(),
@@ -237,13 +237,9 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
 
         d = {'success': True, }
 
-        if score == self.max_score():
-            self.change_state(self.DONE)
-            d['message_html'] = self.get_message_html()
-            d['allow_reset'] = self._allow_reset()
-        else:
-            self.change_state(self.POST_ASSESSMENT)
-            d['hint_html'] = self.get_hint_html(system)
+        self.change_state(self.DONE)
+        d['message_html'] = self.get_message_html()
+        d['allow_reset'] = self._allow_reset()
 
         d['state'] = self.state
         return d

lms/templates/combined_open_ended_status.html

-%if len(status_list) > 1:
+%if status_list[0]['state'] != 'initial':
 <h4>Status</h4>
 <div class="status-elements">
 <section id="combined-open-ended-status" class="combined-open-ended-status">

lms/templates/open_ended.html

@@ -14,7 +14,7 @@
     % elif state in ['done', 'post_assessment'] and correct == 'incorrect':
     <span class="incorrect" id="status_${id}"></span> <p>This submission has been assessed as incorrect. </p>
     % elif state == 'assessing':
-      <span class="grading" id="status_${id}">Submitted for grading</span>
+      <span class="grading" id="status_${id}">Submitted for grading.</span>
     % endif
 
     % if hidden: