X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/be2a6b23318edd40b491fc9f8a98360ae5618af7..ff191b1dc1ac37864898b775ce973f3900ddda89:/redakcja/static/edumed/js/edumed.coffee
diff --git a/redakcja/static/edumed/js/edumed.coffee b/redakcja/static/edumed/js/edumed.coffee
index ec1bcd0e..2c02cd8d 100644
--- a/redakcja/static/edumed/js/edumed.coffee
+++ b/redakcja/static/edumed/js/edumed.coffee
@@ -43,14 +43,119 @@ class Excercise extends Binding
score[1] += s[1]
@show_score(score)
- get_value_list: (elem, data_key) ->
- $(elem).data(data_key).split(',').map($.trim).map((x) -> parseInt(x))
-
+ 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
+
+ get_value_optional_list: (elem, data_key) ->
+ vals = @get_value_list(elem, data_key)
+ mandat = []
+ opt = []
+ for v in vals
+ if v.slice(-1) == "?"
+ opt.push v.slice(0, -1)
+ else
+ mandat.push v
+ return [mandat, opt]
show_score: (score) ->
$(".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('x')
+
+ 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)
+ if not $draggable.is(".draggable")
+ return false
+ return self.draggable_accept $draggable, $(this)
+
+ drop: (ev, ui) ->
+ 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('x')
+ $('.remove', added).click (ev) =>
+ $added.prev(".placeholder:not(.multiple)").show()
+ if not ismultiple
+ $added.data('original').removeClass('disabled').draggable('enable')
+ $(added).remove()
+
+
+
+# $(".droppable", question).each (i, droppable) =>
+# $droppable = $(droppable)
+# $droppable.droppable
+# accept: (draggable) =>
+# return false
+# $draggable = $(draggable)
+# if not $draggable.is(".draggable")
+# console.log('not draggable?')
+# return false
+
+# for added in $droppable.children(".draggable")
+# if @draggable_equal($(added), $draggable)
+# console.log('already here:' + $draggable.text())
+# return false
+
+# return @draggable_accept $draggable
+
+# drop: (ev, ui) =>
+# added = ui.draggable.clone()
+# # added.attr('style', '')
+# $(ev.target).append(added)
+# added.draggable(draggable_opts)
+# @draggable_dropped added
+
+# if not @multiple
+# $(ui.draggable).draggable("disable")
+
+
+ # if issortable
+ # $(".droppable", question).sortable
+ # items: "> li"
+
+ # receive: (event, ui) =>
+ # console.log("receive " + $(ui.item).text())
+ # if not accept(ui.item, event.target)
+ # console.log("REVERT")
+ # $(event.target).sortable('cancel')
+
+ # over: (event, ui) =>
+ # if not accept(ui.item, event.target)
+ # $(event.target).sortable('disable')
+ # out: (event, ui) =>
+ # $(event.target).sortable('enable')
+
+
class Wybor extends Excercise
constructor: (element) ->
super element
@@ -61,8 +166,12 @@ class Wybor extends Excercise
good = 0
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
@@ -88,7 +197,7 @@ class Uporzadkuj extends Excercise
$('ol, ul', @element).sortable({ items: "> li" })
check_question: (question) ->
- positions = @get_value_list(question, 'original')
+ positions = @get_value_list(question, 'original', true)
sorted = positions.sort()
pkts = $('.question-piece', question)
@@ -105,15 +214,18 @@ class Uporzadkuj extends Excercise
return [correct, all]
+# XXX propozycje="1/0"
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
@@ -191,54 +303,81 @@ class Zastap extends Excercise
class Przyporzadkuj extends Excercise
+ is_multiple: ->
+ for qp in $(".question-piece", @element)
+ if $(qp).data('solution').split(/[ ,]+/).length > 1
+ return true
+ return false
+
constructor: (element) ->
super element
- if @element.attr('multiple')?
- @multiple = true
- else
- @multiple = false
+ @multiple = @is_multiple()
- $(".question", @element).each (i, question) =>
- draggable_opts =
- revert: 'invalid'
- helper: if @multiple then "clone" else null
+ @dragging @multiple, true
- $(".draggable", question).draggable(draggable_opts)
- .droppable({
- accept: ".draggable"
- })
-
- $(".predicate .droppable", question).droppable
- accept: ".draggable"
- drop: (ev, ui) ->
- is_multiple = ui.draggable.is(".multiple")
+ draggable_equal: (d1, d2) ->
+ return d1.data("no") == d2.data("no")
- added = ui.draggable.clone()
- added.attr('style', '')
- $(this).append(added)
- added.draggable(draggable_opts)
+ check_question: (question) ->
+ # subjects placed in predicates
+ count = 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.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 is_multiple
- ui.draggable.remove()
+ if @multiple
+ for qp in $(".subject .question-piece", question)
+ 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]
- $(".subject", question).droppable
- accept: ".draggable"
- drop: (ev, ui) ->
- is_multiple = ui.draggable.is(".multiple")
- added = ui.draggable.clone()
+class PrawdaFalsz extends Excercise
+ constructor: (element) ->
+ super element
- added.attr('style', '')
- if not is_multiple
- $(this).append(added)
- added.draggable(draggable_opts)
+ 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')
- ui.draggable.remove()
+ 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]
##########
@@ -249,6 +388,7 @@ excercise = (ele) ->
luki: Luki
zastap: Zastap
przyporzadkuj: Przyporzadkuj
+ prawdafalsz: PrawdaFalsz
cls = es[$(ele).attr('data-type')]