retry on remove

[redakcja.git] / redakcja / static / edumed / js / edumed.coffee

diff --git a/redakcja/static/edumed/js/edumed.coffee b/redakcja/static/edumed/js/edumed.coffee
index 59430a2..2cb9bdb 100644 (file)
--- a/redakcja/static/edumed/js/edumed.coffee
+++ b/redakcja/static/edumed/js/edumed.coffee
@@ -28,15 +28,18 @@ class Exercise extends Binding
       $(ev.target).next(".retry").show()
       $(ev.target).hide()
     $(".retry", @element).click (ev) =>
       $(ev.target).next(".retry").show()
       $(ev.target).hide()
     $(".retry", @element).click (ev) =>

-      $(".correct, .incorrect", @element).removeClass("correct incorrect")
-      $(ev.target).prev(".check").show()
-      $(ev.target).hide()
+      @retry()

     $('.solutions', @element).click =>
       @show_solutions()
       $(".comment", @element).show()
     $('.reset', @element).click =>
       @reset()
 
     $('.solutions', @element).click =>
       @show_solutions()
       $(".comment", @element).show()
     $('.reset', @element).click =>
       @reset()
 

+  retry: ->
+    $(".correct, .incorrect", @element).removeClass("correct incorrect")
+    $(".check", @element).show()
+    $(".retry", @element).hide()
+

   reset: ->
     $(@element).html($(@element).data('exercise-html'))
     exercise @element
   reset: ->
     $(@element).html($(@element).data('exercise-html'))
     exercise @element


@@ -119,8 +122,9 @@ class Exercise extends Binding
     if $added.is(".add-li")
       $added.wrap("<li/>")
 
     if $added.is(".add-li")
       $added.wrap("<li/>")
 

-    $added.append('<span class="remove">x</span>')
+    $added.append('<span class="remove">x</span><div class="clr"></div>')

     $('.remove', $added).click (ev) =>
     $('.remove', $added).click (ev) =>

+      @retry()

       if not ismultiple
         $($added.data('original')).removeClass('disabled').draggable('enable')
 
       if not ismultiple
         $($added.data('original')).removeClass('disabled').draggable('enable')
 


@@ -136,6 +140,7 @@ class Exercise extends Binding
       draggable_opts =
         revert: 'invalid'
         helper: 'clone'
       draggable_opts =
         revert: 'invalid'
         helper: 'clone'

+        start: @retry

 
       $(".draggable", question).draggable(draggable_opts)
       self = this
 
       $(".draggable", question).draggable(draggable_opts)
       self = this


@@ -188,6 +193,7 @@ class Exercise extends Binding
 class Wybor extends Exercise
   constructor: (element) ->
     super element
 class Wybor extends Exercise
   constructor: (element) ->
     super element

+    $(".question-piece input", element).change(@retry);

 
 
   check_question: (question) ->
 
 
   check_question: (question) ->


@@ -227,14 +233,14 @@ class Wybor extends Exercise
       else
         should_be_checked = solution.indexOf(piece_no) >= 0
       console.log("check " + $("input[type=checkbox]", qpiece).attr("id") + " -> " + should_be_checked)
       else
         should_be_checked = solution.indexOf(piece_no) >= 0
       console.log("check " + $("input[type=checkbox]", qpiece).attr("id") + " -> " + should_be_checked)

-      $("input[type=checkbox]", qpiece).prop 'checked', should_be_checked
+      $("input[type=checkbox],input[type=radio]", qpiece).prop 'checked', should_be_checked

 
 
 
 class Uporzadkuj extends Exercise
   constructor: (element) ->
     super element
 
 
 
 class Uporzadkuj extends Exercise
   constructor: (element) ->
     super element

-    $('ol, ul', @element).sortable({ items: "> li" })
+    $('ol, ul', @element).sortable({ items: "> li", start: @retry })

 
   check_question: (question) ->
     positions = @get_value_list(question, 'original', true)
 
   check_question: (question) ->
     positions = @get_value_list(question, 'original', true)


@@ -431,10 +437,12 @@ class PrawdaFalsz extends Exercise
     for qp in $(".question-piece", @element)
       $(".true", qp).click (ev) ->
         ev.preventDefault()
     for qp in $(".question-piece", @element)
       $(".true", qp).click (ev) ->
         ev.preventDefault()

+        @retry()

         $(this).closest(".question-piece").data("value", "true")
         $(this).addClass('chosen').siblings('a').removeClass('chosen')
       $(".false", qp).click (ev) ->
         ev.preventDefault()
         $(this).closest(".question-piece").data("value", "true")
         $(this).addClass('chosen').siblings('a').removeClass('chosen')
       $(".false", qp).click (ev) ->
         ev.preventDefault()

+        @retry()

         $(this).closest(".question-piece").data("value", "false")
         $(this).addClass('chosen').siblings('a').removeClass('chosen')
 
         $(this).closest(".question-piece").data("value", "false")
         $(this).addClass('chosen').siblings('a').removeClass('chosen')
 


@@ -454,9 +462,9 @@ class PrawdaFalsz extends Exercise
     return [good, all]
 
   show_solutions: ->
     return [good, all]
 
   show_solutions: ->

-    reset()
+    @reset()

     for qp in $(".question-piece", @element)
     for qp in $(".question-piece", @element)

-      if $(qp).data('solution') == 'true'
+      if $(qp).data('solution') == true

         $(".true", qp).click()
       else
         $(".false", qp).click()
         $(".true", qp).click()
       else
         $(".false", qp).click()


@@ -488,4 +496,4 @@ $(document).ready () ->
   new EduModule($("#book-text"))
 
   $(".exercise").each (i, el) ->
   new EduModule($("#book-text"))
 
   $(".exercise").each (i, el) ->

-    exercise(this)
\ No newline at end of file
+    exercise(this)