X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/b31136a9f521897ad2552126adfd4d5e2288bb15..844b960507376aed7fc19b508d08543b494b567d:/redakcja/static/edumed/js/edumed.coffee

diff --git a/redakcja/static/edumed/js/edumed.coffee b/redakcja/static/edumed/js/edumed.coffee
index adc3ae56..dae80f84 100644
--- a/redakcja/static/edumed/js/edumed.coffee
+++ b/redakcja/static/edumed/js/edumed.coffee
@@ -43,12 +43,25 @@ class Excercise extends Binding
       score[1] += s[1]
     @show_score(score)
 
+  # Parses a list of values, separated by space or comma.
+  # The list is read from data attribute of elem using data_key
+  # Returns a list with elements
+  # eg.: things_i_need: "house bike tv playstation"
+  # yields ["house", "bike", "tv", "playstation"]
+  # If optional numbers argument is true, returns list of numbers
+  # instead of strings
   get_value_list: (elem, data_key, numbers) ->
     vl = $(elem).attr("data-" + data_key).split(/[ ,]+/).map($.trim) #.map((x) -> parseInt(x))
     if numbers
       vl = vl.map((x) -> parseInt(x))
     return vl
 
+  # Parses a list of values, separated by space or comma.
+  # The list is read from data attribute of elem using data_key
+  # Returns a 2-element list with mandatory and optional
+  # items. optional items are marked with a question mark on the end
+  # eg.: things_i_need: "house bike tv? playstation?"
+  # yields [[ "house", "bike"], ["tv", "playstation"]]
   get_value_optional_list: (elem, data_key) ->
     vals = @get_value_list(elem, data_key)
     mandat = []
@@ -64,6 +77,71 @@ class Excercise extends Binding
     $(".message", @element).text("Wynik: #{score[0]} / #{score[1]}")
 
 
+  draggable_equal: ($draggable1, $draggable2) ->
+    return false
+
+  draggable_accept: ($draggable, $droppable) ->
+    dropped = $droppable.closest("ul, ol").find(".draggable")
+    for d in dropped
+      if @draggable_equal $draggable, $(d)
+        return false
+    return true
+
+  draggable_dropped: ($draggable) ->
+    $draggable.append('<span class="close">x</span>')
+
+  dragging: (ismultiple, issortable) ->
+    $(".question", @element).each (i, question) =>
+      draggable_opts =
+        revert: 'invalid'
+        helper: 'clone'
+
+      $(".draggable", question).draggable(draggable_opts)
+      self = this
+      $(".placeholder", question).droppable
+        accept: (draggable) ->
+          $draggable = $(draggable)
+          is_accepted = true
+
+          if not $draggable.is(".draggable")
+            is_accepted = false
+
+          if is_accepted
+            is_accepted= self.draggable_accept $draggable, $(this)
+
+          if is_accepted
+            $(this).addClass 'accepting'
+          else
+            $(this).removeClass 'accepting'
+          return is_accepted
+
+        drop: (ev, ui) ->
+          $(ev.target).removeClass 'accepting'
+
+          added = $(ui.draggable).clone()
+          $added = added
+          $added.data("original", ui.draggable)
+          if not ismultiple
+            $(ui.draggable).addClass('disabled').draggable('disable')
+
+          $(ev.target).after(added)
+          if not $(ev.target).hasClass('multiple')
+            $(ev.target).hide()
+          $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')
+            $(added).remove()
+
+        over: (ev, ui) ->
+          $(ev.target).addClass 'dragover'
+
+
+        out: (ev, ui) ->
+          $(ev.target).removeClass 'dragover'
+
+
 class Wybor extends Excercise
   constructor: (element) ->
     super element
@@ -72,10 +150,14 @@ class Wybor extends Excercise
   check_question: (question) ->
     all = 0
     good = 0
-    solution = @get_value_list(question, 'solution', true)
+    solution = @get_value_list(question, 'solution')
     $(".question-piece", question).each (i, qpiece) =>
-      piece_no = parseInt $(qpiece).attr 'data-no'
-      should_be_checked = solution.indexOf(piece_no) >= 0
+      piece_no = $(qpiece).attr 'data-no'
+      piece_name = $(qpiece).attr 'data-name'
+      if piece_name
+        should_be_checked = solution.indexOf(piece_name) >= 0
+      else
+        should_be_checked = solution.indexOf(piece_no) >= 0
       is_checked = $("input", qpiece).is(":checked")
 
       if should_be_checked
@@ -122,12 +204,14 @@ class Uporzadkuj extends Excercise
 class Luki extends Excercise
   constructor: (element) ->
     super element
+    @dragging false, false
 
   check: ->
     all = 0
     correct = 0
-    $(".question-piece", @element).each (i, qpiece) =>
-      if $(qpiece).data('solution') == $(qpiece).val()
+    $(".placeholder + .question-piece", @element).each (i, qpiece) =>
+      $placeholder = $(qpiece).prev(".placeholder")
+      if $placeholder.data('solution') == $(qpiece).data('no')
         @piece_correct qpiece
         correct += 1
       else
@@ -141,34 +225,25 @@ class Zastap extends Excercise
   constructor: (element) ->
     super element
     $(".paragraph", @element).each (i, par) =>
-      @wrap_words $(par), $('<span class="zastap question-piece"/>')
-      spans = $("> span", par).attr("contenteditable", "true")
-      spans.click (ev) =>
-        spans.filter(':not(:empty)').removeClass('editing')
-        $(ev.target).addClass('editing')
-
+      @wrap_words $(par), $('<span class="placeholder zastap"/>')
+    @dragging false, false
 
   check: ->
     all = 0
     correct = 0
-    $(".question-piece", @element).each (i, qpiece) =>
-      txt = $(qpiece).data('original')
-      should_be_changed = false
-      if not txt?
-        txt = $(qpiece).data('solution')
-        should_be_changed = true
-      if not txt?
-        return
-
-      if should_be_changed
-        all += 1
 
-      if txt != $(qpiece).text()
-        @piece_incorrect qpiece
-      else
-        if should_be_changed
-          @piece_correct qpiece
-          correct += 1
+    $(".paragraph", @element).each (i, par) =>
+      $(".placeholder", par).each (j, qpiece) =>
+        should_be_checked = false
+        $qp = $(qpiece)
+        $dragged = $qp.next(".draggable")
+        if $qp.data("solution")
+          if $dragged and $qp.data("solution") == $dragged.data("no")
+            @piece_correct $dragged
+            correct += 1
+#          else -- we dont mark enything here, so not to hint user about solution. He sees he hasn't used all the draggables
+
+          all += 1
 
     @show_score [correct, all]
 
@@ -216,56 +291,11 @@ class Przyporzadkuj extends Excercise
 
     @multiple = @is_multiple()
 
-    $(".question", @element).each (i, question) =>
-      draggable_opts =
-        revert: 'invalid'
-      if @multiple
-        helper_opts = { helper: "clone" }
-      else helper_opts = {}
-
-      $(".draggable", question).draggable($.extend({}, draggable_opts,
-        helper_opts))
-
-      $(".predicate .droppable", question).droppable
-        accept: (draggable) ->
-          $draggable = $(draggable)
-          if not $draggable.is(".draggable")
-            return false
-          $predicate = $(this)
-
-          for added in $predicate.find("li")
-            if $(added).text() == $draggable.text()
-              return false
-          return true
-
-        drop: (ev, ui) =>
-          added = ui.draggable.clone()
-
-          added.attr('style', '')
-          $(ev.target).append(added)
-          added.draggable(draggable_opts)
-
-          if not @multiple or ui.draggable.closest(".predicate").length > 0
-            ui.draggable.remove()
-
-
-      $(".subject", question).droppable
-        accept: ".draggable"
-        drop: (ev, ui) =>
-          # this is to prevent a situation of dragging out and
-          # dropping back to the same place
-          if $(ui.draggable).closest(".subject").length > 0
-            return
-
+    @dragging @multiple, true
 
-          added = ui.draggable.clone()
+  draggable_equal: (d1, d2) ->
+    return d1.data("no") == d2.data("no")
 
-          added.attr('style', '')
-          if not @multiple
-            $(ev.target).append(added)
-            added.draggable($.extend({}, draggable_opts, helper_opts))
-
-          ui.draggable.remove()
 
   check_question: (question) ->
     # subjects placed in predicates
@@ -297,9 +327,34 @@ class Przyporzadkuj extends Excercise
       return [count, all]
 
 
+class PrawdaFalsz extends Excercise
+  constructor: (element) ->
+    super element
 
+    for qp in $(".question-piece", @element)
+      $(".true", 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()
+        $(this).closest(".question-piece").data("value", "false")
+        $(this).addClass('chosen').siblings('a').removeClass('chosen')
+
+
+  check_question: ->
+    all = 0
+    good = 0
+    for qp in $(".question-piece", @element)
+      if $(qp).data("solution").toString() == $(qp).data("value")
+        good += 1
+        @piece_correct qp
+      else
+        @piece_incorrect qp
 
+      all += 1
 
+    return [good, all]
 
 ##########
 
@@ -310,6 +365,7 @@ excercise = (ele) ->
     luki: Luki
     zastap: Zastap
     przyporzadkuj: Przyporzadkuj
+    prawdafalsz: PrawdaFalsz
 
 
   cls = es[$(ele).attr('data-type')]