From 9fa16b07d656cd7266dce6edfc0deed552b963d2 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Thu, 7 Feb 2013 18:02:48 -0500
Subject: [PATCH] Remove ability to manually get results

---
 common/lib/xmodule/xmodule/combined_open_ended_modulev1.py | 5 +++--
 lms/static/sass/course/_rubric.scss                        | 1 +
 lms/templates/combined_open_ended.html                     | 4 +++-
 lms/templates/combined_open_ended_status.html              | 3 ---
 lms/templates/open_ended_rubric.html                       | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py b/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py
index 9da1060b26..5236e4bc78 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py
@@ -513,7 +513,7 @@ class CombinedOpenEndedV1Module():
             pass
         return return_html
 
-    def get_results(self, get):
+    def get_rubric(self, get):
         """
         Gets the results of a given grader via ajax.
         Input: AJAX get dictionary
@@ -531,11 +531,12 @@ class CombinedOpenEndedV1Module():
         rubric_html = self.rubric_renderer.render_combined_rubric(stringify_children(self.static_data['rubric']), rubric_scores,
             grader_types, feedback_items)
 
+        response_dict = all_responses[-1]
         context = {'results': rubric_html, 'task_number': task_number + 1, 'task_name' : response_dict['human_task']}
         html = self.system.render_template('combined_open_ended_results.html', context)
         return {'html': html, 'success': True}
 
-    def get_results_old(self, get):
+    def get_results(self, get):
         """
         Gets the results of a given grader via ajax.
         Input: AJAX get dictionary
diff --git a/lms/static/sass/course/_rubric.scss b/lms/static/sass/course/_rubric.scss
index 00c0f31a1e..294ac86d78 100644
--- a/lms/static/sass/course/_rubric.scss
+++ b/lms/static/sass/course/_rubric.scss
@@ -1,5 +1,6 @@
 .rubric {
   margin: 0px 0px;
+  color: #3C3C3C;
   tr {
       margin:0px 0px;
       height: 100%;
diff --git a/lms/templates/combined_open_ended.html b/lms/templates/combined_open_ended.html
index 935cff3b7b..e219814744 100644
--- a/lms/templates/combined_open_ended.html
+++ b/lms/templates/combined_open_ended.html
@@ -18,7 +18,9 @@
         <input type="button" value="Next Step" class="next-step-button" name="reset"/>
     </div>
 
-    <a name="results" />
+    <div class="combined-rubric-container">
+    </div>
+
     <div class="result-container">
     </div>
 </section>
diff --git a/lms/templates/combined_open_ended_status.html b/lms/templates/combined_open_ended_status.html
index d00f763f56..5aeb6b2a37 100644
--- a/lms/templates/combined_open_ended_status.html
+++ b/lms/templates/combined_open_ended_status.html
@@ -9,9 +9,6 @@
         %endif
 
             ${status['human_task']} (${status['human_state']}) ${status['score']} / ${status['max_score']}
-            %if status['type']=="openended" and status['state'] in ['done', 'post_assessment']:
-               <a href="#results" class="show-results-button"> Show results</a>
-            %endif
         </div>
     %endfor
 </section>
diff --git a/lms/templates/open_ended_rubric.html b/lms/templates/open_ended_rubric.html
index 6dad40bbfc..9274d395bb 100644
--- a/lms/templates/open_ended_rubric.html
+++ b/lms/templates/open_ended_rubric.html
@@ -27,7 +27,7 @@
                             </div>
                         % elif combined_rubric == True:
                             <div class="rubric-label">
-                                %for grader_type in category['grader_types'][j]:
+                                %for grader_type in category['options'][j]['grader_types']:
                                     ${grader_type}
                                 %endfor
                                 ${option['points']} points : ${option['text']}