wip #6182 @1:30 gestion navigation status, image de fond pour les questions standards

diff --git a/resources/quizv2/js/quiz.js b/resources/quizv2/js/quiz.js
index 57ca88fa03fb66092ce8c2241ea72a7fa83bce11..6f20504f8b199cf03b5aa60e661d0d7f4f3adb95 100644 (file)
--- a/resources/quizv2/js/quiz.js
+++ b/resources/quizv2/js/quiz.js
@@ -155,6 +155,7 @@ Quiz.prototype = {
         this.updateBtnValidation()
     },
 
+    //
     setDisplay: function() {
         const   currentQuestion = quiz.score.lastAnsweredQuestion + 1,
                 questions = this.quiz.questions
@@ -199,20 +200,22 @@ Quiz.prototype = {
 
     activeNav: function(position = 1) {
         const questionStatus = quiz.score.questionStatus
-        console.log("position",position,"status",questionStatus)
+        const lastAnsweredQuestion = quiz.score.lastAnsweredQuestion
         let $el = $(".progress-container .progress-item:nth-child("+position+")")
+
         $(".progress-container .progress-item").removeClass("active")
         $el.addClass("active")
 
-        for(let k in questionStatus) {
-            let n = (k + 1)
-            let $el = $(".progress-container .progress-item:nth-child("+n+")")
-            if(questionStatus[k].ok === 'ok') {
-                $el.addClass("ok")
+        let n = (lastAnsweredQuestion + 1)
+        let $_el = $(".progress-container .progress-item:nth-child("+n+")")
+
+        if(lastAnsweredQuestion > -1) {
+            if (questionStatus[lastAnsweredQuestion].ok === 'ok') {
+                $_el.addClass("ok")
             }
 
-            if(questionStatus[k].ok === 'nok'){
-                $el.addClass("nok")
+            if (questionStatus[lastAnsweredQuestion].ok === 'nok') {
+                $_el.addClass("nok")
             }
         }
     },

diff --git a/resources/views/quizv2/index.blade.php b/resources/views/quizv2/index.blade.php
index a2ff8a67d67eddf6bd1fe4d6491f5d2a968fb18c..320473fb1233ff5460cf3eba1cf94f906edbcf09 100644 (file)
--- a/resources/views/quizv2/index.blade.php
+++ b/resources/views/quizv2/index.blade.php
@@ -21,7 +21,7 @@
             @include('quizv2.screens.intro', ['data'=> $data])
         @endif
         @foreach($data->questions as $key => $question)
-            @include('quizv2.screens.question_'.$question['type'], ['data'=> $question, 'max' => $totalQuestion, 'position' => $key, 'alphabet' => $alphabet])
+            @include('quizv2.screens.question_'.$question['type'], ['theme' => $data->theme, 'data'=> $question, 'max' => $totalQuestion, 'position' => $key, 'alphabet' => $alphabet])
         @endforeach
         <div id="anim"></div>
     </div>

diff --git a/resources/views/quizv2/screens/question_multiple.blade.php b/resources/views/quizv2/screens/question_multiple.blade.php
index 8b90b32abfdbf4b7fba78e9888b71e0e1d97ca30..6357f4897f8e1e52f87f96069a83c0b160cf0d3f 100644 (file)
--- a/resources/views/quizv2/screens/question_multiple.blade.php
+++ b/resources/views/quizv2/screens/question_multiple.blade.php
@@ -16,6 +16,7 @@
         </form>
     </div>
     <div class="screen-image">
+        <img src="{{$theme->standardImage}}">
     </div>
     @include('quizv2.footer', ['data' => $data, 'reset' => true, 'text' => 'Validate answer', 'info' => true])
 </div>