Merge branch 'master' of https://codefirst.iut.uca.fr/git/nathan.boileau/Scripted

WEB/Controller/AdminController.php

@@ -252,7 +252,7 @@ class AdminController extends UserController
             $lesOrdres = [];
             $lesEnigmes=$model->getEnigmesSolo();
             foreach ($lesEnigmes as $enigme) {
-                $lesOrdres[] = array($enigme->getIdEnigme(),$_POST['ordre'.$enigme->getIdEnigme()]);
+                $lesOrdres[] = array($enigme->getIdEnigme(),(int)$_POST['ordre'.$enigme->getIdEnigme()]);
             }
             $model->modifOrdre($lesOrdres);
             echo '<script>alert("L\'ordre a bien été modifier.");</script>';

WEB/Controller/UserController.php

@@ -7,7 +7,7 @@ class UserController
         try {
             global $dsn, $rep, $vues, $error;
             $action = $_REQUEST['action'];
-            //register_event_handler('add_to_queue',array($this,"onAddToQueue"));
+            echo $action;
             switch ($action) {
                 case NULL:
                     $this->goToHome();
@@ -205,11 +205,12 @@ class UserController
             require($rep . $vues['queue']);
             $model = new UserModel();
             $model->addToQueue();
-            $usergroup = $model->findUserGroup();
+            $userGroup = $model->findUserGroup();
             echo
             '<script>
-                io.to($userGroup).emit("launchGame");
+                io.to('.$userGroup.').emit("launchGame");
             <script/>';
+
         } catch (Exception $e) {
             $error = $e->getMessage();
             require($rep . $vues['erreur']);

WEB/Model/AdminModel.php

@@ -86,13 +86,39 @@ async function submit(){
           }
         return $enigme;
     }
+
+    private function checkOrdre(array $lesOrdres){
+      $lesNombres = array();
+      foreach ($lesOrdres as $ordre) {
+          if ($ordre[1] < 1) {
+              return false;
+          }
+          $lesNombres[] = $ordre[1];
+      }
+      sort($lesNombres);
+      if ($lesNombres[0] != 1) {
+          return false;
+      }
+      $last = end($lesNombres);
+      $i = 0;
+      while ($i < $last) {
+          if ($lesNombres[$i] != $i+1) {
+          echo "Error";
+              return false;
+          }
+          $i++;
+      }
+      return true;
+  }
+    
     public function modifOrdre(array $lesOrdres){
-      $i = 1;
+      if (!$this->checkOrdre($lesOrdres)){
+        throw new Exception("Les ordres ne sont pas corrects");
+      }
       foreach ($lesOrdres as $ordre){
-        $enigme = $this->enigme_gateway->findById($ordre)[0];
+        $enigme = $this->enigme_gateway->findById($ordre[0])[0];
-        $enigme->setOrdre($i);
+        $enigme->setOrdre($ordre[1]);
         $this->enigme_gateway->update($enigme);
-        $i++;
       }
     }
 }

WEB/View/src/pages/Admin/ModifOrdre.php

@@ -21,13 +21,13 @@
     <div class="container">
         <div class="row">
             <div class="col">
-                <a class="btn btn-primary m-3" href="index.php?action=modifOrdre" role="button">Retour</a>
+                <a class="btn btn-primary m-3" href="index.php?action=goToSeeOrdre" role="button">Retour</a>
                 <h1>Ordre des énigmes</h1>
             </div>
         </div>
         <div class="row">
             <div class="col">
-            <form action="" method="POST">
+            <form action="index.php?action=modifOrdre" method="POST">
                 <table class="table table-striped">
                     <thead>
                         <tr>

WEB/View/src/pages/Main.php

@@ -88,7 +88,7 @@
                 class="d-flex flex-column align-items-center align-self-end p-0 m-0 user-select-none"
                 id="container"
               >
-                <a class="mb-5 p-2" id="btn" href="index?action=goToAdmin">
+                <a class="mb-5 p-2" id="btn" href="index.php?action=goToAdmin">
                   <span id="icon">
                     <svg
                       fill="#ffffff"