Fix for Uporzadkuj.

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

diff --git a/redakcja/static/edumed/js/edumed.coffee b/redakcja/static/edumed/js/edumed.coffee
index 24955fd..cb51547 100644 (file)
--- a/redakcja/static/edumed/js/edumed.coffee
+++ b/redakcja/static/edumed/js/edumed.coffee
@@ -25,8 +25,8 @@ class Exercise extends Binding
 
     $(".check", @element).click (ev) =>
       @check()
-      $(ev.target).next(".retry").show()
-      $(ev.target).hide()
+      $(".retry", @element).show()
+      $(".check", @element).hide()
     $(".retry", @element).click (ev) =>
       @retry()
     $('.solutions', @element).click =>
@@ -55,10 +55,11 @@ class Exercise extends Binding
     $(".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]
+      score[2] += s[2]
     @show_score(score)
 
   show_solutions: ->
@@ -97,7 +98,12 @@ class Exercise extends Binding
     return [mandat, opt]
 
   show_score: (score) ->
-    $(".message", @element).text("Wynik: #{score[0]} / #{score[1]}")
+    $msg = $(".message", @element)
+    $msg.text("Wynik: #{score[0]} / #{score[2]}")
+    if score[0] >= score[2] and score[1] == 0
+      $msg.addClass("maxscore")
+    else
+      $msg.removeClass("maxscore")
 
 
   draggable_equal: ($draggable1, $draggable2) ->
@@ -199,6 +205,7 @@ class Wybor extends Exercise
   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'
@@ -217,11 +224,12 @@ class Wybor extends Exercise
           good += 1
           @piece_correct qpiece
         else
+          bad += 1
           @piece_incorrect qpiece
       else
         $(qpiece).removeClass("correct,incorrect")
 
-    return [good, all]
+    return [good, bad, all]
 
   solve_question: (question) ->
     solution = @get_value_list(question, 'solution')
@@ -244,10 +252,11 @@ class Uporzadkuj extends Exercise
 
   check_question: (question) ->
     positions = @get_value_list(question, 'original', true)
-    sorted = positions.sort()
+    sorted = positions.sort (a, b) -> a - b
     pkts = $('.question-piece', question)
 
     correct = 0
+    bad = 0
     all = 0
 
     for pkt in [0...pkts.length]
@@ -256,23 +265,16 @@ class Uporzadkuj extends Exercise
         correct += 1
         @piece_correct pkts.eq(pkt)
       else
+        bad += 1
         @piece_incorrect pkts.eq(pkt)
-    return [correct, all]
+    return [correct, bad, all]
 
   solve_question: (question) ->
-    positions = @get_value_list(question, 'original', true)
-    sorted = positions.sort()
     pkts = $('.question-piece', question)
-    pkts.sort (a, b) ->
-      q = $(a).data('pos')
-      w = $(b).data('pos')
-      return 1 if q < w
-      return -1 if q > w
-      return 0
-
+    pkts.sort (a, b) -> return $(a).data('pos') - $(b).data('pos')
     parent = pkts.eq(0).parent()
     for p in pkts
-      parent.prepend(p)
+      parent.append(p)
 
 
 # XXX propozycje="1/0"
@@ -282,18 +284,19 @@ class Luki extends Exercise
     @dragging false, false
 
   check: ->
-    all = 0
+    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
+        bad += 1
         @piece_incorrect qpiece
-      all += 1
 
-    @show_score [correct, all]
+    @show_score [correct, bad, all]
 
   solve_question: (question) ->
     $(".placeholder", question).each (i, placeholder) =>
@@ -311,6 +314,7 @@ class Zastap extends Exercise
   check: ->
     all = 0
     correct = 0
+    bad = 0
 
     $(".paragraph", @element).each (i, par) =>
       $(".placeholder", par).each (j, qpiece) =>
@@ -324,7 +328,7 @@ class Zastap extends Exercise
 
           all += 1
 
-    @show_score [correct, all]
+    @show_score [correct, bad, all]
 
   show_solutions: ->
     @reset()
@@ -370,7 +374,7 @@ class Zastap extends Exercise
 class Przyporzadkuj extends Exercise
   is_multiple: ->
     for qp in $(".question-piece", @element)
-      if $(qp).data('solution').split(/[ ,]+/).length > 1
+      if $(qp).attr('data-solution').split(/[ ,]+/).length > 1
         return true
     return false
 
@@ -389,14 +393,19 @@ class Przyporzadkuj extends Exercise
     # subjects placed in predicates
     minimum = $(question).data("minimum")
     count = 0
+    bad_count = 0
     all = 0
     if not minimum
-      all = $(".subjects .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')
-      if minimum?
-        all += minimum
+      #if minimum?
+      #  all += minimum
 
       for qp in $(".question-piece", pred)
         v = @get_value_optional_list qp, 'solution'
@@ -407,9 +416,10 @@ class Przyporzadkuj extends Exercise
           count += 1
           @piece_correct qp
         else
+          bad_count += 1
           @piece_incorrect qp
 
-    return [count, all]
+    return [count, bad_count, all]
 
   solve_question: (question) ->
     minimum = $(question).data("min")
@@ -450,16 +460,18 @@ class PrawdaFalsz extends Exercise
   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
+        bad += 1
         @piece_incorrect qp
 
       all += 1
 
-    return [good, all]
+    return [good, bad, all]
 
   show_solutions: ->
     @reset()