From c6cf72d623bf4f47eec3e1d1ff21849a91595d2f Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Thu, 1 Nov 2012 11:26:23 -0400
Subject: [PATCH] ajax working, refinements now

---
 .../xmodule/js/src/selfassessment/display.coffee       | 10 +---------
 common/lib/xmodule/xmodule/self_assessment_module.py   |  9 +++++----
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee b/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee
index 9c7f7faac4..f393fc79ec 100644
--- a/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee
@@ -3,24 +3,16 @@ $(document).on('click', 'section.sa-wrapper input#show', ( ->
   post_url=$('section.sa-wrapper input#show').attr('url')
   final_url="/courses/MITx/6.002x/2012_Fall/modx/#{post_url}/sa_show"
   answer=$('section.sa-wrapper input#answer').val()
-  alert(answer)
-  alert(final_url)
-
   $.post final_url, answer, (response) ->
-    alert("posted")
     if response.success
-      alert(response.rubric)
       $('section.sa-wrapper p#rubric').append(response.rubric)
 ));
 
 $(document).on('click', 'section.sa-wrapper input#save', ( ->
   answer=$('section.sa-wrapper input#answer').val()
-  alert(answer)
   assessment=0
-  assessment_correct=$('section.sa-wrapper input#assessment_correct').selected()
+  assessment_correct=$('section.sa-wrapper #assessment').find(':selected').text()
   alert(assessment_correct)
-  assessment_incorrect=$('section.sa-wrapper input#assessment_incorrect').selected()
-  alert(assessment_incorrect)
 
   root = location.protocol + "//" + location.host
   post_url=$('section.sa-wrapper input#show').attr('url')
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index d1d4c4205e..3e65b16670 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -21,9 +21,9 @@ from xmodule.contentstore.content import XASSET_SRCREF_PREFIX, StaticContent
 
 log = logging.getLogger("mitx.courseware")
 
-rubric_form=('<section class="sa-wrapper"><input type="radio" name="assessment" id="assessment" value="correct"/>Correct<br/>'
-            '<input type="radio" id="assessment" name="assessment" value="incorrect">'
-            'Incorrect<br/><input type="button" value="Save" id="save" name="save"/><p id="save_message"></p></section><br/><br/>')
+rubric_form=('<br/><br/>Please assess your performance given the above rubric: <br/><br/><section class="sa-wrapper"><select name="assessment" id="assessment">'
+             '<option value="incorrect">Incorrect</option><option value="correct">Correct</option></select><br/>'
+             '<input type="button" value="Save" id="save" name="save"/><p id="save_message"></p></section><br/><br/>')
 
 def only_one(lst, default="", process=lambda x: x):
     """
@@ -68,7 +68,7 @@ class SelfAssessmentModule(XModule):
         problem_form=('<section class="sa-wrapper"><input type="text" name="answer" '
                       'id="answer"/><br/>'
                       '<input type="button" value="Check" id ="show" name="show" url="{0}"/>'
-                      '<p id="rubric"></p></section>').format(self.location)
+                      '<p id="rubric"></p></section><br/><br/>').format(self.location)
         self.problem=''.join([self.problem,problem_form])
         self.rubric=''.join([self.rubric,rubric_form])
         self.html = self.problem
@@ -151,6 +151,7 @@ class SelfAssessmentModule(XModule):
         event_info['problem_id'] = self.location.url()
 
         answers = self.make_dict_of_responses(get)
+        log.debug(answers)
         event_info['answers'] = answers
 
         self.system.track_function('save_problem_succeed', event_info)