diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee index b0eed2e896..30b2e6b965 100644 --- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee +++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee @@ -56,7 +56,10 @@ class @CombinedOpenEnded else if @child_state == 'post_assessment' @answer_area.attr("disabled", true) @submit_button.prop('value', 'Submit post-assessment') - @submit_button.click @save_hint + if @child_type=="selfassessment" + @submit_button.click @save_hint + else + @submit_button.click @message_post else if @child_state == 'done' @answer_area.attr("disabled", true) @hint_area.attr('disabled', true) @@ -76,7 +79,6 @@ class @CombinedOpenEnded find_hint_elements: -> @hint_area = @$('textarea.post_assessment') - @hint_box = @$('') save_answer: (event) => event.preventDefault() @@ -195,4 +197,10 @@ class @CombinedOpenEnded @gentle_alert response.message @$('section.evaluation').slideToggle() - $.ajaxWithPrefix("#{@url}/message_post", settings) \ No newline at end of file + $.ajaxWithPrefix("#{@ajax_url}/save_post_assessment", settings) + + gentle_alert: (msg) => + if @el.find('.open-ended-alert').length + @el.find('.open-ended-alert').remove() + alert_elem = "
" + msg + "
" + @el.find('.open-ended-alert').css(opacity: 0).animate(opacity: 1, 700) \ No newline at end of file diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py index 24b00a0126..a7d34b5636 100644 --- a/common/lib/xmodule/xmodule/open_ended_module.py +++ b/common/lib/xmodule/xmodule/open_ended_module.py @@ -204,7 +204,7 @@ class OpenEndedModule(): survey_responses=event_info['survey_responses'] for tag in ['feedback', 'submission_id', 'grader_id', 'score']: if tag not in survey_responses: - return False, "Could not find needed tag {0}".format(tag) + return {'success' : False, 'msg' : "Could not find needed tag {0}".format(tag)} try: submission_id=int(survey_responses['submission_id']) grader_id = int(survey_responses['grader_id']) @@ -214,7 +214,7 @@ class OpenEndedModule(): error_message=("Could not parse submission id, grader id, " "or feedback from message_post ajax call. Here is the message data: {0}".format(survey_responses)) log.exception(error_message) - return False, "There was an error saving your feedback. Please contact course staff." + return {'success' : False, 'msg' : "There was an error saving your feedback. Please contact course staff."} qinterface = system.xqueue['interface'] qtime = datetime.strftime(datetime.now(), xqueue_interface.dateformat) @@ -248,7 +248,7 @@ class OpenEndedModule(): if error: success=False - return success, "Successfully submitted your feedback." + return {'success' : success, 'msg' : "Successfully submitted your feedback."} def get_score(self, submission, system): diff --git a/lms/templates/open_ended.html b/lms/templates/open_ended.html index a40f0e189e..fae2b45041 100644 --- a/lms/templates/open_ended.html +++ b/lms/templates/open_ended.html @@ -57,4 +57,5 @@ % endif +