From: Vincent Vanwaelscappel Date: Wed, 6 Apr 2022 10:59:20 +0000 (+0200) Subject: wait #5193 @3 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=2ac25c11e093b2f728ebb9b28db0e9921061f2b8;p=Animations.git wait #5193 @3 --- diff --git a/RedbullShopper101/WhatCanWeMeasure/Measure.pdf b/RedbullShopper101/WhatCanWeMeasure/Measure.pdf index 8fd5845..db85cf5 100644 Binary files a/RedbullShopper101/WhatCanWeMeasure/Measure.pdf and b/RedbullShopper101/WhatCanWeMeasure/Measure.pdf differ diff --git a/RedbullShopper101/WhatCanWeMeasure/Measure2.pdf b/RedbullShopper101/WhatCanWeMeasure/Measure2.pdf new file mode 100644 index 0000000..634689f Binary files /dev/null and b/RedbullShopper101/WhatCanWeMeasure/Measure2.pdf differ diff --git a/RedbullShopper101/WhatCanWeMeasure/Measureclean.pdf b/RedbullShopper101/WhatCanWeMeasure/Measureclean.pdf new file mode 100644 index 0000000..ad7e629 Binary files /dev/null and b/RedbullShopper101/WhatCanWeMeasure/Measureclean.pdf differ diff --git a/RedbullShopper101/WhatCanWeMeasure/WhatCanWeMeasure.zip b/RedbullShopper101/WhatCanWeMeasure/WhatCanWeMeasure.zip new file mode 100644 index 0000000..4b24ba8 Binary files /dev/null and b/RedbullShopper101/WhatCanWeMeasure/WhatCanWeMeasure.zip differ diff --git a/RedbullShopper101/WhatCanWeMeasure/back.jpg b/RedbullShopper101/WhatCanWeMeasure/back.jpg new file mode 100644 index 0000000..5957184 Binary files /dev/null and b/RedbullShopper101/WhatCanWeMeasure/back.jpg differ diff --git a/RedbullShopper101/WhatCanWeMeasure/fcb.woff b/RedbullShopper101/WhatCanWeMeasure/fcb.woff new file mode 100644 index 0000000..e26fede Binary files /dev/null and b/RedbullShopper101/WhatCanWeMeasure/fcb.woff differ diff --git a/RedbullShopper101/WhatCanWeMeasure/index.html b/RedbullShopper101/WhatCanWeMeasure/index.html index 4c08e20..f422a53 100644 --- a/RedbullShopper101/WhatCanWeMeasure/index.html +++ b/RedbullShopper101/WhatCanWeMeasure/index.html @@ -6,12 +6,24 @@ Title - - + + +
+ + + + + + + + + +
2
+
+ + +
@@ -57,7 +215,6 @@
-
diff --git a/RedbullShopper101/WhatCanWeMeasure/p11.svg b/RedbullShopper101/WhatCanWeMeasure/p11.svg index c72aab8..e67d2d5 100644 --- a/RedbullShopper101/WhatCanWeMeasure/p11.svg +++ b/RedbullShopper101/WhatCanWeMeasure/p11.svg @@ -95,51 +95,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -326,9 +281,6 @@ - - - @@ -557,192 +509,49 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - + + - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - - + + - + - + - + - - - - - - - - - - - - - - - - - - - - - + @@ -792,9 +601,9 @@ - + - + @@ -1505,144 +1314,17 @@ - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/RedbullShopper101/WhatCanWeMeasure/p12.svg b/RedbullShopper101/WhatCanWeMeasure/p12.svg index 1e51f17..5bd39b0 100644 --- a/RedbullShopper101/WhatCanWeMeasure/p12.svg +++ b/RedbullShopper101/WhatCanWeMeasure/p12.svg @@ -3,732 +3,357 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + - - + + - - - - + + + + - - - - - + + + + + - + - - + + - - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - + - - - - - - - - - + + + + + + + + + - - + + - + - - + + - - + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - + - - - - - - - - - + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - + + diff --git a/RedbullShopper101/WhatCanWeMeasure/wcwm.js b/RedbullShopper101/WhatCanWeMeasure/wcwm.js index 8c082e8..9f1534f 100644 --- a/RedbullShopper101/WhatCanWeMeasure/wcwm.js +++ b/RedbullShopper101/WhatCanWeMeasure/wcwm.js @@ -1,5 +1,73 @@ $(function () { + window.activeScreen = 0; + window.answers = {}; + window.correctAnswers = {1: 2, 3: 1, 5: 3, 7: 3, 9: 2}; for (var i = 1; i <= 12; i++) { $('#screen_' + i).html(''); } -}); \ No newline at end of file + $("#start").on('click', function () { + setActiveScreen(1); + }); + $("[data-a]").on('click', function () { + window.answers[window.activeScreen] = $(this).data('a'); + setActiveScreen(window.activeScreen + 1); + return false; + }); + $("#next").on('click', function () { + setActiveScreen(window.activeScreen + 1); + return false; + }); + $("#retry").on('click', function () { + window.answers = {}; + setActiveScreen(1); + return false; + }); + + $('#readmore').on('click', function () { + $("#infos").addClass('show'); + $("#closemore").show(); + return false; + }); + + $("#closemore").on('click', function () { + $("#infos").removeClass('show'); + $("#closemore").hide(); + return false; + }); + setActiveScreen(0); +}); + +function setActiveScreen(i) { + window.activeScreen = i; + $('body').attr('data-screen', i); + $('[data-screens]').each(function () { + if ($(this).data('screens').toString().split(',').indexOf(i.toString()) >= 0) { + $(this).show(); + } else { + $(this).hide(); + } + }); + setTimeout(function () { + $('#screens > div:not(#screen_' + i + ')').removeClass('show'); + }, 300) + $("#screen_" + i).addClass('show'); + if (i >= 11) { + updateScore(); + } + +} + +function updateScore() { + var s = 0; + $.each(window.answers, function (k, v) { + if (window.correctAnswers[k] == v) { + if (k === 7 || k == 9) { + s += 0.5; + } else { + s++; + } + } + }); + s = Math.floor(s); + $("#score").text(s); +} \ No newline at end of file