Merge branch 'php' of https://codefirst.iut.uca.fr/git/antoine.jourdain/SAE_2A_Anglais into php

Project/php/controller/AbsController.php

@@ -92,15 +92,15 @@ class AbsController
             throw new Exception("Erreur");
         }
     }
-    public static function quiz(): void
+    public function quiz($match): void
     {
         global $twig;
-        $vocabId = $_GET['vocabID'];
+        $vocabId = Validation::filter_int($match['params']['id'] ?? null);
         $mdl = new TranslationGateway();
         $allTranslation = $mdl->findByIdVoc($vocabId);
         $shuffle = $allTranslation;
         shuffle($shuffle);
-        echo $twig->render('quizzView.html', ['translations' => $allTranslation, 'randomtranslations']);
+        echo $twig->render('quizzView.html', ['translations' => $allTranslation, 'randomtranslations' => $shuffle]);
     }
 
     public function login(): void {

Project/php/controller/FrontController.php

@@ -43,6 +43,7 @@ class FrontController
                         break;
 
                     default :
+                        if ($id != null && !$this->checkIdExist($id)) throw new Exception("identifiant invalide");
                         if ($target == null) throw new Exception("pas de target");
 
                         if (isset($_SESSION['login']) && isset($_SESSION['roles'])) {

Project/php/templates/quizzView.html

@@ -8,19 +8,28 @@
 <section>
   <h1>Quiz</h1>
 
-    {% if translations is defined %}
-    {% for translation in translations %}
+  {% if translations is defined %}
+  {% for translation in translations %}
   <h2>{{ translation.word1 }}</h2>
-    {% set correctAnswer = translation.word2 %}
-    {% set otherTranslations = [translation.word2, translations[0].word2, translations[1].word2, translations[2].word2]  %}
-    <input type="radio" name="answer" value="{{ correctAnswer }}"> {{ correctAnswer }}<br>
-    {% for otherTranslation in otherTranslations %}
-    {% if otherTranslation != correctAnswer %}
-  <input type="radio" name="answer" value="{{ otherAnswer }}"> {{ otherAnswer }}<br>
+  {% set correctAnswer = translation.word2 %}
+  {% if randomtranslations is defined %}
+  {% set otherTranslations = [correctAnswer] %}
+  {% for randomtranslation in randomtranslations %}
+  {% if randomtranslation.word2 != correctAnswer and otherTranslations|length <= 3 %}
+  {% set otherTranslations = otherTranslations|merge([randomtranslation.word2]) %}
+  {% endif %}
+  {% endfor %}
+
+
+
+  {# Affichage des réponses sous forme de radio buttons #}
+  <input type="radio" name="answer" value="{{ correctAnswer }}"> {{ correctAnswer }}<br>
+  {% for otherTranslation in otherTranslations %}
+  <input type="radio" name="answer" value="{{ otherTranslation }}"> {{ otherTranslation }}<br>
+  {% endfor %}
+  {% endif %}
+  {% endfor %}
   {% endif %}
-    {% endfor %}
-    {% endfor %}
-    {% endif %}
     <input type="submit" value="Submit" name="submitForm">
   </form>
   {% if submitted %}