Commit 1fd2f0c6 by kimth

Fix double show answer bug

parent a29991e8
...@@ -192,8 +192,11 @@ class @Problem ...@@ -192,8 +192,11 @@ class @Problem
if file_not_selected if file_not_selected
errors.push 'You did not select any files to submit' errors.push 'You did not select any files to submit'
if errors.length > 0 error_html = '<ul>\n'
alert errors.join("\n") for error in errors
error_html += '<li>' + error + '</li>\n'
error_html += '</ul>'
@gentle_alert error_html
abort_submission = file_too_large or file_not_selected or unallowed_file_submitted or required_files_not_submitted abort_submission = file_too_large or file_not_selected or unallowed_file_submitted or required_files_not_submitted
...@@ -208,7 +211,7 @@ class @Problem ...@@ -208,7 +211,7 @@ class @Problem
@render(response.contents) @render(response.contents)
@updateProgress response @updateProgress response
else else
alert(response.success) @gentle_alert response.success
if not abort_submission if not abort_submission
$.ajaxWithPrefix("#{@url}/problem_check", settings) $.ajaxWithPrefix("#{@url}/problem_check", settings)
...@@ -220,8 +223,10 @@ class @Problem ...@@ -220,8 +223,10 @@ class @Problem
when 'incorrect', 'correct' when 'incorrect', 'correct'
@render(response.contents) @render(response.contents)
@updateProgress response @updateProgress response
if @el.hasClass 'showed'
@el.removeClass 'showed'
else else
alert(response.success) @gentle_alert response.success
reset: => reset: =>
Logger.log 'problem_reset', @answers Logger.log 'problem_reset', @answers
...@@ -253,15 +258,19 @@ class @Problem ...@@ -253,15 +258,19 @@ class @Problem
@el.removeClass 'showed' @el.removeClass 'showed'
@$('.show').val 'Show Answer' @$('.show').val 'Show Answer'
gentle_alert: (msg) =>
if @el.find('.capa_alert').length
@el.find('.capa_alert').remove()
alert_elem = "<div class='capa_alert'>" + msg + "</div>"
@el.find('.action').after(alert_elem)
@el.find('.capa_alert').animate(opacity: 0, 500).animate(opacity: 1, 500)
save: => save: =>
Logger.log 'problem_save', @answers Logger.log 'problem_save', @answers
$.postWithPrefix "#{@url}/problem_save", @answers, (response) => $.postWithPrefix "#{@url}/problem_save", @answers, (response) =>
if response.success if response.success
if @el.find('.save_message').length saveMessage = "Your answers have been saved but not graded. Hit 'Check' to grade them."
@el.find('.save_message').animate(opacity: 0, 500).animate(opacity: 1, 500) @gentle_alert saveMessage
else
saveMessage = "<div class='save_message'>Your answers have been saved but not graded. Hit 'Check' to grade them.</div>"
@el.find('.action').after(saveMessage)
@updateProgress response @updateProgress response
refreshMath: (event, element) => refreshMath: (event, element) =>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment