$(this.element).data("exercise-html", $(this.element).html());
$(".check", this.element).click(function(ev) {
_this.check();
- $(ev.target).next(".retry").show();
- return $(ev.target).hide();
+ $(".retry", _this.element).show();
+ return $(".check", _this.element).hide();
});
$(".retry", this.element).click(function(ev) {
return _this.retry();
$(".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);
};
Exercise.prototype.show_score = function(score) {
var $msg;
$msg = $(".message", this.element);
- $msg.text("Wynik: " + score[0] + " / " + score[1]);
- if (score[0] === score[1]) {
+ $msg.text("Wynik: " + score[0] + " / " + score[2]);
+ if (score[0] >= score[2] && score[1] === 0) {
return $msg.addClass("maxscore");
} else {
return $msg.removeClass("maxscore");
}
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;
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.solve_question = function(question) {
}
Uporzadkuj.prototype.check_question = function(question) {
- var all, correct, pkt, pkts, positions, sorted, _i, _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 = _i = 0, _ref = pkts.length; 0 <= _ref ? _i < _ref : _i > _ref; pkt = 0 <= _ref ? ++_i : --_i) {
all += 1;
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, positions, sorted, _i, _len, _results;
- positions = this.get_value_list(question, 'original', true);
- sorted = positions.sort();
+ var p, parent, pkts, _i, _len, _results;
pkts = $('.question-piece', question);
pkts.sort(function(a, b) {
- var q, w;
- q = $(a).data('pos');
- w = $(b).data('pos');
- if (q < w) {
- return 1;
- }
- if (q > w) {
- return -1;
- }
- return 0;
+ 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.prepend(p));
+ _results.push(parent.append(p));
}
return _results;
};
}
Luki.prototype.check = function() {
- var all, correct,
+ var all, bad, correct,
_this = this;
- all = 0;
+ all = $(".placeholder", this.element).length;
correct = 0;
+ 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) {
}
Zastap.prototype.check = function() {
- var all, correct,
+ var all, bad, correct,
_this = this;
all = 0;
correct = 0;
+ bad = 0;
$(".paragraph", this.element).each(function(i, par) {
return $(".placeholder", par).each(function(j, qpiece) {
var $dragged, $qp;
}
});
});
- return this.show_score([correct, all]);
+ return this.show_score([correct, bad, all]);
};
Zastap.prototype.show_solutions = function() {
_ref = $(".question-piece", this.element);
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
qp = _ref[_i];
- if ($(qp).data('solution').split(/[ ,]+/).length > 1) {
+ if ($(qp).attr('data-solution').split(/[ ,]+/).length > 1) {
return true;
}
}
};
Przyporzadkuj.prototype.check_question = function(question) {
- var all, count, mandatory, minimum, optional, pn, pred, qp, v, _i, _j, _len, _len1, _ref, _ref1;
+ 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;
if (!minimum) {
- all = $(".subjects .question-piece", question).length;
+ 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');
- if (minimum != null) {
- all += minimum;
- }
_ref1 = $(".question-piece", pred);
for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
qp = _ref1[_j];
count += 1;
this.piece_correct(qp);
} else {
+ bad_count += 1;
this.piece_incorrect(qp);
}
}
}
- return [count, all];
+ return [count, bad_count, all];
};
Przyporzadkuj.prototype.solve_question = function(question) {
}
PrawdaFalsz.prototype.check_question = function() {
- var all, good, qp, _i, _len, _ref;
+ 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];
good += 1;
this.piece_correct(qp);
} else {
+ bad += 1;
this.piece_incorrect(qp);
}
all += 1;
}
- return [good, all];
+ return [good, bad, all];
};
PrawdaFalsz.prototype.show_solutions = function() {
fnp / redakcja.git / blobdiff