exercises fix: count good and bad answers correctly

diff --git a/redakcja/static/edumed/js/edumed.coffee b/redakcja/static/edumed/js/edumed.coffee
index df8098b..fb8ea87 100644 (file)
--- a/redakcja/static/edumed/js/edumed.coffee
+++ b/redakcja/static/edumed/js/edumed.coffee
@@ -55,10 +55,11 @@ class Exercise extends Binding
     $(".question", @element).each (i, question) =>
       scores.push(@check_question question)
 
     $(".question", @element).each (i, question) =>
       scores.push(@check_question question)
 

-    score = [0, 0]
+    score = [0, 0, 0]

     $.each scores, (i, s) ->
       score[0] += s[0]
       score[1] += s[1]
     $.each scores, (i, s) ->
       score[0] += s[0]
       score[1] += s[1]

+      score[2] += s[2]

     @show_score(score)
 
   show_solutions: ->
     @show_score(score)
 
   show_solutions: ->


@@ -98,8 +99,8 @@ class Exercise extends Binding
 
   show_score: (score) ->
     $msg = $(".message", @element)
 
   show_score: (score) ->
     $msg = $(".message", @element)

-    $msg.text("Wynik: #{score[0]} / #{score[1]}")
-    if score[0] == score[1]
+    $msg.text("Wynik: #{score[0]} / #{score[2]}")
+    if score[0] >= score[2] and score[1] == 0

       $msg.addClass("maxscore")
     else
       $msg.removeClass("maxscore")
       $msg.addClass("maxscore")
     else
       $msg.removeClass("maxscore")


@@ -204,6 +205,7 @@ class Wybor extends Exercise
   check_question: (question) ->
     all = 0
     good = 0
   check_question: (question) ->
     all = 0
     good = 0

+    bad = 0

     solution = @get_value_list(question, 'solution')
     $(".question-piece", question).each (i, qpiece) =>
       piece_no = $(qpiece).attr 'data-no'
     solution = @get_value_list(question, 'solution')
     $(".question-piece", question).each (i, qpiece) =>
       piece_no = $(qpiece).attr 'data-no'


@@ -222,11 +224,12 @@ class Wybor extends Exercise
           good += 1
           @piece_correct qpiece
         else
           good += 1
           @piece_correct qpiece
         else

+          bad += 1

           @piece_incorrect qpiece
       else
         $(qpiece).removeClass("correct,incorrect")
 
           @piece_incorrect qpiece
       else
         $(qpiece).removeClass("correct,incorrect")
 

-    return [good, all]
+    return [good, bad, all]

 
   solve_question: (question) ->
     solution = @get_value_list(question, 'solution')
 
   solve_question: (question) ->
     solution = @get_value_list(question, 'solution')


@@ -253,6 +256,7 @@ class Uporzadkuj extends Exercise
     pkts = $('.question-piece', question)
 
     correct = 0
     pkts = $('.question-piece', question)
 
     correct = 0

+    bad = 0

     all = 0
 
     for pkt in [0...pkts.length]
     all = 0
 
     for pkt in [0...pkts.length]


@@ -261,8 +265,9 @@ class Uporzadkuj extends Exercise
         correct += 1
         @piece_correct pkts.eq(pkt)
       else
         correct += 1
         @piece_correct pkts.eq(pkt)
       else

+        bad += 1

         @piece_incorrect pkts.eq(pkt)
         @piece_incorrect pkts.eq(pkt)

-    return [correct, all]
+    return [correct, bad, all]

 
   solve_question: (question) ->
     positions = @get_value_list(question, 'original', true)
 
   solve_question: (question) ->
     positions = @get_value_list(question, 'original', true)


@@ -289,15 +294,17 @@ class Luki extends Exercise
   check: ->
     all = $(".placeholder", @element).length
     correct = 0
   check: ->
     all = $(".placeholder", @element).length
     correct = 0

+    bad = 0

     $(".placeholder + .question-piece", @element).each (i, qpiece) =>
       $placeholder = $(qpiece).prev(".placeholder")
       if $placeholder.data('solution') == $(qpiece).data('no')
         @piece_correct qpiece
         correct += 1
       else
     $(".placeholder + .question-piece", @element).each (i, qpiece) =>
       $placeholder = $(qpiece).prev(".placeholder")
       if $placeholder.data('solution') == $(qpiece).data('no')
         @piece_correct qpiece
         correct += 1
       else

+        bad += 1

         @piece_incorrect qpiece
 
         @piece_incorrect qpiece
 

-    @show_score [correct, all]
+    @show_score [correct, bad, all]

 
   solve_question: (question) ->
     $(".placeholder", question).each (i, placeholder) =>
 
   solve_question: (question) ->
     $(".placeholder", question).each (i, placeholder) =>


@@ -315,6 +322,7 @@ class Zastap extends Exercise
   check: ->
     all = 0
     correct = 0
   check: ->
     all = 0
     correct = 0

+    bad = 0

 
     $(".paragraph", @element).each (i, par) =>
       $(".placeholder", par).each (j, qpiece) =>
 
     $(".paragraph", @element).each (i, par) =>
       $(".placeholder", par).each (j, qpiece) =>


@@ -328,7 +336,7 @@ class Zastap extends Exercise
 
           all += 1
 
 
           all += 1
 

-    @show_score [correct, all]
+    @show_score [correct, bad, all]

 
   show_solutions: ->
     @reset()
 
   show_solutions: ->
     @reset()


@@ -393,14 +401,19 @@ class Przyporzadkuj extends Exercise
     # subjects placed in predicates
     minimum = $(question).data("minimum")
     count = 0
     # subjects placed in predicates
     minimum = $(question).data("minimum")
     count = 0

+    bad_count = 0

     all = 0
     if not minimum
     all = 0
     if not minimum

-      all = $(".subject .question-piece", question).length
+      self = this
+      $(".subject .question-piece", question).each (i, el) ->
+        v = self.get_value_optional_list el, 'solution'
+        mandatory = v[0]
+        all += mandatory.length

 
     for pred in $(".predicate [data-predicate]", question)
       pn = $(pred).attr('data-predicate')
 
     for pred in $(".predicate [data-predicate]", question)
       pn = $(pred).attr('data-predicate')

-      if minimum?
-        all += minimum
+      #if minimum?
+      #  all += minimum

 
       for qp in $(".question-piece", pred)
         v = @get_value_optional_list qp, 'solution'
 
       for qp in $(".question-piece", pred)
         v = @get_value_optional_list qp, 'solution'


@@ -411,9 +424,10 @@ class Przyporzadkuj extends Exercise
           count += 1
           @piece_correct qp
         else
           count += 1
           @piece_correct qp
         else

+          bad_count += 1

           @piece_incorrect qp
 
           @piece_incorrect qp
 

-    return [count, all]
+    return [count, bad_count, all]

 
   solve_question: (question) ->
     minimum = $(question).data("min")
 
   solve_question: (question) ->
     minimum = $(question).data("min")


@@ -454,16 +468,18 @@ class PrawdaFalsz extends Exercise
   check_question: ->
     all = 0
     good = 0
   check_question: ->
     all = 0
     good = 0

+    bad = 0

     for qp in $(".question-piece", @element)
       if $(qp).data("solution").toString() == $(qp).data("value")
         good += 1
         @piece_correct qp
       else
     for qp in $(".question-piece", @element)
       if $(qp).data("solution").toString() == $(qp).data("value")
         good += 1
         @piece_correct qp
       else

+        bad += 1

         @piece_incorrect qp
 
       all += 1
 
         @piece_incorrect qp
 
       all += 1
 

-    return [good, all]
+    return [good, bad, all]

 
   show_solutions: ->
     @reset()
 
   show_solutions: ->
     @reset()

diff --git a/redakcja/static/edumed/js/edumed.js b/redakcja/static/edumed/js/edumed.js
index b05cc9c..3262cac 100644 (file)
--- a/redakcja/static/edumed/js/edumed.js
+++ b/redakcja/static/edumed/js/edumed.js
@@ -81,10 +81,11 @@
       $(".question", this.element).each(function(i, question) {
         return scores.push(_this.check_question(question));
       });
       $(".question", this.element).each(function(i, question) {
         return scores.push(_this.check_question(question));
       });

-      score = [0, 0];
+      score = [0, 0, 0];

       $.each(scores, function(i, s) {
         score[0] += s[0];
       $.each(scores, function(i, s) {
         score[0] += s[0];

-        return score[1] += s[1];
+        score[1] += s[1];
+        return score[2] += s[2];

       });
       return this.show_score(score);
     };
       });
       return this.show_score(score);
     };


@@ -127,8 +128,8 @@
     Exercise.prototype.show_score = function(score) {
       var $msg;
       $msg = $(".message", this.element);
     Exercise.prototype.show_score = function(score) {
       var $msg;
       $msg = $(".message", this.element);

-      $msg.text("Wynik: " + score[0] + " / " + score[1]);
-      if (score[0] === score[1]) {
+      $msg.text("Wynik: " + score[0] + " / " + score[2]);
+      if (score[0] >= score[2] && score[1] === 0) {

         return $msg.addClass("maxscore");
       } else {
         return $msg.removeClass("maxscore");
         return $msg.addClass("maxscore");
       } else {
         return $msg.removeClass("maxscore");


@@ -237,10 +238,11 @@
     }
 
     Wybor.prototype.check_question = function(question) {
     }
 
     Wybor.prototype.check_question = function(question) {

-      var all, good, solution,
+      var all, bad, good, solution,

         _this = this;
       all = 0;
       good = 0;
         _this = this;
       all = 0;
       good = 0;

+      bad = 0;

       solution = this.get_value_list(question, 'solution');
       $(".question-piece", question).each(function(i, qpiece) {
         var is_checked, piece_name, piece_no, should_be_checked;
       solution = this.get_value_list(question, 'solution');
       $(".question-piece", question).each(function(i, qpiece) {
         var is_checked, piece_name, piece_no, should_be_checked;


@@ -260,13 +262,14 @@
             good += 1;
             return _this.piece_correct(qpiece);
           } else {
             good += 1;
             return _this.piece_correct(qpiece);
           } else {

+            bad += 1;

             return _this.piece_incorrect(qpiece);
           }
         } else {
           return $(qpiece).removeClass("correct,incorrect");
         }
       });
             return _this.piece_incorrect(qpiece);
           }
         } else {
           return $(qpiece).removeClass("correct,incorrect");
         }
       });

-      return [good, all];
+      return [good, bad, all];

     };
 
     Wybor.prototype.solve_question = function(question) {
     };
 
     Wybor.prototype.solve_question = function(question) {


@@ -304,11 +307,12 @@
     }
 
     Uporzadkuj.prototype.check_question = function(question) {
     }
 
     Uporzadkuj.prototype.check_question = function(question) {

-      var all, correct, pkt, pkts, positions, sorted, _i, _ref;
+      var all, bad, correct, pkt, pkts, positions, sorted, _i, _ref;

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

+      bad = 0;

       all = 0;
       for (pkt = _i = 0, _ref = pkts.length; 0 <= _ref ? _i < _ref : _i > _ref; pkt = 0 <= _ref ? ++_i : --_i) {
         all += 1;
       all = 0;
       for (pkt = _i = 0, _ref = pkts.length; 0 <= _ref ? _i < _ref : _i > _ref; pkt = 0 <= _ref ? ++_i : --_i) {
         all += 1;


@@ -316,10 +320,11 @@
           correct += 1;
           this.piece_correct(pkts.eq(pkt));
         } else {
           correct += 1;
           this.piece_correct(pkts.eq(pkt));
         } else {

+          bad += 1;

           this.piece_incorrect(pkts.eq(pkt));
         }
       }
           this.piece_incorrect(pkts.eq(pkt));
         }
       }

-      return [correct, all];
+      return [correct, bad, all];

     };
 
     Uporzadkuj.prototype.solve_question = function(question) {
     };
 
     Uporzadkuj.prototype.solve_question = function(question) {


@@ -362,10 +367,11 @@
     }
 
     Luki.prototype.check = function() {
     }
 
     Luki.prototype.check = function() {

-      var all, correct,
+      var all, bad, correct,

         _this = this;
       all = $(".placeholder", this.element).length;
       correct = 0;
         _this = this;
       all = $(".placeholder", this.element).length;
       correct = 0;

+      bad = 0;

       $(".placeholder + .question-piece", this.element).each(function(i, qpiece) {
         var $placeholder;
         $placeholder = $(qpiece).prev(".placeholder");
       $(".placeholder + .question-piece", this.element).each(function(i, qpiece) {
         var $placeholder;
         $placeholder = $(qpiece).prev(".placeholder");


@@ -373,10 +379,11 @@
           _this.piece_correct(qpiece);
           return correct += 1;
         } else {
           _this.piece_correct(qpiece);
           return correct += 1;
         } else {

+          bad += 1;

           return _this.piece_incorrect(qpiece);
         }
       });
           return _this.piece_incorrect(qpiece);
         }
       });

-      return this.show_score([correct, all]);
+      return this.show_score([correct, bad, all]);

     };
 
     Luki.prototype.solve_question = function(question) {
     };
 
     Luki.prototype.solve_question = function(question) {


@@ -406,10 +413,11 @@
     }
 
     Zastap.prototype.check = function() {
     }
 
     Zastap.prototype.check = function() {

-      var all, correct,
+      var all, bad, correct,

         _this = this;
       all = 0;
       correct = 0;
         _this = this;
       all = 0;
       correct = 0;

+      bad = 0;

       $(".paragraph", this.element).each(function(i, par) {
         return $(".placeholder", par).each(function(j, qpiece) {
           var $dragged, $qp;
       $(".paragraph", this.element).each(function(i, par) {
         return $(".placeholder", par).each(function(j, qpiece) {
           var $dragged, $qp;


@@ -424,7 +432,7 @@
           }
         });
       });
           }
         });
       });

-      return this.show_score([correct, all]);
+      return this.show_score([correct, bad, all]);

     };
 
     Zastap.prototype.show_solutions = function() {
     };
 
     Zastap.prototype.show_solutions = function() {


@@ -510,20 +518,24 @@
     };
 
     Przyporzadkuj.prototype.check_question = function(question) {
     };
 
     Przyporzadkuj.prototype.check_question = function(question) {

-      var all, count, mandatory, minimum, optional, pn, pred, qp, v, _i, _j, _len, _len1, _ref, _ref1;
+      var all, bad_count, count, mandatory, minimum, optional, pn, pred, qp, self, v, _i, _j, _len, _len1, _ref, _ref1;

       minimum = $(question).data("minimum");
       count = 0;
       minimum = $(question).data("minimum");
       count = 0;

+      bad_count = 0;

       all = 0;
       if (!minimum) {
       all = 0;
       if (!minimum) {

-        all = $(".subject .question-piece", question).length;
+        self = this;
+        $(".subject .question-piece", question).each(function(i, el) {
+          var mandatory, v;
+          v = self.get_value_optional_list(el, 'solution');
+          mandatory = v[0];
+          return all += mandatory.length;
+        });

       }
       _ref = $(".predicate [data-predicate]", question);
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
         pred = _ref[_i];
         pn = $(pred).attr('data-predicate');
       }
       _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];
         _ref1 = $(".question-piece", pred);
         for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
           qp = _ref1[_j];


@@ -534,11 +546,12 @@
             count += 1;
             this.piece_correct(qp);
           } else {
             count += 1;
             this.piece_correct(qp);
           } else {

+            bad_count += 1;

             this.piece_incorrect(qp);
           }
         }
       }
             this.piece_incorrect(qp);
           }
         }
       }

-      return [count, all];
+      return [count, bad_count, all];

     };
 
     Przyporzadkuj.prototype.solve_question = function(question) {
     };
 
     Przyporzadkuj.prototype.solve_question = function(question) {


@@ -602,9 +615,10 @@
     }
 
     PrawdaFalsz.prototype.check_question = function() {
     }
 
     PrawdaFalsz.prototype.check_question = function() {

-      var all, good, qp, _i, _len, _ref;
+      var all, bad, good, qp, _i, _len, _ref;

       all = 0;
       good = 0;
       all = 0;
       good = 0;

+      bad = 0;

       _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];


@@ -612,11 +626,12 @@
           good += 1;
           this.piece_correct(qp);
         } else {
           good += 1;
           this.piece_correct(qp);
         } else {

+          bad += 1;

           this.piece_incorrect(qp);
         }
         all += 1;
       }
           this.piece_incorrect(qp);
         }
         all += 1;
       }

-      return [good, all];
+      return [good, bad, all];

     };
 
     PrawdaFalsz.prototype.show_solutions = function() {
     };
 
     PrawdaFalsz.prototype.show_solutions = function() {