fix solving wybor with radio buttons

[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 e65faaa..21cbc86 100644 (file)
--- a/redakcja/static/edumed/js/edumed.coffee
+++ b/redakcja/static/edumed/js/edumed.coffee
@@ -17,22 +17,29 @@ class EduModule extends Binding
     #     $(".teacher", @element).removeClass "show"
 
 
-class Excercise extends Binding
+class Exercise extends Binding
   constructor: (element) ->
-    super 'excercise', element
-    # just save the html to reset the excercise
-    $(@element).data("excercise-html", $(@element).html())
+    super 'exercise', element
+    # just save the html to reset the exercise
+    $(@element).data("exercise-html", $(@element).html())
 
-    $(".check", @element).click =>
+    $(".check", @element).click (ev) =>
       @check()
+      $(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()
     $('.solutions', @element).click =>
       @show_solutions()
+      $(".comment", @element).show()
     $('.reset', @element).click =>
       @reset()
 
   reset: ->
-    $(@element).html($(@element).data('excercise-html'))
-    excercise @element
+    $(@element).html($(@element).data('exercise-html'))
+    exercise @element
 
   piece_correct: (qpiece) ->
     $(qpiece).removeClass('incorrect').addClass('correct')
@@ -109,13 +116,20 @@ class Excercise extends Binding
     $placeholder.after($added)
     if not $placeholder.hasClass('multiple')
       $placeholder.hide()
+    if $added.is(".add-li")
+      $added.wrap("<li/>")
+
     $added.append('<span class="remove">x</span>')
     $('.remove', $added).click (ev) =>
-      $added.prev(".placeholder:not(.multiple)").show()
       if not ismultiple
         $($added.data('original')).removeClass('disabled').draggable('enable')
+
+      if $added.is(".add-li")
+        $added = $added.closest('li')
+      $added.prev(".placeholder:not(.multiple)").show()
       $added.remove()
 
+
 ## XXX co z issortable?
   dragging: (ismultiple, issortable) ->
     $(".question", @element).each (i, question) =>
@@ -171,7 +185,7 @@ class Excercise extends Binding
 
 
 
-class Wybor extends Excercise
+class Wybor extends Exercise
   constructor: (element) ->
     super element
 
@@ -213,11 +227,11 @@ class Wybor extends Excercise
       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 Excercise
+class Uporzadkuj extends Exercise
   constructor: (element) ->
     super element
     $('ol, ul', @element).sortable({ items: "> li" })
@@ -256,7 +270,7 @@ class Uporzadkuj extends Excercise
 
 
 # XXX propozycje="1/0"
-class Luki extends Excercise
+class Luki extends Exercise
   constructor: (element) ->
     super element
     @dragging false, false
@@ -281,7 +295,7 @@ class Luki extends Excercise
       @draggable_move $qp, $(placeholder), false
 
 
-class Zastap extends Excercise
+class Zastap extends Exercise
   constructor: (element) ->
     super element
     $(".paragraph", @element).each (i, par) =>
@@ -347,7 +361,7 @@ class Zastap extends Excercise
         $(chld).remove()
 
 
-class Przyporzadkuj extends Excercise
+class Przyporzadkuj extends Exercise
   is_multiple: ->
     for qp in $(".question-piece", @element)
       if $(qp).data('solution').split(/[ ,]+/).length > 1
@@ -410,7 +424,7 @@ class Przyporzadkuj extends Excercise
 
 
 
-class PrawdaFalsz extends Excercise
+class PrawdaFalsz extends Exercise
   constructor: (element) ->
     super element
 
@@ -440,9 +454,9 @@ class PrawdaFalsz extends Excercise
     return [good, all]
 
   show_solutions: ->
-    reset()
+    @reset()
     for qp in $(".question-piece", @element)
-      if $(qp).data('solution') == 'true'
+      if $(qp).data('solution') == true
         $(".true", qp).click()
       else
         $(".false", qp).click()
@@ -450,7 +464,7 @@ class PrawdaFalsz extends Excercise
 
 ##########
 
-excercise = (ele) ->
+exercise = (ele) ->
   es =
     wybor: Wybor
     uporzadkuj: Uporzadkuj
@@ -473,5 +487,5 @@ window.edumed =
 $(document).ready () ->
   new EduModule($("#book-text"))
 
-  $(".excercise").each (i, el) ->
-    excercise(this)
\ No newline at end of file
+  $(".exercise").each (i, el) ->
+    exercise(this)