X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/6f1b6c8ed3980bad95c67be4709dc8e62ba4a593..refs/heads/edumed:/redakcja/static/edumed/js/edumed.js?ds=sidebyside diff --git a/redakcja/static/edumed/js/edumed.js b/redakcja/static/edumed/js/edumed.js index be942174..68a558bc 100644 --- a/redakcja/static/edumed/js/edumed.js +++ b/redakcja/static/edumed/js/edumed.js @@ -1,7 +1,8 @@ +// Generated by CoffeeScript 1.4.0 (function() { - var $, Binding, EduModule, Excercise, Luki, Przyporzadkuj, Uporzadkuj, Wybor, Zastap, excercise, - __hasProp = Object.prototype.hasOwnProperty, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor; child.__super__ = parent.prototype; return child; }; + var $, Binding, EduModule, Exercise, Luki, PrawdaFalsz, Przyporzadkuj, Uporzadkuj, Wybor, Zastap, exercise, + __hasProp = {}.hasOwnProperty, + __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; $ = jQuery; @@ -22,60 +23,82 @@ __extends(EduModule, _super); function EduModule(element) { - var _this = this; EduModule.__super__.constructor.call(this, 'edumodule', element); - $("[name=teacher-toggle]").change(function(ev) { - if ($(ev.target).is(":checked")) { - return $(".teacher", _this.element).addClass("show"); - } else { - return $(".teacher", _this.element).removeClass("show"); - } - }); } return EduModule; })(Binding); - Excercise = (function(_super) { + Exercise = (function(_super) { - __extends(Excercise, _super); + __extends(Exercise, _super); - function Excercise(element) { + function Exercise(element) { var _this = this; - Excercise.__super__.constructor.call(this, 'excercise', element); - $(".check", this.element).click(function() { - return _this.check(); + Exercise.__super__.constructor.call(this, 'exercise', element); + $(this.element).data("exercise-html", $(this.element).html()); + $(".check", this.element).click(function(ev) { + _this.check(); + $(".retry", _this.element).show(); + return $(".check", _this.element).hide(); + }); + $(".retry", this.element).click(function(ev) { + return _this.retry(); }); $('.solutions', this.element).click(function() { - return _this.show_solutions(); + _this.show_solutions(); + return $(".comment", _this.element).show(); + }); + $('.reset', this.element).click(function() { + return _this.reset(); }); } - Excercise.prototype.piece_correct = function(qpiece) { + Exercise.prototype.retry = function() { + $(".correct, .incorrect", this.element).removeClass("correct incorrect"); + $(".check", this.element).show(); + return $(".retry", this.element).hide(); + }; + + Exercise.prototype.reset = function() { + $(this.element).html($(this.element).data('exercise-html')); + return exercise(this.element); + }; + + Exercise.prototype.piece_correct = function(qpiece) { return $(qpiece).removeClass('incorrect').addClass('correct'); }; - Excercise.prototype.piece_incorrect = function(qpiece) { + Exercise.prototype.piece_incorrect = function(qpiece) { return $(qpiece).removeClass('correct').addClass('incorrect'); }; - Excercise.prototype.check = function() { + Exercise.prototype.check = function() { var score, scores, _this = this; scores = []; $(".question", this.element).each(function(i, question) { return scores.push(_this.check_question(question)); }); - score = [0, 0]; + score = [0, 0, 0]; $.each(scores, function(i, s) { score[0] += s[0]; - return score[1] += s[1]; + score[1] += s[1]; + return score[2] += s[2]; }); return this.show_score(score); }; - Excercise.prototype.get_value_list = function(elem, data_key, numbers) { + Exercise.prototype.show_solutions = function() { + var _this = this; + this.reset(); + return $(".question", this.element).each(function(i, question) { + return _this.solve_question(question); + }); + }; + + Exercise.prototype.get_value_list = function(elem, data_key, numbers) { var vl; vl = $(elem).attr("data-" + data_key).split(/[ ,]+/).map($.trim); if (numbers) { @@ -86,7 +109,7 @@ return vl; }; - Excercise.prototype.get_value_optional_list = function(elem, data_key) { + Exercise.prototype.get_value_optional_list = function(elem, data_key) { var mandat, opt, v, vals, _i, _len; vals = this.get_value_list(elem, data_key); mandat = []; @@ -102,11 +125,106 @@ return [mandat, opt]; }; - Excercise.prototype.show_score = function(score) { - return $(".message", this.element).text("Wynik: " + score[0] + " / " + score[1]); + Exercise.prototype.show_score = function(score) { + var $msg; + $msg = $(".message", this.element); + $msg.text("Wynik: " + score[0] + " / " + score[2]); + if (score[0] >= score[2] && score[1] === 0) { + return $msg.addClass("maxscore"); + } else { + return $msg.removeClass("maxscore"); + } + }; + + Exercise.prototype.draggable_equal = function($draggable1, $draggable2) { + return false; + }; + + Exercise.prototype.draggable_accept = function($draggable, $droppable) { + var d, dropped, _i, _len; + dropped = $droppable.closest("ul, ol").find(".draggable"); + for (_i = 0, _len = dropped.length; _i < _len; _i++) { + d = dropped[_i]; + if (this.draggable_equal($draggable, $(d))) { + return false; + } + } + return true; }; - return Excercise; + Exercise.prototype.draggable_move = function($draggable, $placeholder, ismultiple) { + var $added, + _this = this; + $added = $draggable.clone(); + $added.data("original", $draggable.get(0)); + if (!ismultiple) { + $draggable.addClass('disabled').draggable('disable'); + } + $placeholder.after($added); + if (!$placeholder.hasClass('multiple')) { + $placeholder.hide(); + } + if ($added.is(".add-li")) { + $added.wrap("
  • "); + } + $added.append('x
    '); + return $('.remove', $added).click(function(ev) { + _this.retry(); + if (!ismultiple) { + $($added.data('original')).removeClass('disabled').draggable('enable'); + } + if ($added.is(".add-li")) { + $added = $added.closest('li'); + } + $added.prev(".placeholder:not(.multiple)").show(); + return $added.remove(); + }); + }; + + Exercise.prototype.dragging = function(ismultiple, issortable) { + var _this = this; + return $(".question", this.element).each(function(i, question) { + var draggable_opts, self; + draggable_opts = { + revert: 'invalid', + helper: 'clone', + start: _this.retry + }; + $(".draggable", question).draggable(draggable_opts); + self = _this; + return $(".placeholder", question).droppable({ + accept: function(draggable) { + var $draggable, is_accepted; + $draggable = $(draggable); + is_accepted = true; + if (!$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: function(ev, ui) { + $(ev.target).removeClass('accepting dragover'); + return _this.draggable_move($(ui.draggable), $(ev.target), ismultiple); + }, + over: function(ev, ui) { + return $(ev.target).addClass('dragover'); + }, + out: function(ev, ui) { + return $(ev.target).removeClass('dragover'); + } + }); + }); + }; + + return Exercise; })(Binding); @@ -116,13 +234,15 @@ function Wybor(element) { Wybor.__super__.constructor.call(this, element); + $(".question-piece input", element).change(this.retry); } Wybor.prototype.check_question = function(question) { - var all, good, solution, + var all, bad, good, solution, _this = this; all = 0; good = 0; + bad = 0; solution = this.get_value_list(question, 'solution'); $(".question-piece", question).each(function(i, qpiece) { var is_checked, piece_name, piece_no, should_be_checked; @@ -134,26 +254,45 @@ should_be_checked = solution.indexOf(piece_no) >= 0; } is_checked = $("input", qpiece).is(":checked"); - if (should_be_checked) all += 1; + if (should_be_checked) { + all += 1; + } if (is_checked) { if (should_be_checked) { good += 1; return _this.piece_correct(qpiece); } else { + bad += 1; return _this.piece_incorrect(qpiece); } } else { return $(qpiece).removeClass("correct,incorrect"); } }); - return [good, all]; + return [good, bad, all]; }; - Wybor.prototype.show_solutions = function() {}; + Wybor.prototype.solve_question = function(question) { + var solution, + _this = this; + solution = this.get_value_list(question, 'solution'); + return $(".question-piece", question).each(function(i, qpiece) { + var piece_name, piece_no, should_be_checked; + 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; + } + console.log("check " + $("input[type=checkbox]", qpiece).attr("id") + " -> " + should_be_checked); + return $("input[type=checkbox],input[type=radio]", qpiece).prop('checked', should_be_checked); + }); + }; return Wybor; - })(Excercise); + })(Exercise); Uporzadkuj = (function(_super) { @@ -162,32 +301,52 @@ function Uporzadkuj(element) { Uporzadkuj.__super__.constructor.call(this, element); $('ol, ul', this.element).sortable({ - items: "> li" + items: "> li", + start: this.retry }); } Uporzadkuj.prototype.check_question = function(question) { - var all, correct, pkt, pkts, positions, sorted, _ref; + var all, bad, correct, pkt, pkts, positions, sorted, _i, _ref; positions = this.get_value_list(question, 'original', true); - sorted = positions.sort(); + sorted = positions.sort(function(a, b) { + return a - b; + }); pkts = $('.question-piece', question); correct = 0; + bad = 0; all = 0; - for (pkt = 0, _ref = pkts.length; 0 <= _ref ? pkt < _ref : pkt > _ref; 0 <= _ref ? pkt++ : pkt--) { + for (pkt = _i = 0, _ref = pkts.length; 0 <= _ref ? _i < _ref : _i > _ref; pkt = 0 <= _ref ? ++_i : --_i) { all += 1; if (pkts.eq(pkt).data('pos') === sorted[pkt]) { correct += 1; this.piece_correct(pkts.eq(pkt)); } else { + bad += 1; this.piece_incorrect(pkts.eq(pkt)); } } - return [correct, all]; + return [correct, bad, all]; + }; + + Uporzadkuj.prototype.solve_question = function(question) { + var p, parent, pkts, _i, _len, _results; + pkts = $('.question-piece', question); + pkts.sort(function(a, b) { + return $(a).data('pos') - $(b).data('pos'); + }); + parent = pkts.eq(0).parent(); + _results = []; + for (_i = 0, _len = pkts.length; _i < _len; _i++) { + p = pkts[_i]; + _results.push(parent.append(p)); + } + return _results; }; return Uporzadkuj; - })(Excercise); + })(Exercise); Luki = (function(_super) { @@ -195,28 +354,41 @@ function Luki(element) { Luki.__super__.constructor.call(this, element); + this.dragging(false, false); } Luki.prototype.check = function() { - var all, correct, + var all, bad, correct, _this = this; - all = 0; + all = $(".placeholder", this.element).length; correct = 0; - $(".question-piece", this.element).each(function(i, qpiece) { - if ($(qpiece).data('solution') === $(qpiece).val()) { + bad = 0; + $(".placeholder + .question-piece", this.element).each(function(i, qpiece) { + var $placeholder; + $placeholder = $(qpiece).prev(".placeholder"); + if ($placeholder.data('solution') === $(qpiece).data('no')) { _this.piece_correct(qpiece); - correct += 1; + return correct += 1; } else { - _this.piece_incorrect(qpiece); + bad += 1; + return _this.piece_incorrect(qpiece); } - return all += 1; }); - return this.show_score([correct, all]); + return this.show_score([correct, bad, all]); + }; + + Luki.prototype.solve_question = function(question) { + var _this = this; + return $(".placeholder", question).each(function(i, placeholder) { + var $qp; + $qp = $(".question-piece[data-no=" + $(placeholder).data('solution') + "]", question); + return _this.draggable_move($qp, $(placeholder), false); + }); }; return Luki; - })(Excercise); + })(Exercise); Zastap = (function(_super) { @@ -226,45 +398,49 @@ var _this = this; Zastap.__super__.constructor.call(this, element); $(".paragraph", this.element).each(function(i, par) { - var spans; - _this.wrap_words($(par), $('')); - spans = $("> span", par).attr("contenteditable", "true"); - return spans.click(function(ev) { - spans.filter(':not(:empty)').removeClass('editing'); - return $(ev.target).addClass('editing'); - }); + return _this.wrap_words($(par), $('')); }); + this.dragging(false, false); } Zastap.prototype.check = function() { - var all, correct, + var all, bad, correct, _this = this; all = 0; correct = 0; - $(".question-piece", this.element).each(function(i, qpiece) { - var should_be_changed, txt; - txt = $(qpiece).data('original'); - should_be_changed = false; - if (!(txt != null)) { - txt = $(qpiece).data('solution'); - should_be_changed = true; - } - if (!(txt != null)) return; - if (should_be_changed) all += 1; - if (txt !== $(qpiece).text()) { - return _this.piece_incorrect(qpiece); - } else { - if (should_be_changed) { - _this.piece_correct(qpiece); - return correct += 1; + bad = 0; + $(".paragraph", this.element).each(function(i, par) { + return $(".placeholder", par).each(function(j, qpiece) { + var $dragged, $qp; + $qp = $(qpiece); + $dragged = $qp.next(".draggable"); + if ($qp.data("solution")) { + if ($dragged && $qp.data("solution") === $dragged.data("no")) { + _this.piece_correct($dragged); + correct += 1; + } + return all += 1; } - } + }); + }); + return this.show_score([correct, bad, all]); + }; + + Zastap.prototype.show_solutions = function() { + var _this = this; + this.reset(); + return $(".paragraph", this.element).each(function(i, par) { + return $(".placeholder[data-solution]", par).each(function(j, qpiece) { + var $dr, $qp; + $qp = $(qpiece); + $dr = $(".draggable[data-no=" + $qp.data('solution') + "]", _this.element); + return _this.draggable_move($dr, $qp, false); + }); }); - return this.show_score([correct, all]); }; Zastap.prototype.wrap_words = function(element, wrapper) { - var chld, i, ignore, insertWrapped, j, len, space, wordb, _ref, _results; + var chld, i, ignore, insertWrapped, j, len, space, wordb, _i, _ref, _results; ignore = /^[ \t.,:;()]+/; insertWrapped = function(txt, elem) { var nw; @@ -272,7 +448,7 @@ return $(document.createTextNode(txt)).wrap(nw).parent().attr("data-original", txt).insertBefore(elem); }; _results = []; - for (j = _ref = element.get(0).childNodes.length - 1; _ref <= 0 ? j <= 0 : j >= 0; _ref <= 0 ? j++ : j--) { + for (j = _i = _ref = element.get(0).childNodes.length - 1; _ref <= 0 ? _i <= 0 : _i >= 0; j = _ref <= 0 ? ++_i : --_i) { chld = element.get(0).childNodes[j]; if (chld.nodeType === document.TEXT_NODE) { len = chld.textContent.length; @@ -304,7 +480,7 @@ return Zastap; - })(Excercise); + })(Exercise); Przyporzadkuj = (function(_super) { @@ -315,118 +491,169 @@ _ref = $(".question-piece", this.element); for (_i = 0, _len = _ref.length; _i < _len; _i++) { qp = _ref[_i]; - if ($(qp).data('solution').split(/[ ,]+/).length > 1) return true; + if ($(qp).attr('data-solution').split(/[ ,]+/).length > 1) { + return true; + } } return false; }; function Przyporzadkuj(element) { - var _this = this; Przyporzadkuj.__super__.constructor.call(this, element); this.multiple = this.is_multiple(); - $(".question", this.element).each(function(i, question) { - var draggable_opts, helper_opts; - draggable_opts = { - revert: 'invalid' - }; - if (_this.multiple) { - helper_opts = { - helper: "clone" - }; - } else { - helper_opts = {}; - } - $(".draggable", question).draggable($.extend({}, draggable_opts, helper_opts)); - $(".predicate .droppable", question).droppable({ - accept: function(draggable) { - var $draggable, $predicate, added, _i, _len, _ref; - $draggable = $(draggable); - if (!$draggable.is(".draggable")) return false; - $predicate = $(this); - _ref = $predicate.find("li"); - for (_i = 0, _len = _ref.length; _i < _len; _i++) { - added = _ref[_i]; - if ($(added).text() === $draggable.text()) return false; - } - return true; - }, - drop: function(ev, ui) { - var added; - added = ui.draggable.clone(); - added.attr('style', ''); - $(ev.target).append(added); - added.draggable(draggable_opts); - if (!_this.multiple || ui.draggable.closest(".predicate").length > 0) { - return ui.draggable.remove(); - } - } - }); - return $(".subject", question).droppable({ - accept: ".draggable", - drop: function(ev, ui) { - var added; - if ($(ui.draggable).closest(".subject").length > 0) return; - added = ui.draggable.clone(); - added.attr('style', ''); - if (!_this.multiple) { - $(ev.target).append(added); - added.draggable($.extend({}, draggable_opts, helper_opts)); - } - return ui.draggable.remove(); - } - }); - }); + this.dragging(this.multiple, true); } + Przyporzadkuj.prototype.draggable_equal = function(d1, d2) { + return d1.data("no") === d2.data("no"); + }; + Przyporzadkuj.prototype.check_question = function(question) { - var all, all_multiple, count, mandatory, optional, pn, pred, qp, v, _i, _j, _len, _len2, _ref, _ref2; + var all, bad_count, count, mandatory, minimum, optional, pn, pred, qp, self, v, _i, _j, _len, _len1, _ref, _ref1; + minimum = $(question).data("minimum"); count = 0; + bad_count = 0; all = 0; - all_multiple = 0; - _ref = $(".predicate .question-piece", question); + if (!minimum) { + self = this; + $(".subject .question-piece", question).each(function(i, el) { + var mandatory, v; + v = self.get_value_optional_list(el, 'solution'); + mandatory = v[0]; + return all += mandatory.length; + }); + } + _ref = $(".predicate [data-predicate]", question); + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + pred = _ref[_i]; + pn = $(pred).attr('data-predicate'); + _ref1 = $(".question-piece", pred); + for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) { + qp = _ref1[_j]; + v = this.get_value_optional_list(qp, 'solution'); + mandatory = v[0]; + optional = v[1]; + if (mandatory.indexOf(pn) >= 0 || (minimum && optional.indexOf(pn) >= 0)) { + count += 1; + this.piece_correct(qp); + } else { + bad_count += 1; + this.piece_incorrect(qp); + } + } + } + return [count, bad_count, all]; + }; + + Przyporzadkuj.prototype.solve_question = function(question) { + var $ph, $pr, draggables, m, mandatory, minimum, optional, qp, v, _i, _len, _ref, _results; + minimum = $(question).data("min"); + _ref = $(".subject .question-piece", question); + _results = []; for (_i = 0, _len = _ref.length; _i < _len; _i++) { qp = _ref[_i]; - pred = $(qp).closest("[data-predicate]"); v = this.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 || optional.indexOf(pn) >= 0) { - count += 1; + if (minimum) { + draggables = mandatory.count(optional).slice(0, minimum); + } else { + draggables = mandatory; + } + _results.push((function() { + var _j, _len1, _results1; + _results1 = []; + for (_j = 0, _len1 = draggables.length; _j < _len1; _j++) { + m = draggables[_j]; + $pr = $(".predicate [data-predicate=" + m + "]", question); + $ph = $pr.find(".placeholder:visible"); + _results1.push(this.draggable_move($(qp), $ph.eq(0), this.multiple)); + } + return _results1; + }).call(this)); + } + return _results; + }; + + return Przyporzadkuj; + + })(Exercise); + + PrawdaFalsz = (function(_super) { + + __extends(PrawdaFalsz, _super); + + function PrawdaFalsz(element) { + var qp, _i, _len, _ref, + _this = this; + PrawdaFalsz.__super__.constructor.call(this, element); + _ref = $(".question-piece", this.element); + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + qp = _ref[_i]; + $(".true", qp).click(function(ev) { + ev.preventDefault(); + _this.retry(); + $(ev.target).closest(".question-piece").data("value", "true"); + return $(ev.target).addClass('chosen').siblings('a').removeClass('chosen'); + }); + $(".false", qp).click(function(ev) { + ev.preventDefault(); + _this.retry(); + $(ev.target).closest(".question-piece").data("value", "false"); + return $(ev.target).addClass('chosen').siblings('a').removeClass('chosen'); + }); + } + } + + PrawdaFalsz.prototype.check_question = function() { + var all, bad, good, qp, _i, _len, _ref; + all = 0; + good = 0; + bad = 0; + _ref = $(".question-piece", this.element); + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + qp = _ref[_i]; + if ($(qp).data("solution").toString() === $(qp).data("value")) { + good += 1; this.piece_correct(qp); } else { + bad += 1; this.piece_incorrect(qp); } all += 1; } - if (this.multiple) { - _ref2 = $(".subject .question-piece", question); - for (_j = 0, _len2 = _ref2.length; _j < _len2; _j++) { - qp = _ref2[_j]; - v = this.get_value_optional_list(qp, 'solution'); - mandatory = v[0]; - optional = v[1]; - all_multiple += mandatory.length + optional.length; + return [good, bad, all]; + }; + + PrawdaFalsz.prototype.show_solutions = function() { + var qp, _i, _len, _ref, _results; + this.reset(); + _ref = $(".question-piece", this.element); + _results = []; + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + qp = _ref[_i]; + if ($(qp).data('solution') === true) { + _results.push($(".true", qp).click()); + } else { + _results.push($(".false", qp).click()); } - return [count, all_multiple]; - } else { - return [count, all]; } + return _results; }; - return Przyporzadkuj; + return PrawdaFalsz; - })(Excercise); + })(Exercise); - excercise = function(ele) { + exercise = function(ele) { var cls, es; es = { wybor: Wybor, uporzadkuj: Uporzadkuj, luki: Luki, zastap: Zastap, - przyporzadkuj: Przyporzadkuj + przyporzadkuj: Przyporzadkuj, + prawdafalsz: PrawdaFalsz }; cls = es[$(ele).attr('data-type')]; return new cls(ele); @@ -438,8 +665,8 @@ $(document).ready(function() { new EduModule($("#book-text")); - return $(".excercise").each(function(i, el) { - return excercise(this); + return $(".exercise").each(function(i, el) { + return exercise(this); }); });