wip #6182 @0:20 (correction bug) renvoyer une réponse vide lorsque le joueur valide...

diff --git a/resources/quizv2/js/quiz.js b/resources/quizv2/js/quiz.js
index dd28bfd0776e6701d50d93eb6528134484554ae1..90957606e5adcd540e671a75df7742a1d1df4d4f 100644 (file)
--- a/resources/quizv2/js/quiz.js
+++ b/resources/quizv2/js/quiz.js
@@ -98,6 +98,7 @@ Quiz.prototype = {
         $(document).on("click", ".next .action", function () {
             let responses = $this.responses
             $this.next(responses);
+            $this.responses = []
         })
         key('space', function (e){
             e.preventDefault()
@@ -110,7 +111,6 @@ Quiz.prototype = {
         })
         key('r', function (e){
             e.preventDefault()
-            console.log(e)
             $this.resetForm()
         })
 
@@ -185,14 +185,15 @@ Quiz.prototype = {
         }
     },
 
-    //
+    // marque page automatique
+    // si le joueur recharge la page, le rediriger là où il en était
     setDisplay: function() {
         const   currentQuestion = quiz.score.lastAnsweredQuestion + 1,
                 questions = this.quiz.questions
 
         if(questions.length > 0) {
             if (quiz.score.lastAnsweredQuestion > -1 && questions.length <= currentQuestion) {
-
+                //
             }
         }
     },
@@ -290,6 +291,13 @@ Quiz.prototype = {
         let status = quiz.score.questionStatus
         let reviewList = this.question.getAll();
 
+        const counter = $("#progress-counter")
+        if(score < (maxScore / 2)) {
+            counter.addClass("nok")
+        }else if(score >= (maxScore / 2)) {
+            counter.addClass("ok")
+        }
+
         reviewList = reviewList.map((c,i) => {
             return {
                 'question': c['question'],
@@ -304,9 +312,15 @@ Quiz.prototype = {
         $("[id^=score-]").text(score)
         $("[id^=maxScore-]").text(maxScore)
 
+        //
+        // HANDLEBARS TEMPLATING
+        //
+        // on applique une incrementation de +1
+        // utilisé pour la numérotation des questions
         Handlebars.registerHelper("inc", (value) => { return parseInt(value) + 1; });
 
-        const source = $("#template").html();
+        // on envoie le html avec les nouvelles données
+        const source = $("#template-answers-review").html();
         const template = Handlebars.compile(source);
         const html = template({reviewList: reviewList});
         $ul.html(html)

diff --git a/resources/quizv2/style/105-outro.sass b/resources/quizv2/style/105-outro.sass
index 0b2e9da5f60cbba7bbabf4b2669c91a27094ffdf..0438c0ee8f9cf6101efeb6bb5dfaeb1831dd4496 100644 (file)
--- a/resources/quizv2/style/105-outro.sass
+++ b/resources/quizv2/style/105-outro.sass
@@ -42,6 +42,11 @@
             border-radius: 100px
             background: transparent
             +flex-config(center,false,false,center)
+            &.nok *
+                color: $nok-color
+            &.ok *
+                color: $ok-color
+
             svg
                 overflow: visible
                 width: calc(100% - 12px)
@@ -53,7 +58,6 @@
                 circle:not(#progress-circle)
                     +opacity(.16,color,$texts-color)
                 circle#progress-circle
-                    color: $ok-color
                     transition: stroke-dashoffset 0.5s ease-in-out
 
     &-answers-review

diff --git a/resources/views/quizv2/screens/outro.blade.php b/resources/views/quizv2/screens/outro.blade.php
index e289f90427ddeaa69ae5817c95e3d6bac40581cd..d0b14167794fba9ef8ca787c741de5745db83502 100644 (file)
--- a/resources/views/quizv2/screens/outro.blade.php
+++ b/resources/views/quizv2/screens/outro.blade.php
@@ -5,7 +5,7 @@
             <div class="score-content-wrapper">
                 <div class="score-counter">
                     <div id="progress-counter">
-                        <span id="score-counter">0</span>/<span id="maxScore-counter">0</span>
+                        <span id="score-counter">0</span><span>/</span><span id="maxScore-counter">0</span>
                         <svg width="100%" height="100%" id="svg">
                             <circle cx="50%" cy="50%" r="50%" fill="transparent" stroke="currentColor" />
                             <circle id="progress-circle" cx="50%" cy="50%" r="50%" fill="none" stroke="currentColor" />
@@ -37,7 +37,7 @@
             <p class="subtitle">Review your answers before you go</p>
             <ul id="answers-list">
                 @verbatim
-                <script id="template" type="text/x-handlebars-template">
+                <script id="template-answers-review" type="text/x-handlebars-template">
                     {{#each reviewList}}
                         <li class="item {{this.status}}">
                             <p class="position">Question {{inc @index}}</p>