From 6e5a6f9753401674d708fd64cabd0776a85e4d2c Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@mitx.mit.edu>
Date: Mon, 12 Nov 2012 16:23:29 -0500
Subject: [PATCH] make textboxes read-only when that makes sense.

- also make reset hide the original output
---
 .../js/src/selfassessment/display.coffee      |  9 +++++--
 .../xmodule/xmodule/self_assessment_module.py | 27 ++++++++++++-------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee b/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee
index a16a6b3d58..a40c405e4a 100644
--- a/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee
@@ -21,7 +21,6 @@ class @SelfAssessment
     @find_assessment_elements()
     @find_hint_elements()
 
-
     @rebind()
 
   # locally scoped jquery.
@@ -33,16 +32,22 @@ class @SelfAssessment
     @submit_button.unbind('click')
     @submit_button.show()
     @reset_button.hide()
+    @hint_area.attr('disabled', false)
     if @state == 'initial'
+      @answer_area.attr("disabled", false)
       @submit_button.prop('value', 'Submit')
       @submit_button.click @save_answer
     else if @state == 'assessing'
+      @answer_area.attr("disabled", true)
       @submit_button.prop('value', 'Submit assessment')
       @submit_button.click @save_assessment
     else if @state == 'request_hint'
+      @answer_area.attr("disabled", true)
       @submit_button.prop('value', 'Submit hint')
       @submit_button.click @save_hint
     else if @state == 'done'
+      @answer_area.attr("disabled", true)
+      @hint_area.attr('disabled', true)
       @submit_button.hide()
       if @allow_reset
         @reset_button.show()
@@ -62,7 +67,6 @@ class @SelfAssessment
       data = {'student_answer' : @answer_area.val()}
       $.postWithPrefix "#{@ajax_url}/save_answer", data, (response) =>
         if response.success
-          @answer_area.attr("disabled",true)
           @rubric_wrapper.html(response.rubric_html)
           @state = 'assessing'
           @find_assessment_elements()
@@ -110,6 +114,7 @@ class @SelfAssessment
     if @state == 'done'
       $.postWithPrefix "#{@ajax_url}/reset", {}, (response) =>
         if response.success
+          @answer_area.html('')
           @rubric_wrapper.html('')
           @hint_wrapper.html('')
           @message_wrapper.html('')
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index 699cd0f9ac..9de1d999ee 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -125,7 +125,10 @@ class SelfAssessmentModule(XModule):
 
     def get_html(self):
         #set context variables and render template
-        previous_answer = self.student_answers[-1] if self.student_answers else ''
+        if self.state != self.INITIAL and self.student_answers:
+            previous_answer = self.student_answers[-1]
+        else:
+            previous_answer = ''
 
         allow_reset = self.state == self.DONE and self.attempts < self.max_attempts
         context = {
@@ -207,12 +210,12 @@ class SelfAssessmentModule(XModule):
         })
         return json.dumps(d, cls=ComplexEncoder)
 
-    def out_of_sync_error(self, get):
+    def out_of_sync_error(self, get, msg=''):
         """
         return dict out-of-sync error message, and also log.
         """
-        log.warning("Assessment module state out sync. state: %r, get: %r",
-                    self.state, get)
+        log.warning("Assessment module state out sync. state: %r, get: %r. %s",
+                    self.state, get, msg)
         return {'success': False,
                 'error': 'The problem state got out-of-sync'}
 
@@ -244,8 +247,12 @@ class SelfAssessmentModule(XModule):
         if self.state in (self.INITIAL, self.ASSESSING):
             return ''
 
-        # else we'll render it
-        hint = self.hints[-1] if len(self.hints) > 0 else ''
+        if self.state == self.REQUEST_HINT and len(self.hints) > 0:
+            # display the previous hint
+            hint = self.hints[-1]
+        else:
+            hint = ''
+            
         context = {'hint_prompt': self.hint_prompt,
                    'hint': hint}
 
@@ -301,9 +308,11 @@ class SelfAssessmentModule(XModule):
         with 'error' only present if 'success' is False, and 'hint_html' only if success is true
         """
 
-        if (self.state != self.ASSESSING or
-            len(self.student_answers) !=  len(self.scores) + 1):
-            return self.out_of_sync_error(get)
+        n_answers = len(self.student_answers)
+        n_scores = len(self.scores)
+        if (self.state != self.ASSESSING or n_answers !=  n_scores + 1):
+            msg = "%d answers, %d scores" % (n_answers, n_scores)
+            return self.out_of_sync_error(get, msg)
 
         try:
             self.scores.append(int(get['assessment']))