From 2b764eebad0dd892f894ca3abb7f68b0be3e63c1 Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Fri, 1 Feb 2013 11:27:53 -0500
Subject: [PATCH] Make the rubric for self-assessment selectable and remove the
 separate grade selection.

---
 .../js/src/combinedopenended/display.coffee      |  6 +++---
 .../xmodule/xmodule/self_assessment_module.py    |  2 +-
 .../src/peer_grading/peer_grading_problem.coffee |  1 -
 lms/templates/self_assessment_rubric.html        | 16 ----------------
 4 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 576fb7290d..9add338137 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -208,9 +208,9 @@ class @CombinedOpenEnded
 
   save_assessment: (event) =>
     event.preventDefault()
-    if @child_state == 'assessing'
-      checked_assessment = @$('input[name="grade-selection"]:checked')
-      data = {'assessment' : checked_assessment.val()}
+    if @child_state == 'assessing' && Rubric.check_complete()
+      checked_assessment = Rubric.get_total_score()
+      data = {'assessment' : checked_assessment}
       $.postWithPrefix "#{@ajax_url}/save_assessment", data, (response) =>
         if response.success
           @child_state = response.state
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index fb1d306708..a288fa55b3 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -122,7 +122,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         if self.state == self.INITIAL:
             return ''
 
-        rubric_renderer = CombinedOpenEndedRubric(system, True)
+        rubric_renderer = CombinedOpenEndedRubric(system, False)
         rubric_html  = rubric_renderer.render_rubric(self.rubric)
 
         # we'll render it
diff --git a/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee b/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee
index f4b9bdbe78..f803c74c7b 100644
--- a/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee
+++ b/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee
@@ -426,7 +426,6 @@ class PeerGradingProblem
     @submit_button.show()
 
   setup_score_selection: (max_score) =>
-    
     # And now hook up an event handler again
     $("input[name='score-selection']").change @graded_callback
 
diff --git a/lms/templates/self_assessment_rubric.html b/lms/templates/self_assessment_rubric.html
index b4fc125232..2986c5041a 100644
--- a/lms/templates/self_assessment_rubric.html
+++ b/lms/templates/self_assessment_rubric.html
@@ -2,20 +2,4 @@
     <div class="rubric">
     ${rubric | n }
     </div>
-
-    % if not read_only:
-    <div class="scoring-container">
-    <h3>Scoring</h3>
-    <p>Please select a score below:</p>
-
-    <div class="grade-selection">
-    %for i in xrange(0,max_score+1):
-    <% id = "score-{0}".format(i) %>
-        <input type="radio" class="grade-selection" name="grade-selection" value="${i}" id="${id}">
-        <label for="${id}">${i}</label>
-    %endfor
-    </div>
-    </div>
-    % endif
-
 </div>