X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/a528895b70b51139a214ace3ef87e585a7496ca5..59f6e6616b1b01350f1eaa97ed026e8a8524da1f:/redakcja/static/edumed/js/edumed.js

diff --git a/redakcja/static/edumed/js/edumed.js b/redakcja/static/edumed/js/edumed.js
index 75ecc9e5..f720aca1 100644
--- a/redakcja/static/edumed/js/edumed.js
+++ b/redakcja/static/edumed/js/edumed.js
@@ -1,6 +1,6 @@
 // Generated by CoffeeScript 1.4.0
 (function() {
-  var $, Binding, EduModule, Excercise, Luki, PrawdaFalsz, Przyporzadkuj, Uporzadkuj, Wybor, Zastap, excercise,
+  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; };
 
@@ -30,23 +30,21 @@
 
   })(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);
-      $(this.element).data("excercise-html", $(this.element).html());
+      Exercise.__super__.constructor.call(this, 'exercise', element);
+      $(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).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,20 +55,26 @@
       });
     }
 
-    Excercise.prototype.reset = function() {
-      $(this.element).html($(this.element).data('excercise-html'));
-      return excercise(this.element);
+    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);
     };
 
-    Excercise.prototype.piece_correct = function(qpiece) {
+    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 = [];
@@ -85,7 +89,7 @@
       return this.show_score(score);
     };
 
-    Excercise.prototype.show_solutions = function() {
+    Exercise.prototype.show_solutions = function() {
       var _this = this;
       this.reset();
       return $(".question", this.element).each(function(i, question) {
@@ -93,7 +97,7 @@
       });
     };
 
-    Excercise.prototype.get_value_list = function(elem, data_key, numbers) {
+    Exercise.prototype.get_value_list = function(elem, data_key, numbers) {
       var vl;
       vl = $(elem).attr("data-" + data_key).split(/[ ,]+/).map($.trim);
       if (numbers) {
@@ -104,7 +108,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 = [];
@@ -120,15 +124,22 @@
       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[1]);
+      if (score[0] === score[1]) {
+        return $msg.addClass("maxscore");
+      } else {
+        return $msg.removeClass("maxscore");
+      }
     };
 
-    Excercise.prototype.draggable_equal = function($draggable1, $draggable2) {
+    Exercise.prototype.draggable_equal = function($draggable1, $draggable2) {
       return false;
     };
 
-    Excercise.prototype.draggable_accept = function($draggable, $droppable) {
+    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++) {
@@ -140,7 +151,7 @@
       return true;
     };
 
-    Excercise.prototype.draggable_move = function($draggable, $placeholder, ismultiple) {
+    Exercise.prototype.draggable_move = function($draggable, $placeholder, ismultiple) {
       var $added,
         _this = this;
       $added = $draggable.clone();
@@ -152,23 +163,31 @@
       if (!$placeholder.hasClass('multiple')) {
         $placeholder.hide();
       }
-      $added.append('<span class="remove">x</span>');
+      if ($added.is(".add-li")) {
+        $added.wrap("<li/>");
+      }
+      $added.append('<span class="remove">x</span><div class="clr"></div>');
       return $('.remove', $added).click(function(ev) {
-        $added.prev(".placeholder:not(.multiple)").show();
+        _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();
       });
     };
 
-    Excercise.prototype.dragging = function(ismultiple, issortable) {
+    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'
+          helper: 'clone',
+          start: _this.retry
         };
         $(".draggable", question).draggable(draggable_opts);
         self = _this;
@@ -204,7 +223,7 @@
       });
     };
 
-    return Excercise;
+    return Exercise;
 
   })(Binding);
 
@@ -214,6 +233,7 @@
 
     function Wybor(element) {
       Wybor.__super__.constructor.call(this, element);
+      $(".question-piece input", element).change(this.retry);
     }
 
     Wybor.prototype.check_question = function(question) {
@@ -263,13 +283,13 @@
           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);
       });
     };
 
     return Wybor;
 
-  })(Excercise);
+  })(Exercise);
 
   Uporzadkuj = (function(_super) {
 
@@ -278,7 +298,8 @@
     function Uporzadkuj(element) {
       Uporzadkuj.__super__.constructor.call(this, element);
       $('ol, ul', this.element).sortable({
-        items: "> li"
+        items: "> li",
+        start: this.retry
       });
     }
 
@@ -329,7 +350,7 @@
 
     return Uporzadkuj;
 
-  })(Excercise);
+  })(Exercise);
 
   Luki = (function(_super) {
 
@@ -370,7 +391,7 @@
 
     return Luki;
 
-  })(Excercise);
+  })(Exercise);
 
   Zastap = (function(_super) {
 
@@ -461,7 +482,7 @@
 
     return Zastap;
 
-  })(Excercise);
+  })(Exercise);
 
   Przyporzadkuj = (function(_super) {
 
@@ -472,7 +493,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;
         }
       }
@@ -495,7 +516,7 @@
       count = 0;
       all = 0;
       if (!minimum) {
-        all = $(".subjects .question-piece", question).length;
+        all = $(".subject .question-piece", question).length;
       }
       _ref = $(".predicate [data-predicate]", question);
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
@@ -543,7 +564,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));
@@ -553,27 +574,30 @@
 
     return Przyporzadkuj;
 
-  })(Excercise);
+  })(Exercise);
 
   PrawdaFalsz = (function(_super) {
 
     __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');
         });
       }
     }
@@ -598,12 +622,12 @@
 
     PrawdaFalsz.prototype.show_solutions = function() {
       var qp, _i, _len, _ref, _results;
-      reset();
+      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') {
+        if ($(qp).data('solution') === true) {
           _results.push($(".true", qp).click());
         } else {
           _results.push($(".false", qp).click());
@@ -614,9 +638,9 @@
 
     return PrawdaFalsz;
 
-  })(Excercise);
+  })(Exercise);
 
-  excercise = function(ele) {
+  exercise = function(ele) {
     var cls, es;
     es = {
       wybor: Wybor,
@@ -636,8 +660,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);
     });
   });