X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/88d1651a8ef2ff5e669ab2799fd2d01bbe0f664e..0327b33c1e7816f8a30269f8798bff5e216ccd7c:/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 803eb042..cc7b9e12 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; };
 
@@ -23,54 +23,54 @@
     __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);
-      $(this.element).data("excercise-html", $(this.element).html());
-      $(".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();
+        $(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();
       });
       $('.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.reset = function() {
-      $(this.element).html($(this.element).data('excercise-html'));
-      return excercise(this.element);
+    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 +85,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 +93,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 +104,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 +120,15 @@
       return [mandat, opt];
     };
 
-    Excercise.prototype.show_score = function(score) {
+    Exercise.prototype.show_score = function(score) {
       return $(".message", this.element).text("Wynik: " + score[0] + " / " + score[1]);
     };
 
-    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 +140,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();
@@ -162,7 +162,7 @@
       });
     };
 
-    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;
@@ -204,7 +204,7 @@
       });
     };
 
-    return Excercise;
+    return Exercise;
 
   })(Binding);
 
@@ -269,7 +269,7 @@
 
     return Wybor;
 
-  })(Excercise);
+  })(Exercise);
 
   Uporzadkuj = (function(_super) {
 
@@ -329,7 +329,7 @@
 
     return Uporzadkuj;
 
-  })(Excercise);
+  })(Exercise);
 
   Luki = (function(_super) {
 
@@ -370,7 +370,7 @@
 
     return Luki;
 
-  })(Excercise);
+  })(Exercise);
 
   Zastap = (function(_super) {
 
@@ -461,7 +461,7 @@
 
     return Zastap;
 
-  })(Excercise);
+  })(Exercise);
 
   Przyporzadkuj = (function(_super) {
 
@@ -490,44 +490,40 @@
     };
 
     Przyporzadkuj.prototype.check_question = function(question) {
-      var all, all_multiple, count, mandatory, optional, pn, pred, qp, v, _i, _j, _len, _len1, _ref, _ref1;
+      var all, count, mandatory, minimum, optional, pn, pred, qp, v, _i, _j, _len, _len1, _ref, _ref1;
+      minimum = $(question).data("minimum");
       count = 0;
       all = 0;
-      all_multiple = 0;
-      _ref = $(".predicate .question-piece", question);
+      if (!minimum) {
+        all = $(".subjects .question-piece", question).length;
+      }
+      _ref = $(".predicate [data-predicate]", question);
       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;
-          this.piece_correct(qp);
-        } else {
-          this.piece_incorrect(qp);
+        pred = _ref[_i];
+        pn = $(pred).attr('data-predicate');
+        if (minimum != null) {
+          all += minimum;
         }
-        all += 1;
-      }
-      if (this.multiple) {
-        _ref1 = $(".subject .question-piece", question);
+        _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];
-          all_multiple += mandatory.length + optional.length;
+          if (mandatory.indexOf(pn) >= 0 || (minimum && optional.indexOf(pn) >= 0)) {
+            count += 1;
+            this.piece_correct(qp);
+          } else {
+            this.piece_incorrect(qp);
+          }
         }
-        return [count, all_multiple];
-      } else {
-        return [count, all];
       }
+      return [count, all];
     };
 
     Przyporzadkuj.prototype.solve_question = function(question) {
-      var $ph, $pr, m, mandatory, optional, qp, v, _i, _len, _ref, _results;
+      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++) {
@@ -535,14 +531,18 @@
         v = this.get_value_optional_list(qp, 'solution');
         mandatory = v[0];
         optional = v[1];
+        if (minimum) {
+          draggables = mandatory.count(optional).slice(0, minimum);
+        } else {
+          draggables = mandatory;
+        }
         _results.push((function() {
-          var _j, _len1, _ref1, _results1;
-          _ref1 = mandatory.concat(optional);
+          var _j, _len1, _results1;
           _results1 = [];
-          for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
-            m = _ref1[_j];
+          for (_j = 0, _len1 = draggables.length; _j < _len1; _j++) {
+            m = draggables[_j];
             $pr = $(".predicate [data-predicate=" + m + "]", question);
-            $ph = $pr.find(".placeholder");
+            $ph = $pr.find(".placeholder:visible");
             _results1.push(this.draggable_move($(qp), $ph, this.multiple));
           }
           return _results1;
@@ -553,7 +553,7 @@
 
     return Przyporzadkuj;
 
-  })(Excercise);
+  })(Exercise);
 
   PrawdaFalsz = (function(_super) {
 
@@ -614,9 +614,9 @@
 
     return PrawdaFalsz;
 
-  })(Excercise);
+  })(Exercise);
 
-  excercise = function(ele) {
+  exercise = function(ele) {
     var cls, es;
     es = {
       wybor: Wybor,
@@ -636,8 +636,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);
     });
   });