X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/22f04fb4b3e8521af673554c2f51b7ec47940019..e80ebc581f001aa756cecb1a6ec3c5f6534a02c9:/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 c8e37c36..3262cac0 100644
--- a/redakcja/static/edumed/js/edumed.js
+++ b/redakcja/static/edumed/js/edumed.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.4.0
+// Generated by CoffeeScript 1.3.3
 (function() {
   var $, Binding, EduModule, Exercise, Luki, PrawdaFalsz, Przyporzadkuj, Uporzadkuj, Wybor, Zastap, exercise,
     __hasProp = {}.hasOwnProperty,
@@ -40,13 +40,11 @@
       $(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) {
-        $(".correct, .incorrect", _this.element).removeClass("correct incorrect");
-        $(ev.target).prev(".check").show();
-        return $(ev.target).hide();
+        return _this.retry();
       });
       $('.solutions', this.element).click(function() {
         _this.show_solutions();
@@ -57,6 +55,12 @@
       });
     }
 
+    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);
@@ -77,10 +81,11 @@
       $(".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);
     };
@@ -121,7 +126,14 @@
     };
 
     Exercise.prototype.show_score = function(score) {
-      return $(".message", this.element).text("Wynik: " + score[0] + " / " + score[1]);
+      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) {
@@ -155,8 +167,9 @@
       if ($added.is(".add-li")) {
         $added.wrap("<li/>");
       }
-      $added.append('<span class="remove">x</span>');
+      $added.append('<span class="remove">x</span><div class="clr"></div>');
       return $('.remove', $added).click(function(ev) {
+        _this.retry();
         if (!ismultiple) {
           $($added.data('original')).removeClass('disabled').draggable('enable');
         }
@@ -174,7 +187,8 @@
         var draggable_opts, self;
         draggable_opts = {
           revert: 'invalid',
-          helper: 'clone'
+          helper: 'clone',
+          start: _this.retry
         };
         $(".draggable", question).draggable(draggable_opts);
         self = _this;
@@ -220,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;
@@ -246,13 +262,14 @@
             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) {
@@ -269,7 +286,7 @@
           should_be_checked = solution.indexOf(piece_no) >= 0;
         }
         console.log("check " + $("input[type=checkbox]", qpiece).attr("id") + " -> " + should_be_checked);
-        return $("input[type=checkbox]", qpiece).prop('checked', should_be_checked);
+        return $("input[type=checkbox],input[type=radio]", qpiece).prop('checked', should_be_checked);
       });
     };
 
@@ -284,16 +301,18 @@
     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, _i, _ref;
+      var all, bad, correct, pkt, pkts, positions, sorted, _i, _ref;
       positions = this.get_value_list(question, 'original', true);
       sorted = positions.sort();
       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;
@@ -301,10 +320,11 @@
           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) {
@@ -347,22 +367,23 @@
     }
 
     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) {
@@ -392,10 +413,11 @@
     }
 
     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;
@@ -410,7 +432,7 @@
           }
         });
       });
-      return this.show_score([correct, all]);
+      return this.show_score([correct, bad, all]);
     };
 
     Zastap.prototype.show_solutions = function() {
@@ -478,7 +500,7 @@
       _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;
         }
       }
@@ -496,20 +518,24 @@
     };
 
     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];
@@ -520,11 +546,12 @@
             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) {
@@ -549,7 +576,7 @@
             m = draggables[_j];
             $pr = $(".predicate [data-predicate=" + m + "]", question);
             $ph = $pr.find(".placeholder:visible");
-            _results1.push(this.draggable_move($(qp), $ph, this.multiple));
+            _results1.push(this.draggable_move($(qp), $ph.eq(0), this.multiple));
           }
           return _results1;
         }).call(this));
@@ -566,28 +593,32 @@
     __extends(PrawdaFalsz, _super);
 
     function PrawdaFalsz(element) {
-      var qp, _i, _len, _ref;
+      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).closest(".question-piece").data("value", "true");
-          return $(this).addClass('chosen').siblings('a').removeClass('chosen');
+          _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).closest(".question-piece").data("value", "false");
-          return $(this).addClass('chosen').siblings('a').removeClass('chosen');
+          _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, 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];
@@ -595,11 +626,12 @@
           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() {
@@ -609,7 +641,7 @@
       _results = [];
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
         qp = _ref[_i];
-        if ($(qp).data('solution') === 'true') {
+        if ($(qp).data('solution') === true) {
           _results.push($(".true", qp).click());
         } else {
           _results.push($(".false", qp).click());