Fix: Editing nodes with XNodeAttributes might lead to data corruption

[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 0fd39d9..fb8ea87 100644 (file)
--- a/redakcja/static/edumed/js/edumed.coffee
+++ b/redakcja/static/edumed/js/edumed.coffee
@@ -10,29 +10,39 @@ class EduModule extends Binding
   constructor: (element) ->
     super 'edumodule', element
 
   constructor: (element) ->
     super 'edumodule', element
 

-    $("[name=teacher-toggle]").change (ev) =>
-      if $(ev.target).is(":checked")
-        $(".teacher", @element).addClass "show"
-      else
-        $(".teacher", @element).removeClass "show"
+    # $("[name=teacher-toggle]").change (ev) =>
+    #   if $(ev.target).is(":checked")
+    #     $(".teacher", @element).addClass "show"
+    #   else
+    #     $(".teacher", @element).removeClass "show"

 
 
 
 

-class Excercise extends Binding
+class Exercise extends Binding

   constructor: (element) ->
   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()
       @check()

+      $(".retry", @element).show()
+      $(".check", @element).hide()
+    $(".retry", @element).click (ev) =>
+      @retry()

     $('.solutions', @element).click =>
       @show_solutions()
     $('.solutions', @element).click =>
       @show_solutions()

+      $(".comment", @element).show()

     $('.reset', @element).click =>
       @reset()
 
     $('.reset', @element).click =>
       @reset()
 

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

   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')
 
   piece_correct: (qpiece) ->
     $(qpiece).removeClass('incorrect').addClass('correct')


@@ -45,10 +55,11 @@ class Excercise extends Binding
     $(".question", @element).each (i, question) =>
       scores.push(@check_question question)
 
     $(".question", @element).each (i, question) =>
       scores.push(@check_question question)
 

-    score = [0, 0]
+    score = [0, 0, 0]

     $.each scores, (i, s) ->
       score[0] += s[0]
       score[1] += s[1]
     $.each scores, (i, s) ->
       score[0] += s[0]
       score[1] += s[1]

+      score[2] += s[2]

     @show_score(score)
 
   show_solutions: ->
     @show_score(score)
 
   show_solutions: ->


@@ -87,7 +98,12 @@ class Excercise extends Binding
     return [mandat, opt]
 
   show_score: (score) ->
     return [mandat, opt]
 
   show_score: (score) ->

-    $(".message", @element).text("Wynik: #{score[0]} / #{score[1]}")
+    $msg = $(".message", @element)
+    $msg.text("Wynik: #{score[0]} / #{score[2]}")
+    if score[0] >= score[2] and score[1] == 0
+      $msg.addClass("maxscore")
+    else
+      $msg.removeClass("maxscore")

 
 
   draggable_equal: ($draggable1, $draggable2) ->
 
 
   draggable_equal: ($draggable1, $draggable2) ->


@@ -109,19 +125,28 @@ class Excercise extends Binding
     $placeholder.after($added)
     if not $placeholder.hasClass('multiple')
       $placeholder.hide()
     $placeholder.after($added)
     if not $placeholder.hasClass('multiple')
       $placeholder.hide()

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

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

-      $added.prev(".placeholder:not(.multiple)").show()
+      @retry()

       if not ismultiple
         $($added.data('original')).removeClass('disabled').draggable('enable')
       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()
 
 
       $added.remove()
 
 

+## XXX co z issortable?

   dragging: (ismultiple, issortable) ->
     $(".question", @element).each (i, question) =>
       draggable_opts =
         revert: 'invalid'
         helper: 'clone'
   dragging: (ismultiple, issortable) ->
     $(".question", @element).each (i, question) =>
       draggable_opts =
         revert: 'invalid'
         helper: 'clone'

+        start: @retry

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


@@ -171,14 +196,16 @@ class Excercise extends Binding
 
 
 
 
 
 

-class Wybor extends Excercise
+class Wybor extends Exercise

   constructor: (element) ->
     super element
   constructor: (element) ->
     super element

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

 
 
   check_question: (question) ->
     all = 0
     good = 0
 
 
   check_question: (question) ->
     all = 0
     good = 0

+    bad = 0

     solution = @get_value_list(question, 'solution')
     $(".question-piece", question).each (i, qpiece) =>
       piece_no = $(qpiece).attr 'data-no'
     solution = @get_value_list(question, 'solution')
     $(".question-piece", question).each (i, qpiece) =>
       piece_no = $(qpiece).attr 'data-no'


@@ -197,11 +224,12 @@ class Wybor extends Excercise
           good += 1
           @piece_correct qpiece
         else
           good += 1
           @piece_correct qpiece
         else

+          bad += 1

           @piece_incorrect qpiece
       else
         $(qpiece).removeClass("correct,incorrect")
 
           @piece_incorrect qpiece
       else
         $(qpiece).removeClass("correct,incorrect")
 

-    return [good, all]
+    return [good, bad, all]

 
   solve_question: (question) ->
     solution = @get_value_list(question, 'solution')
 
   solve_question: (question) ->
     solution = @get_value_list(question, 'solution')


@@ -213,14 +241,14 @@ 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)
       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
   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)


@@ -228,6 +256,7 @@ class Uporzadkuj extends Excercise
     pkts = $('.question-piece', question)
 
     correct = 0
     pkts = $('.question-piece', question)
 
     correct = 0

+    bad = 0

     all = 0
 
     for pkt in [0...pkts.length]
     all = 0
 
     for pkt in [0...pkts.length]


@@ -236,8 +265,9 @@ class Uporzadkuj extends Excercise
         correct += 1
         @piece_correct pkts.eq(pkt)
       else
         correct += 1
         @piece_correct pkts.eq(pkt)
       else

+        bad += 1

         @piece_incorrect pkts.eq(pkt)
         @piece_incorrect pkts.eq(pkt)

-    return [correct, all]
+    return [correct, bad, all]

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


@@ -256,24 +286,25 @@ class Uporzadkuj extends Excercise
 
 
 # XXX propozycje="1/0"
 
 
 # XXX propozycje="1/0"

-class Luki extends Excercise
+class Luki extends Exercise

   constructor: (element) ->
     super element
     @dragging false, false
 
   check: ->
   constructor: (element) ->
     super element
     @dragging false, false
 
   check: ->

-    all = 0
+    all = $(".placeholder", @element).length

     correct = 0
     correct = 0

+    bad = 0

     $(".placeholder + .question-piece", @element).each (i, qpiece) =>
       $placeholder = $(qpiece).prev(".placeholder")
       if $placeholder.data('solution') == $(qpiece).data('no')
         @piece_correct qpiece
         correct += 1
       else
     $(".placeholder + .question-piece", @element).each (i, qpiece) =>
       $placeholder = $(qpiece).prev(".placeholder")
       if $placeholder.data('solution') == $(qpiece).data('no')
         @piece_correct qpiece
         correct += 1
       else

+        bad += 1

         @piece_incorrect qpiece
         @piece_incorrect qpiece

-      all += 1

 
 

-    @show_score [correct, all]
+    @show_score [correct, bad, all]

 
   solve_question: (question) ->
     $(".placeholder", question).each (i, placeholder) =>
 
   solve_question: (question) ->
     $(".placeholder", question).each (i, placeholder) =>


@@ -281,7 +312,7 @@ class Luki extends Excercise
       @draggable_move $qp, $(placeholder), false
 
 
       @draggable_move $qp, $(placeholder), false
 
 

-class Zastap extends Excercise
+class Zastap extends Exercise

   constructor: (element) ->
     super element
     $(".paragraph", @element).each (i, par) =>
   constructor: (element) ->
     super element
     $(".paragraph", @element).each (i, par) =>


@@ -291,6 +322,7 @@ class Zastap extends Excercise
   check: ->
     all = 0
     correct = 0
   check: ->
     all = 0
     correct = 0

+    bad = 0

 
     $(".paragraph", @element).each (i, par) =>
       $(".placeholder", par).each (j, qpiece) =>
 
     $(".paragraph", @element).each (i, par) =>
       $(".placeholder", par).each (j, qpiece) =>


@@ -304,7 +336,7 @@ class Zastap extends Excercise
 
           all += 1
 
 
           all += 1
 

-    @show_score [correct, all]
+    @show_score [correct, bad, all]

 
   show_solutions: ->
     @reset()
 
   show_solutions: ->
     @reset()


@@ -347,10 +379,10 @@ class Zastap extends Excercise
         $(chld).remove()
 
 
         $(chld).remove()
 
 

-class Przyporzadkuj extends Excercise
+class Przyporzadkuj extends Exercise

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

-      if $(qp).data('solution').split(/[ ,]+/).length > 1
+      if $(qp).attr('data-solution').split(/[ ,]+/).length > 1

         return true
     return false
 
         return true
     return false
 


@@ -367,78 +399,92 @@ class Przyporzadkuj extends Excercise
 
   check_question: (question) ->
     # subjects placed in predicates
 
   check_question: (question) ->
     # subjects placed in predicates

+    minimum = $(question).data("minimum")

     count = 0
     count = 0

+    bad_count = 0

     all = 0
     all = 0

-    all_multiple = 0
-    for qp in $(".predicate .question-piece", question)
-      pred = $(qp).closest("[data-predicate]")
-      v = @get_value_optional_list qp, 'solution'
-      mandatory = v[0]
-      optional = v[1]
-      all_multiple += mandatory.length + optional.length
-      pn = pred.attr('data-predicate')
-      if mandatory.indexOf(pn) >= 0 or optional.indexOf(pn) >= 0
-        count += 1
-        @piece_correct qp
-      else
-        @piece_incorrect qp
-      all += 1
+    if not minimum
+      self = this
+      $(".subject .question-piece", question).each (i, el) ->
+        v = self.get_value_optional_list el, 'solution'
+        mandatory = v[0]
+        all += mandatory.length

 
 

-    if @multiple
-      for qp in $(".subject .question-piece", question)
+    for pred in $(".predicate [data-predicate]", question)
+      pn = $(pred).attr('data-predicate')
+      #if minimum?
+      #  all += minimum
+
+      for qp in $(".question-piece", pred)

         v = @get_value_optional_list qp, 'solution'
         mandatory = v[0]
         optional = v[1]
         v = @get_value_optional_list qp, 'solution'
         mandatory = v[0]
         optional = v[1]

-        all_multiple += mandatory.length + optional.length
-      return [count, all_multiple]
-    else
-      return [count, all]
+
+        if mandatory.indexOf(pn) >= 0 or (minimum and optional.indexOf(pn) >= 0)
+          count += 1
+          @piece_correct qp
+        else
+          bad_count += 1
+          @piece_incorrect qp
+
+    return [count, bad_count, all]

 
   solve_question: (question) ->
 
   solve_question: (question) ->

+    minimum = $(question).data("min")
+

     for qp in $(".subject .question-piece", question)
       v = @get_value_optional_list qp, 'solution'
       mandatory = v[0]
       optional = v[1]
     for qp in $(".subject .question-piece", question)
       v = @get_value_optional_list qp, 'solution'
       mandatory = v[0]
       optional = v[1]

-      for m in mandatory.concat(optional)
+
+      if minimum
+        draggables = mandatory.count(optional)[0...minimum]
+      else
+        draggables = mandatory
+      for m in draggables

         $pr = $(".predicate [data-predicate=" + m + "]", question)
         $pr = $(".predicate [data-predicate=" + m + "]", question)

-        $ph = $pr.find ".placeholder"
-        @draggable_move $(qp), $ph, @multiple
+        $ph = $pr.find ".placeholder:visible"
+        @draggable_move $(qp), $ph.eq(0), @multiple

 
 
 
 
 
 

-class PrawdaFalsz extends Excercise
+class PrawdaFalsz extends Exercise

   constructor: (element) ->
     super element
 
     for qp in $(".question-piece", @element)
   constructor: (element) ->
     super element
 
     for qp in $(".question-piece", @element)

-      $(".true", qp).click (ev) ->
+      $(".true", qp).click (ev) =>

         ev.preventDefault()
         ev.preventDefault()

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

         ev.preventDefault()
         ev.preventDefault()

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

 
 
   check_question: ->
     all = 0
     good = 0
 
 
   check_question: ->
     all = 0
     good = 0

+    bad = 0

     for qp in $(".question-piece", @element)
       if $(qp).data("solution").toString() == $(qp).data("value")
         good += 1
         @piece_correct qp
       else
     for qp in $(".question-piece", @element)
       if $(qp).data("solution").toString() == $(qp).data("value")
         good += 1
         @piece_correct qp
       else

+        bad += 1

         @piece_incorrect qp
 
       all += 1
 
         @piece_incorrect qp
 
       all += 1
 

-    return [good, all]
+    return [good, bad, all]

 
   show_solutions: ->
 
   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()


@@ -446,7 +492,7 @@ class PrawdaFalsz extends Excercise
 
 ##########
 
 
 ##########
 

-excercise = (ele) ->
+exercise = (ele) ->

   es =
     wybor: Wybor
     uporzadkuj: Uporzadkuj
   es =
     wybor: Wybor
     uporzadkuj: Uporzadkuj


@@ -469,5 +515,5 @@ window.edumed =
 $(document).ready () ->
   new EduModule($("#book-text"))
 
 $(document).ready () ->
   new EduModule($("#book-text"))
 

-  $(".excercise").each (i, el) ->
-    excercise(this)
\ No newline at end of file
+  $(".exercise").each (i, el) ->
+    exercise(this)