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

merge
1 year ago · 366e95f909
parent d96bcb3411 44c1f06f1c
commit 366e95f909
3 changed files with 10 additions and 5 deletions
--- a/Project/php/controller/UserController.php
+++ b/Project/php/controller/UserController.php
@ -50,7 +50,7 @@ class UserController extends VisitorController
            $this->showAccountInfos();
        }
        catch (Exception $e){
-            throw new Exception("invalid entries");
+            throw new Exception("invalid entries". $e->getMessage());
        }
    }

--- a/Project/php/controller/VisitorController.php
+++ b/Project/php/controller/VisitorController.php
@ -5,6 +5,7 @@ namespace controller;
 use config\Validation;
 use gateway\TranslationGateway;
 use gateway\VocabularyListGateway;
+use http\Message;
 use model\MdlUser;
 use Exception;

@ -54,7 +55,7 @@ class VisitorController

        }
        catch (Exception $e){
-            throw new Exception("Erreur");
+            throw new Exception($e->getMessage());
        }
    }
    public function quiz($match): void
@ -85,7 +86,9 @@ class VisitorController
            for ($i = 0; $i < count($questions); $i++) {
                $correctAnswer = $allTranslation[$i]->getWord2();
                array_splice($allEnglishWords, array_search($correctAnswer, $allEnglishWords), 1);
-
+                if(count($allEnglishWords) < 3) {
+                    throw new Exception("pas assez de vocabulaire");
+                }
                $tab = array_rand(array_flip($allEnglishWords), 3);

                array_push($allEnglishWords, $correctAnswer);
@ -112,7 +115,7 @@ class VisitorController
            }
        }
        catch (Exception $e){
-            throw new Exception("Erreur");
+            throw new Exception($e->getMessage());
        }
    }

--- a/Project/php/templates/erreur.html
+++ b/Project/php/templates/erreur.html
@ -32,6 +32,7 @@
      flex-direction: column;
      background-size: cover; /* Ajuster la taille de l'image pour couvrir tout le corps */
      background-position: center;
+      overflow: hidden;
    }
    .err{
      justify-content:center;
@ -54,7 +55,8 @@
  </style>

  <body>
-  <div class="err">
+  {% include 'navBar.twig' %}
+  <div class="err content">
    <h1> ERREUR</h1>
    {% if dVueEreur is defined %}
      {% for value in dVueEreur %}