Display results separately from submission logic

common/lib/xmodule/xmodule/combined_open_ended_module.py

@@ -215,7 +215,7 @@ class CombinedOpenEndedModule(XModule):
         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_assessment = task.latest_post_assessment(short_feedback=False)
             last_post_evaluation = task.format_feedback_with_evaluation(last_post_assessment)
             last_post_assessment = last_post_evaluation
         max_score = task.max_score()
@@ -249,12 +249,12 @@ class CombinedOpenEndedModule(XModule):
         return return_html
 
     def get_results(self, get):
-        task_number=get['task_number']
+        task_number=int(get['task_number'])
         self.update_task_states()
         response_dict=self.get_last_response(task_number)
         context = {'results' : response_dict['post_assessment']}
         html = render_to_string('combined_open_ended_results.html', context)
-        return html
+        return {'html' : html, 'success' : True}
 
     def handle_ajax(self, dispatch, get):
         """

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

@@ -30,6 +30,7 @@ section.combined-open-ended {
   {
       float:left;
       width: 53%;
+      padding-bottom: 20px;
   }
 
   .result-container
@@ -49,7 +50,7 @@ section.combined-open-ended {
   }
 }
 
-section.open-ended-child, section.combined-open-ended-status {
+section.combined-open-ended-status {
 
     .statusitem {
       background-color: #FAFAFA;
@@ -66,9 +67,11 @@ section.open-ended-child, section.combined-open-ended-status {
      font-size: 1em;
      padding-top: 10px;
   }
+}
 
+div.result-container {
 
-   .evaluation {
+ .evaluation {
         p {
             margin-bottom: 1px;
         }
@@ -84,7 +87,7 @@ section.open-ended-child, section.combined-open-ended-status {
         header {
             text-align: right;
             a {
-                font-size: .7em;
+                font-size: .85em;
             }
         }
     }
@@ -97,7 +100,7 @@ section.open-ended-child, section.combined-open-ended-status {
                 &:first-child {
                     margin-left: 0px;
                 }
-                display:block;
+                display:inline;
                 margin-left: 0px;
 
                 label {

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

@@ -62,6 +62,7 @@ class @CombinedOpenEnded
     $.postWithPrefix "#{@ajax_url}/get_results", data, (response) =>
       if response.success
         @results_container.after(response.html).remove()
+        @results_container = $('.result-container')
         @Collapsible.setCollapsibles(@results_container)
       else
         @errors_area.html(response.error)

lms/templates/combined_open_ended_results.html

 <div class="result-container">
+    <h4>Results</h4><br/>
     ${results | n}
 </div>
\ No newline at end of file

lms/templates/open_ended.html

@@ -28,8 +28,4 @@
   <div class="open-ended-action"></div>
 
   <span id="answer_${id}"></span>
-
-  <div class="external-grader-message">
-     ${msg|n}
-  </div>
 </section>