fix Luki.check counter; fix check buttons

[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 1886b38..b05cc9c 100644 (file)
--- a/redakcja/static/edumed/js/edumed.js
+++ b/redakcja/static/edumed/js/edumed.js
@@ -40,8 +40,8 @@
       $(this.element).data("exercise-html", $(this.element).html());
       $(".check", this.element).click(function(ev) {
         _this.check();
       $(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).show();
+        return $(".check", _this.element).hide();

       });
       $(".retry", this.element).click(function(ev) {
         return _this.retry();
       });
       $(".retry", this.element).click(function(ev) {
         return _this.retry();


@@ -125,7 +125,14 @@
     };
 
     Exercise.prototype.show_score = function(score) {
     };
 
     Exercise.prototype.show_score = function(score) {

-      return $(".message", this.element).text("Wynik: " + score[0] + " / " + score[1]);
+      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");
+      }

     };
 
     Exercise.prototype.draggable_equal = function($draggable1, $draggable2) {
     };
 
     Exercise.prototype.draggable_equal = function($draggable1, $draggable2) {


@@ -357,18 +364,17 @@
     Luki.prototype.check = function() {
       var all, correct,
         _this = this;
     Luki.prototype.check = function() {
       var all, correct,
         _this = this;

-      all = 0;
+      all = $(".placeholder", this.element).length;

       correct = 0;
       $(".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 = 0;
       $(".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;
+          return correct += 1;

         } else {
         } else {

-          _this.piece_incorrect(qpiece);
+          return _this.piece_incorrect(qpiece);

         }
         }

-        return all += 1;

       });
       return this.show_score([correct, all]);
     };
       });
       return this.show_score([correct, all]);
     };


@@ -486,7 +492,7 @@
       _ref = $(".question-piece", this.element);
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
         qp = _ref[_i];
       _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;
         }
       }
           return true;
         }
       }


@@ -509,7 +515,7 @@
       count = 0;
       all = 0;
       if (!minimum) {
       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++) {
       }
       _ref = $(".predicate [data-predicate]", question);
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {


@@ -557,7 +563,7 @@
             m = draggables[_j];
             $pr = $(".predicate [data-predicate=" + m + "]", question);
             $ph = $pr.find(".placeholder:visible");
             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));
           }
           return _results1;
         }).call(this));


@@ -574,22 +580,23 @@
     __extends(PrawdaFalsz, _super);
 
     function PrawdaFalsz(element) {
     __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();
       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.retry();
-          $(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();
         });
         $(".false", qp).click(function(ev) {
           ev.preventDefault();

-          this.retry();
-          $(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');

         });
       }
     }
         });
       }
     }