diff --git a/.vs/Scripted/v17/.suo b/.vs/Scripted/v17/.suo new file mode 100644 index 00000000..3be1f926 Binary files /dev/null and b/.vs/Scripted/v17/.suo differ diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite new file mode 100644 index 00000000..f524a4dc Binary files /dev/null and b/.vs/slnx.sqlite differ diff --git a/WEB/Controller/VisitorController.php b/WEB/Controller/VisitorController.php index ec9d57bb..03ab22dc 100644 --- a/WEB/Controller/VisitorController.php +++ b/WEB/Controller/VisitorController.php @@ -29,6 +29,8 @@ class VisitorController case "goToSignUp": $model->goToSignUp(); break; + case "goToQueue": + $model->goToLogin(); default: $error = "Action non valide"; require($rep . $vues['erreur']); diff --git a/WEB/Model/UserModel.php b/WEB/Model/UserModel.php index 4592b5a1..5cc15853 100644 --- a/WEB/Model/UserModel.php +++ b/WEB/Model/UserModel.php @@ -55,25 +55,29 @@ class UserModel { global $rep, $vues, $error; try { - require($rep . $vues['Queue']); + //require($rep . $vues['Queue']); + $this->addToQueue(); } catch (Exception $e) { $error = "404"; require($rep . $vues['erreur']); } + } + + public function addToQueue(){ if ($this->partie_gateway->partieInQueueExists()) { $tabEnigme = $this->enigme_gateway->findMultiEnigma(); $idNewPartie = $this->partie_gateway->findPartieMaxId(); $partie=$this->partie_gateway->creerPartieMulti($idNewPartie,$tabEnigme); } else{ - $IdPartieInQueue = $this->partie_gateway->findPartieInQueue(); - $tabEnigme = $this->enigme_gateway->findEnigmaFromPartie($Idpartie); - $partie = $this->partie_gateway->creerPartieMulti($IdPartieInQueue, $tabEnigme); + $idPartieInQueue = $this->partie_gateway->findPartieInQueue(); + $tabEnigme = $this->enigme_gateway->findEnigmaFromPartie($idPartieInQueue); + $partie = $this->partie_gateway->creerPartieMulti($idPartieInQueue, $tabEnigme); } $this->utilisateur_gateway->addToQueue($_SESSION['utilisateur'],$partie); if ($this->utilisateur_gateway->queueFilled()) { - echo "Partie is launched" + echo "Partie is launched"; /*$this->launchGame();*/ } }