Combined JS

common/lib/xmodule/xmodule/combined_open_ended_module.py

@@ -43,8 +43,8 @@ class CombinedOpenEndedModule(XModule):
     TASK_TYPES=["self", "ml", "instructor", "peer"]
 
     #,  resource_string(__name__, 'js/src/openended/display.coffee')
-    js = {'coffee': [resource_string(__name__, 'js/src/selfassessment/display.coffee'), resource_string(__name__, 'js/src/combinedopenended/display.coffee')]}
-    js_module_name = "SelfAssessment"
+    js = {'coffee': [resource_string(__name__, 'js/src/combinedopenended/display.coffee')]}
+    js_module_name = "CombinedOpenEnded"
 
     def __init__(self, system, location, definition, descriptor,
                  instance_state=None, shared_state=None, **kwargs):

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

@@ -1,23 +1,128 @@
 class @CombinedOpenEnded
   constructor: (element) ->
-    @el = $(element).find('section.combined-open-ended')
+    @el = $(element).find('section.self-assessment')
+    @id = @el.data('id')
     @ajax_url = @el.data('ajax-url')
+    @state = @el.data('state')
+    @allow_reset = @el.data('allow_reset')
+    # valid states: 'initial', 'assessing', 'request_hint', 'done'
+
+    # Where to put the rubric once we load it
+    @errors_area = @$('.error')
+    @answer_area = @$('textarea.answer')
+
+    @rubric_wrapper = @$('.rubric-wrapper')
+    @hint_wrapper = @$('.hint-wrapper')
+    @message_wrapper = @$('.message-wrapper')
+    @submit_button = @$('.submit-button')
+
     @reset_button = @$('.reset-button')
     @reset_button.click @reset
 
+    @find_assessment_elements()
+    @find_hint_elements()
+
+    @rebind()
+
+  # locally scoped jquery.
+  $: (selector) ->
+    $(selector, @el)
+
+  rebind: () =>
+    # rebind to the appropriate function for the current state
+    @submit_button.unbind('click')
+    @submit_button.show()
+    @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()
+
+  find_assessment_elements: ->
+    @assessment = @$('select.assessment')
+
+  find_hint_elements: ->
+    @hint_area = @$('textarea.hint')
+
+  save_answer: (event) =>
+    event.preventDefault()
+    if @state == 'initial'
+      data = {'student_answer' : @answer_area.val()}
+      $.postWithPrefix "#{@ajax_url}/save_answer", data, (response) =>
+        if response.success
+          @rubric_wrapper.html(response.rubric_html)
+          @state = 'assessing'
+          @find_assessment_elements()
+          @rebind()
+        else
+          @errors_area.html(response.error)
+    else
+      @errors_area.html('Problem state got out of sync.  Try reloading the page.')
+
+  save_assessment: (event) =>
+    event.preventDefault()
+    if @state == 'assessing'
+      data = {'assessment' : @assessment.find(':selected').text()}
+      $.postWithPrefix "#{@ajax_url}/save_assessment", data, (response) =>
+        if response.success
+          @state = response.state
+
+          if @state == 'request_hint'
+            @hint_wrapper.html(response.hint_html)
+            @find_hint_elements()
+          else if @state == 'done'
+            @message_wrapper.html(response.message_html)
+            @allow_reset = response.allow_reset
+
+          @rebind()
+        else
+          @errors_area.html(response.error)
+    else
+      @errors_area.html('Problem state got out of sync.  Try reloading the page.')
+
+
+  save_hint:  (event) =>
+    event.preventDefault()
+    if @state == 'request_hint'
+      data = {'hint' : @hint_area.val()}
+
+      $.postWithPrefix "#{@ajax_url}/save_hint", data, (response) =>
+        if response.success
+          @message_wrapper.html(response.message_html)
+          @state = 'done'
+          @allow_reset = response.allow_reset
+          @rebind()
+        else
+          @errors_area.html(response.error)
+    else
+      @errors_area.html('Problem state got out of sync.  Try reloading the page.')
+
+
   reset: (event) =>
-  event.preventDefault()
-  if @state == 'done'
-    $.postWithPrefix "#{@ajax_url}/reset", {}, (response) =>
-      if response.success
-        @answer_area.val('')
-        @rubric_wrapper.html('')
-        @hint_wrapper.html('')
-        @message_wrapper.html('')
-        @state = 'initial'
-        @rebind()
-        @reset_button.hide()
-      else
-        @errors_area.html(response.error)
-  else
-    @errors_area.html('Problem state got out of sync.  Try reloading the page.')
+    event.preventDefault()
+    if @state == 'done'
+      $.postWithPrefix "#{@ajax_url}/reset", {}, (response) =>
+        if response.success
+          @answer_area.val('')
+          @rubric_wrapper.html('')
+          @hint_wrapper.html('')
+          @message_wrapper.html('')
+          @state = 'initial'
+          @rebind()
+          @reset_button.hide()
+        else
+          @errors_area.html(response.error)
+    else
+      @errors_area.html('Problem state got out of sync.  Try reloading the page.')

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

@@ -1,126 +1,3 @@
 class @SelfAssessment
   constructor: (element) ->
-    @el = $(element).find('section.self-assessment')
-    @id = @el.data('id')
-    @ajax_url = @el.data('ajax-url')
-    @state = @el.data('state')
-    @allow_reset = @el.data('allow_reset')
-    # valid states: 'initial', 'assessing', 'request_hint', 'done'
 
-    # Where to put the rubric once we load it
-    @errors_area = @$('.error')
-    @answer_area = @$('textarea.answer')
-
-    @rubric_wrapper = @$('.rubric-wrapper')
-    @hint_wrapper = @$('.hint-wrapper')
-    @message_wrapper = @$('.message-wrapper')
-    @submit_button = @$('.submit-button')
-
-    @find_assessment_elements()
-    @find_hint_elements()
-
-    @rebind()
-
-  # locally scoped jquery.
-  $: (selector) ->
-    $(selector, @el)
-
-  rebind: () =>
-    # rebind to the appropriate function for the current state
-    @submit_button.unbind('click')
-    @submit_button.show()
-    @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()
-
-
-  find_assessment_elements: ->
-    @assessment = @$('select.assessment')
-
-  find_hint_elements: ->
-    @hint_area = @$('textarea.hint')
-
-  save_answer: (event) =>
-    event.preventDefault()
-    if @state == 'initial'
-      data = {'student_answer' : @answer_area.val()}
-      $.postWithPrefix "#{@ajax_url}/save_answer", data, (response) =>
-        if response.success
-          @rubric_wrapper.html(response.rubric_html)
-          @state = 'assessing'
-          @find_assessment_elements()
-          @rebind()
-        else
-          @errors_area.html(response.error)
-    else
-      @errors_area.html('Problem state got out of sync.  Try reloading the page.')
-
-  save_assessment: (event) =>
-    event.preventDefault()
-    if @state == 'assessing'
-      data = {'assessment' : @assessment.find(':selected').text()}
-      $.postWithPrefix "#{@ajax_url}/save_assessment", data, (response) =>
-        if response.success
-          @state = response.state
-
-          if @state == 'request_hint'
-            @hint_wrapper.html(response.hint_html)
-            @find_hint_elements()
-          else if @state == 'done'
-            @message_wrapper.html(response.message_html)
-            @allow_reset = response.allow_reset
-
-          @rebind()
-        else
-          @errors_area.html(response.error)
-    else
-      @errors_area.html('Problem state got out of sync.  Try reloading the page.')
-    
-
-  save_hint:  (event) =>
-    event.preventDefault()
-    if @state == 'request_hint'
-      data = {'hint' : @hint_area.val()}
-      
-      $.postWithPrefix "#{@ajax_url}/save_hint", data, (response) =>
-        if response.success
-          @message_wrapper.html(response.message_html)
-          @state = 'done'
-          @allow_reset = response.allow_reset
-          @rebind()
-        else
-          @errors_area.html(response.error)
-    else
-      @errors_area.html('Problem state got out of sync.  Try reloading the page.')
-      
-
-  reset: (event) =>
-    event.preventDefault()
-    if @state == 'done'
-      $.postWithPrefix "#{@ajax_url}/reset", {}, (response) =>
-        if response.success
-          @answer_area.val('')
-          @rubric_wrapper.html('')
-          @hint_wrapper.html('')
-          @message_wrapper.html('')
-          @state = 'initial'
-          @rebind()
-          @reset_button.hide()
-        else
-          @errors_area.html(response.error)
-    else
-      @errors_area.html('Problem state got out of sync.  Try reloading the page.')