css fix

[redakcja.git] / redakcja / static / edumed / js / edumed.js

diff --git a/redakcja/static/edumed/js/edumed.js b/redakcja/static/edumed/js/edumed.js
index 8948380..9d22b64 100644 (file)
--- a/redakcja/static/edumed/js/edumed.js
+++ b/redakcja/static/edumed/js/edumed.js
@@ -1,5 +1,5 @@
 (function() {
 (function() {

-  var $, Binding, EduModule, Excercise, Luki, Przyporzadkuj, Uporzadkuj, Wybor, Zastap, excercise,
+  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; };
 
     __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; };
 


@@ -75,16 +75,112 @@
       return this.show_score(score);
     };
 
       return this.show_score(score);
     };
 

-    Excercise.prototype.get_value_list = function(elem, data_key) {
-      return $(elem).data(data_key).split(',').map($.trim).map(function(x) {
-        return parseInt(x);
-      });
+    Excercise.prototype.get_value_list = function(elem, data_key, numbers) {
+      var vl;
+      vl = $(elem).attr("data-" + data_key).split(/[ ,]+/).map($.trim);
+      if (numbers) {
+        vl = vl.map(function(x) {
+          return parseInt(x);
+        });
+      }
+      return vl;
+    };
+
+    Excercise.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 = [];
+      opt = [];
+      for (_i = 0, _len = vals.length; _i < _len; _i++) {
+        v = vals[_i];
+        if (v.slice(-1) === "?") {
+          opt.push(v.slice(0, -1));
+        } else {
+          mandat.push(v);
+        }
+      }
+      return [mandat, opt];

     };
 
     Excercise.prototype.show_score = function(score) {
       return $(".message", this.element).text("Wynik: " + score[0] + " / " + score[1]);
     };
 
     };
 
     Excercise.prototype.show_score = function(score) {
       return $(".message", this.element).text("Wynik: " + score[0] + " / " + score[1]);
     };
 

+    Excercise.prototype.draggable_equal = function($draggable1, $draggable2) {
+      return false;
+    };
+
+    Excercise.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;
+      }
+      return true;
+    };
+
+    Excercise.prototype.draggable_dropped = function($draggable) {
+      return $draggable.append('<span class="close">x</span>');
+    };
+
+    Excercise.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'
+        };
+        $(".draggable", question).draggable(draggable_opts);
+        self = _this;
+        return $(".placeholder", question).droppable({
+          accept: function(draggable) {
+            var $draggable, is_accepted;
+            $draggable = $(draggable);
+            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;
+            $(ev.target).removeClass('accepting');
+            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();
+            });
+          },
+          over: function(ev, ui) {
+            return $(ev.target).addClass('dragover');
+          },
+          out: function(ev, ui) {
+            return $(ev.target).removeClass('dragover');
+          }
+        });
+      });
+    };
+

     return Excercise;
 
   })(Binding);
     return Excercise;
 
   })(Binding);


@@ -104,9 +200,14 @@
       good = 0;
       solution = this.get_value_list(question, 'solution');
       $(".question-piece", question).each(function(i, qpiece) {
       good = 0;
       solution = this.get_value_list(question, 'solution');
       $(".question-piece", question).each(function(i, qpiece) {

-        var is_checked, piece_no, should_be_checked;
-        piece_no = parseInt($(qpiece).attr('data-no'));
-        should_be_checked = solution.indexOf(piece_no) >= 0;
+        var is_checked, 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;
+        }

         is_checked = $("input", qpiece).is(":checked");
         if (should_be_checked) all += 1;
         if (is_checked) {
         is_checked = $("input", qpiece).is(":checked");
         if (should_be_checked) all += 1;
         if (is_checked) {


@@ -142,7 +243,7 @@
 
     Uporzadkuj.prototype.check_question = function(question) {
       var all, correct, pkt, pkts, positions, sorted, _ref;
 
     Uporzadkuj.prototype.check_question = function(question) {
       var all, correct, pkt, pkts, positions, sorted, _ref;

-      positions = this.get_value_list(question, 'original');
+      positions = this.get_value_list(question, 'original', true);

       sorted = positions.sort();
       pkts = $('.question-piece', question);
       correct = 0;
       sorted = positions.sort();
       pkts = $('.question-piece', question);
       correct = 0;


@@ -169,6 +270,7 @@
 
     function Luki(element) {
       Luki.__super__.constructor.call(this, element);
 
     function Luki(element) {
       Luki.__super__.constructor.call(this, element);

+      this.dragging(false, false);

     }
 
     Luki.prototype.check = function() {
     }
 
     Luki.prototype.check = function() {


@@ -176,8 +278,10 @@
         _this = this;
       all = 0;
       correct = 0;
         _this = this;
       all = 0;
       correct = 0;

-      $(".question-piece", this.element).each(function(i, qpiece) {
-        if ($(qpiece).data('solution') === $(qpiece).val()) {
+      $(".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;
         } else {
           _this.piece_correct(qpiece);
           correct += 1;
         } else {


@@ -200,14 +304,9 @@
       var _this = this;
       Zastap.__super__.constructor.call(this, element);
       $(".paragraph", this.element).each(function(i, par) {
       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() {
     }
 
     Zastap.prototype.check = function() {


@@ -215,24 +314,20 @@
         _this = this;
       all = 0;
       correct = 0;
         _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, should_be_checked;
+          should_be_checked = false;
+          $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]);
     };
       });
       return this.show_score([correct, all]);
     };


@@ -284,53 +379,109 @@
 
     __extends(Przyporzadkuj, _super);
 
 
     __extends(Przyporzadkuj, _super);
 

+    Przyporzadkuj.prototype.is_multiple = function() {
+      var qp, _i, _len, _ref;
+      _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;
+      }
+      return false;
+    };
+

     function Przyporzadkuj(element) {
     function Przyporzadkuj(element) {

-      var _this = this;

       Przyporzadkuj.__super__.constructor.call(this, element);
       Przyporzadkuj.__super__.constructor.call(this, element);

-      if (this.element.attr('multiple') != null) {
-        this.multiple = true;
+      this.multiple = this.is_multiple();
+      this.dragging(this.multiple, true);
+    }
+
+    Przyporzadkuj.prototype.draggable_equal = function(d1, d2) {
+      return d1.data("no") === d2.data("no");
+    };
+
+    Przyporzadkuj.prototype.check_question = function(question) {
+      var all, all_multiple, count, mandatory, optional, pn, pred, qp, v, _i, _j, _len, _len2, _ref, _ref2;
+      count = 0;
+      all = 0;
+      all_multiple = 0;
+      _ref = $(".predicate .question-piece", 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);
+        }
+        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;
+        }
+        return [count, all_multiple];

       } else {
       } else {

-        this.multiple = false;
+        return [count, all];

       }
       }

-      $(".question", this.element).each(function(i, question) {
-        var draggable_opts;
-        draggable_opts = {
-          revert: 'invalid',
-          helper: _this.multiple ? "clone" : null
-        };
-        $(".draggable", question).draggable(draggable_opts).droppable({
-          accept: ".draggable"
-        });
-        $(".predicate .droppable", question).droppable({
-          accept: ".draggable",
-          drop: function(ev, ui) {
-            var added, is_multiple;
-            is_multiple = ui.draggable.is(".multiple");
-            added = ui.draggable.clone();
-            added.attr('style', '');
-            $(this).append(added);
-            added.draggable(draggable_opts);
-            if (!is_multiple) return ui.draggable.remove();
-          }
+    };
+
+    return Przyporzadkuj;
+
+  })(Excercise);
+
+  PrawdaFalsz = (function(_super) {
+
+    __extends(PrawdaFalsz, _super);
+
+    function PrawdaFalsz(element) {
+      var qp, _i, _len, _ref;
+      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');

         });
         });

-        return $(".subject", question).droppable({
-          accept: ".draggable",
-          drop: function(ev, ui) {
-            var added, is_multiple;
-            is_multiple = ui.draggable.is(".multiple");
-            added = ui.draggable.clone();
-            added.attr('style', '');
-            if (!is_multiple) {
-              $(this).append(added);
-              added.draggable(draggable_opts);
-            }
-            return ui.draggable.remove();
-          }
+        $(".false", qp).click(function(ev) {
+          ev.preventDefault();
+          $(this).closest(".question-piece").data("value", "false");
+          return $(this).addClass('chosen').siblings('a').removeClass('chosen');

         });
         });

-      });
+      }

     }
 
     }
 

-    return Przyporzadkuj;
+    PrawdaFalsz.prototype.check_question = function() {
+      var all, good, qp, _i, _len, _ref;
+      all = 0;
+      good = 0;
+      _ref = $(".question-piece", this.element);
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        qp = _ref[_i];
+        if ($(qp).data("solution").toString() === $(qp).data("value")) {
+          good += 1;
+          this.piece_correct(qp);
+        } else {
+          this.piece_incorrect(qp);
+        }
+        all += 1;
+      }
+      return [good, all];
+    };
+
+    return PrawdaFalsz;

 
   })(Excercise);
 
 
   })(Excercise);
 


@@ -341,7 +492,8 @@
       uporzadkuj: Uporzadkuj,
       luki: Luki,
       zastap: Zastap,
       uporzadkuj: Uporzadkuj,
       luki: Luki,
       zastap: Zastap,

-      przyporzadkuj: Przyporzadkuj
+      przyporzadkuj: Przyporzadkuj,
+      prawdafalsz: PrawdaFalsz

     };
     cls = es[$(ele).attr('data-type')];
     return new cls(ele);
     };
     cls = es[$(ele).attr('data-type')];
     return new cls(ele);