X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/ff191b1dc1ac37864898b775ce973f3900ddda89..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 622ed0e5..cc7b9e12 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, PrawdaFalsz, 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,45 +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);
-      $(".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.piece_correct = function(qpiece) {
+    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 = [];
@@ -75,7 +85,15 @@
       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 +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 = [];
@@ -102,29 +120,49 @@
       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++) {
         d = dropped[_i];
-        if (this.draggable_equal($draggable, $(d))) return false;
+        if (this.draggable_equal($draggable, $(d))) {
+          return false;
+        }
       }
       return true;
     };
 
-    Excercise.prototype.draggable_dropped = function($draggable) {
-      return $draggable.append('<span class="close">x</span>');
+    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();
+      }
+      $added.append('<span class="remove">x</span>');
+      return $('.remove', $added).click(function(ev) {
+        $added.prev(".placeholder:not(.multiple)").show();
+        if (!ismultiple) {
+          $($added.data('original')).removeClass('disabled').draggable('enable');
+        }
+        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;
@@ -136,36 +174,37 @@
         self = _this;
         return $(".placeholder", question).droppable({
           accept: function(draggable) {
-            var $draggable;
+            var $draggable, is_accepted;
             $draggable = $(draggable);
-            if (!$draggable.is(".draggable")) return false;
-            return self.draggable_accept($draggable, $(this));
+            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) {
-            var $added, added,
-              _this = this;
-            added = $(ui.draggable).clone();
-            $added = added;
-            $added.data("original", ui.draggable);
-            if (!ismultiple) {
-              $(ui.draggable).addClass('disabled').draggable('disable');
-            }
-            $(ev.target).after(added);
-            if (!$(ev.target).hasClass('multiple')) $(ev.target).hide();
-            $added.append('<span class="remove">x</span>');
-            return $('.remove', added).click(function(ev) {
-              $added.prev(".placeholder:not(.multiple)").show();
-              if (!ismultiple) {
-                $added.data('original').removeClass('disabled').draggable('enable');
-              }
-              return $(added).remove();
-            });
+            $(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 Excercise;
+    return Exercise;
 
   })(Binding);
 
@@ -193,7 +232,9 @@
           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;
@@ -208,11 +249,27 @@
       return [good, 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]", qpiece).prop('checked', should_be_checked);
+      });
+    };
 
     return Wybor;
 
-  })(Excercise);
+  })(Exercise);
 
   Uporzadkuj = (function(_super) {
 
@@ -226,13 +283,13 @@
     }
 
     Uporzadkuj.prototype.check_question = function(question) {
-      var all, correct, pkt, pkts, positions, sorted, _ref;
+      var all, correct, pkt, pkts, positions, sorted, _i, _ref;
       positions = this.get_value_list(question, 'original', true);
       sorted = positions.sort();
       pkts = $('.question-piece', question);
       correct = 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;
@@ -244,9 +301,35 @@
       return [correct, 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();
+      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;
+      });
+      parent = pkts.eq(0).parent();
+      _results = [];
+      for (_i = 0, _len = pkts.length; _i < _len; _i++) {
+        p = pkts[_i];
+        _results.push(parent.prepend(p));
+      }
+      return _results;
+    };
+
     return Uporzadkuj;
 
-  })(Excercise);
+  })(Exercise);
 
   Luki = (function(_super) {
 
@@ -276,9 +359,18 @@
       return this.show_score([correct, 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) {
 
@@ -288,14 +380,9 @@
       var _this = this;
       Zastap.__super__.constructor.call(this, element);
       $(".paragraph", this.element).each(function(i, par) {
-        var spans;
-        _this.wrap_words($(par), $('<span class="zastap question-piece"/>'));
-        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), $('<span class="placeholder zastap"/>'));
       });
+      this.dragging(false, false);
     }
 
     Zastap.prototype.check = function() {
@@ -303,30 +390,38 @@
         _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;
+      $(".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, 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);
+        });
+      });
+    };
+
     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;
@@ -334,7 +429,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;
@@ -366,7 +461,7 @@
 
     return Zastap;
 
-  })(Excercise);
+  })(Exercise);
 
   Przyporzadkuj = (function(_super) {
 
@@ -377,7 +472,9 @@
       _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).data('solution').split(/[ ,]+/).length > 1) {
+          return true;
+        }
       }
       return false;
     };
@@ -393,45 +490,70 @@
     };
 
     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, 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++) {
+        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];
+          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 {
+            this.piece_incorrect(qp);
+          }
+        }
+      }
+      return [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;
-          this.piece_correct(qp);
+        if (minimum) {
+          draggables = mandatory.count(optional).slice(0, minimum);
         } else {
-          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;
+          draggables = mandatory;
         }
-        return [count, all_multiple];
-      } else {
-        return [count, all];
+        _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, this.multiple));
+          }
+          return _results1;
+        }).call(this));
       }
+      return _results;
     };
 
     return Przyporzadkuj;
 
-  })(Excercise);
+  })(Exercise);
 
   PrawdaFalsz = (function(_super) {
 
@@ -474,11 +596,27 @@
       return [good, all];
     };
 
+    PrawdaFalsz.prototype.show_solutions = function() {
+      var qp, _i, _len, _ref, _results;
+      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 _results;
+    };
+
     return PrawdaFalsz;
 
-  })(Excercise);
+  })(Exercise);
 
-  excercise = function(ele) {
+  exercise = function(ele) {
     var cls, es;
     es = {
       wybor: Wybor,
@@ -498,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);
     });
   });