maxscore style; fix exercise: Luki

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

diff --git a/catalogue/static/catalogue/js/edumed.js b/catalogue/static/catalogue/js/edumed.js
index a99377d..b05cc9c 100644 (file)
--- a/catalogue/static/catalogue/js/edumed.js
+++ b/catalogue/static/catalogue/js/edumed.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.4.0
+// Generated by CoffeeScript 1.3.3
 (function() {
   var $, Binding, EduModule, Exercise, Luki, PrawdaFalsz, Przyporzadkuj, Uporzadkuj, Wybor, Zastap, exercise,
     __hasProp = {}.hasOwnProperty,
@@ -40,8 +40,8 @@
       $(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();
@@ -125,7 +125,14 @@
     };
 
     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) {
@@ -357,18 +364,17 @@
     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 += 1;
+          return correct += 1;
         } else {
-          _this.piece_incorrect(qpiece);
+          return _this.piece_incorrect(qpiece);
         }
-        return all += 1;
       });
       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];
-        if ($(qp).data('solution').split(/[ ,]+/).length > 1) {
+        if ($(qp).attr('data-solution').split(/[ ,]+/).length > 1) {
           return true;
         }
       }
@@ -509,7 +515,7 @@
       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++) {