Merge branch 'edumed' of https://github.com/fnp/redakcja into edumed

[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 3e7eadb..be94217 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, Uporzadkuj, Wybor, Zastap, excercise,
+  var $, Binding, EduModule, Excercise, Luki, 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; };
 


@@ -64,7 +64,7 @@
       var score, scores,
         _this = this;
       scores = [];
       var score, scores,
         _this = this;
       scores = [];

-      $(".question").each(function(i, question) {
+      $(".question", this.element).each(function(i, question) {

         return scores.push(_this.check_question(question));
       });
       score = [0, 0];
         return scores.push(_this.check_question(question));
       });
       score = [0, 0];


@@ -75,10 +75,31 @@
       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) {
     };
 
     Excercise.prototype.show_score = function(score) {


@@ -104,9 +125,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 +168,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;


@@ -280,13 +306,127 @@
 
   })(Excercise);
 
 
   })(Excercise);
 

+  Przyporzadkuj = (function(_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) {
+      var _this = this;
+      Przyporzadkuj.__super__.constructor.call(this, element);
+      this.multiple = this.is_multiple();
+      $(".question", this.element).each(function(i, question) {
+        var draggable_opts, helper_opts;
+        draggable_opts = {
+          revert: 'invalid'
+        };
+        if (_this.multiple) {
+          helper_opts = {
+            helper: "clone"
+          };
+        } else {
+          helper_opts = {};
+        }
+        $(".draggable", question).draggable($.extend({}, draggable_opts, helper_opts));
+        $(".predicate .droppable", question).droppable({
+          accept: function(draggable) {
+            var $draggable, $predicate, added, _i, _len, _ref;
+            $draggable = $(draggable);
+            if (!$draggable.is(".draggable")) return false;
+            $predicate = $(this);
+            _ref = $predicate.find("li");
+            for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+              added = _ref[_i];
+              if ($(added).text() === $draggable.text()) return false;
+            }
+            return true;
+          },
+          drop: function(ev, ui) {
+            var added;
+            added = ui.draggable.clone();
+            added.attr('style', '');
+            $(ev.target).append(added);
+            added.draggable(draggable_opts);
+            if (!_this.multiple || ui.draggable.closest(".predicate").length > 0) {
+              return ui.draggable.remove();
+            }
+          }
+        });
+        return $(".subject", question).droppable({
+          accept: ".draggable",
+          drop: function(ev, ui) {
+            var added;
+            if ($(ui.draggable).closest(".subject").length > 0) return;
+            added = ui.draggable.clone();
+            added.attr('style', '');
+            if (!_this.multiple) {
+              $(ev.target).append(added);
+              added.draggable($.extend({}, draggable_opts, helper_opts));
+            }
+            return ui.draggable.remove();
+          }
+        });
+      });
+    }
+
+    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 {
+        return [count, all];
+      }
+    };
+
+    return Przyporzadkuj;
+
+  })(Excercise);
+

   excercise = function(ele) {
     var cls, es;
     es = {
       wybor: Wybor,
       uporzadkuj: Uporzadkuj,
       luki: Luki,
   excercise = function(ele) {
     var cls, es;
     es = {
       wybor: Wybor,
       uporzadkuj: Uporzadkuj,
       luki: Luki,

-      zastap: Zastap
+      zastap: Zastap,
+      przyporzadkuj: Przyporzadkuj

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