diff --git a/RedbullShopper101/BubbleQuiz/results.pdf b/RedbullShopper101/BubbleQuiz/results.pdf index 4f8f560..88ca0a1 100644 Binary files a/RedbullShopper101/BubbleQuiz/results.pdf and b/RedbullShopper101/BubbleQuiz/results.pdf differ diff --git a/RedbullShopper101/BubbleQuiz/results.svg b/RedbullShopper101/BubbleQuiz/results.svg index cc8cc27..745da2f 100644 --- a/RedbullShopper101/BubbleQuiz/results.svg +++ b/RedbullShopper101/BubbleQuiz/results.svg @@ -755,6 +755,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2928,5 +2976,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/RedbullShopper101/VisualTriggers/VisualTriggers.zip b/RedbullShopper101/VisualTriggers/VisualTriggers.zip index 5774d7a..642e577 100644 Binary files a/RedbullShopper101/VisualTriggers/VisualTriggers.zip and b/RedbullShopper101/VisualTriggers/VisualTriggers.zip differ diff --git a/RedbullShopper101/VisualTriggers/visualtriggers.js b/RedbullShopper101/VisualTriggers/visualtriggers.js index b8cebce..96ce158 100644 --- a/RedbullShopper101/VisualTriggers/visualtriggers.js +++ b/RedbullShopper101/VisualTriggers/visualtriggers.js @@ -88,22 +88,24 @@ function setActiveScreen(i) { $("#screen_" + i).addClass('show'); $(".m").remove(); $(".done,.active").removeClass('active').removeClass('done'); - updateScore(); + updateScore(i); } -function updateScore() { - var s = 0; - $.each(window.answers, function (k, v) { - var ok = true; - $.each(v, function (kk, vv) { - if (vv === 'wrong') { - ok = false; +function updateScore(i) { + var t = ''; + + var tot = {2: 4, 4: 5, 6: 3}; + if ([0, 1, 3, 5].indexOf(i) >= 0) { + t = ''; + } else { + var s = 0; + $.each(window.answers[i - 1], function (k, v) { + if (v !== 'wrong') { + s++; } }); - if (ok) { - s++; - } - }); + t = s + '/' + tot[i]; + } - $("#score").text(s + "/3"); + $("#score").text(t); } \ No newline at end of file