alix.jeudi--lemoine
/
ScienceQuest
forked from tom.biard/ScienceQuest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ADD : Affichage de l'historique

Browse Source
php
Renaud BEURET 1 year ago
parent f9ac7ef338
commit cd0a41b5dd
8 changed files with 160 additions and 8 deletions
Show Stats Download Patch File Download Diff File

4
project/src/config/config.php
Unescape View File

@ -4,9 +4,9 @@ namespace config;
$config = [
"rep" => __DIR__.'/../',
"db" => ["dsn" => 'pgsql:host=localhost;dbname=postgres',
"db" => ["dsn" => 'pgsql:host=localhost;dbname=sae2a',
"login" => 'postgres',
"mdp" => 'root'],
"mdp" => 'SKf43V4hmD7a'],
"templates" => ["index" => 'vues/index.php',
"pseudo" => 'pseudo.html',
"jouer" => "jouer.html",

14
project/src/controller/FrontController.php
Unescape View File

@ -38,7 +38,7 @@ class FrontController
$router->map('GET|POST','/pseudo/[a:action]?','PseudoController');
$router->map('GET|POST','/admin/[a:action]?/[i:id]?','AdminController');
$router->map('GET|POST','/[a:action]?','UserController');
$router->map('GET|POST','/[a:action]?/[i:id]?','UserController');
try {
session_start();
@ -46,8 +46,17 @@ class FrontController
die('Session start failed: ' . $e->getMessage());
}
if(isset($_SESSION['pseudo']))
$dVue['idAdmin'] = false;
$dVue['idUser'] = false;
if(isset($_SESSION['pseudo'])) {
$dVue['pseudo'] = $_SESSION['pseudo'];
if (isset($_SESSION['isUser']) && $_SESSION['isUser']) {
$dVue['isUser'] = true;
} elseif (isset($_SESSION['idAdmin']) && $_SESSION['idAdmin']) {
$dVue['isAdmin'] = true;
}
}
try {
$match = $router->match();
@ -84,6 +93,7 @@ class FrontController
echo $twig->render('login.html');
} catch (Exception $e2) {
$dVueErreur[] = 'Erreur inattendue !';
$dVueErreur[] = $e2->getMessage();
echo $twig->render('erreur.html', ['dVueErreur' => $dVueErreur]);
}

35
project/src/controller/UserController.php
Unescape View File

@ -9,6 +9,7 @@ use model\Connection;
use model\GameGateway;
use model\MdlDifficulte;
use model\MdlJeu;
use model\MdlScientifique;
use model\PseudoDejaPrisException;
use model\ValidationException;
use model\MdlUser;
@ -23,6 +24,39 @@ class UserController {
echo $twig->render('accueil.html', ["dVue"=>$dVue]);
}
public function historique(array $params) {
global $twig;
global $dVueErreur;
global $dVue;
$ms = new MdlScientifique();
if (!isset($params['id'])) {
$page = 1;
} else {
$page = Validation::valPosInt($params['id']);
}
$pseudo = Validation::valPseudo($_SESSION['pseudo'],$dVueErreur);
$dVue['listeScientifiques'] = $ms->getHistoriqueParPage($pseudo,$page);
$dVue['pageMax'] = $ms->getMaxPagesHistorique($pseudo);
$dVue['page'] = $page;
if ($page - 1 <= 0) {
$dVue['pagePrec'] = 1;
} else {
$dVue['pagePrec'] = $page - 1;
}
if ($page + 1 >= $dVue['pageMax']) {
$dVue['pageSuiv'] = $dVue['pageMax'];
} else {
$dVue['pageSuiv'] = $page + 1;
}
echo $twig->render('historique.html',['dVue' => $dVue]);
}
public function joinParty(array $params) {
global $twig;
@ -76,6 +110,7 @@ class UserController {
$ug = new MdlUser();
if ($ug->login($_REQUEST['login'], $_REQUEST['password'])) {
$_SESSION['pseudo'] = $_REQUEST['login'];
$_SESSION['idUser'] = true;
$_SESSION['isLogged'] = true;
header("Location: .");
} else {

2
project/src/db.sql
Unescape View File

@ -191,5 +191,7 @@ INSERT INTO Joueur(id,pseudo) VALUES (1337, 'moi, le meilleur joueur du monde');
INSERT INTO Utilisateur(idJoueur,email,password) VALUES (1337, 'joueur','$2y$10$juGnlWC9cS19popEKLZsYeir0Jl39k6hDl0dpaCix00FDcdiEbtmS');
-- mdp = test
INSERT INTO decouvrir(idUtilisateur,idScientifique) VALUES (1337,1);
INSERT INTO Admin(id,email,password) VALUES (1, 'admin','$2y$10$juGnlWC9cS19popEKLZsYeir0Jl39k6hDl0dpaCix00FDcdiEbtmS');
-- mdp = test

29
project/src/model/gateways/ScientifiqueGateway.php
Unescape View File

@ -58,12 +58,40 @@ class ScientifiqueGateway
return $this->con->getResults();
}
public function getHistorique(string $pseudoJoueur, int $currentPage, int $nbElemByPage) : array {
$query = 'SELECT s.*
FROM Scientifique s, Decouvrir d, Utilisateur u
WHERE s.id = d.idscientifique
AND d.idutilisateur = u.idJoueur
AND u.email = :pseudo
LIMIT :nbElem OFFSET :ind ';
$index = ($currentPage-1)*$nbElemByPage;
$this->con->executeQuery($query,array(
':ind' => array($index,\PDO::PARAM_INT),
':nbElem' => array($nbElemByPage,\PDO::PARAM_INT),
':pseudo' => array($pseudoJoueur,\PDO::PARAM_STR)
));
return $this->con->getResults();
}
public function getNbScientifique() : int {
$query = 'SELECT DISTINCT count(*) as val FROM Scientifique';
$this->con->executeQuery($query);
return $this->con->getResults()[0]['val'];
}
public function getNbScientifiqueHistorique(string $pseudoJoueur) : int {
$query = 'SELECT count(s.*) as val
FROM Scientifique s, Decouvrir d, Utilisateur u
WHERE s.id = d.idscientifique
AND d.idutilisateur = u.idJoueur
AND u.email = :pseudo';
$params = array(
':pseudo' => array($pseudoJoueur,\PDO::PARAM_STR)
);
$this->con->executeQuery($query,$params);
return $this->con->getResults()[0]['val'];
}
/**
* @throws Exception
@ -117,7 +145,6 @@ class ScientifiqueGateway
JOIN Reponse r ON q.id = r.idQuestion
WHERE r.idScientifique = :idScientifique
ORDER BY RANDOM() LIMIT 5";
$params = [":idScientifique" => [$idScientifique, $this->con::PARAM_INT]];
$this->con->executeQuery($query, $params);

33
project/src/model/mdl/MdlScientifique.php
Unescape View File

@ -77,11 +77,42 @@ class MdlScientifique extends MdlBase{
}
return $scientifiques;
}
public function getHistoriqueParPage(string $pseudoJoueur,int $page) {
$nbElemParPage = 20;
$pageMax = ceil($this->gw->getNbScientifiqueHistorique($pseudoJoueur)/$nbElemParPage);
print($pageMax);
if ($page <= 0) {
$page = 1;
} elseif ($page > $pageMax) {
$page = $pageMax;
}
$result = $this->gw->getHistorique($pseudoJoueur,$page,$nbElemParPage);
$scientifiques = array();
foreach ($result as $scientifique) {
$sexe = $this->mdlSexe->getFromId($scientifique['idsexe']);
$difficulte = $this->mdlDifficulte->getFromId($scientifique['iddifficulte']);
$thematique = $this->mdlThematique->getFromId($scientifique['idthematique']);
$scientifiques[] = new Scientifique($scientifique['id'],
$scientifique['nom'],
$scientifique['prenom'],
$scientifique['photo'],
new DateTime($scientifique['datenaissance']),
$scientifique['descriptif'],
$scientifique['ratiotrouvee'],
$thematique,
$difficulte,
$sexe);
}
return $scientifiques;
}
public function getMaxPages() : int {
$nbElemParPage = 20;
return ceil($this->gw->getNbScientifique()/$nbElemParPage);
}
public function getMaxPagesHistorique(string $pseudo) : int {
$nbElemParPage = 20;
return ceil($this->gw->getNbScientifiqueHistorique($pseudo)/$nbElemParPage);
}
public function editScientifique(Scientifique $s){
return $this->gw->editScientifique($s);

7
project/src/templates/accueil.html
Unescape View File

@ -23,11 +23,14 @@
{% endif %}
<!--FIN TODO-->
<div align="right">
{% if dVue.pseudo is defined %}
<p align="right"><a href="logout">{{dVue.pseudo}}</a></p>
<p><a href="logout">{{dVue.pseudo}}</a></p>
<p><a href="historique">Historique</a></p>
{% else %}
<p align="right"><a href="login">Se connecter</a></p>
<p><a href="login">Se connecter</a></p>
{% endif %}
</div>
<br><br><br><br>
<center>

44
project/src/templates/historique.html
Unescape View File

@ -0,0 +1,44 @@
<!DOCTYPE html>
<html lang="fr">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="stylesheet" href="css/bootstrap.min.css">
<style>
body {
margin: 10px;
}
</style>
<title>Historique des scientifiques découverts :</title>
</head>
<body>
<h1>Voici l'historique des scientifiques découverts :</h1>
<p align="right"><a href="logout">{{dVue.pseudo}}</a></p>
<br><br><br><br>
<center>
{% for scientifique in dVue.listeScientifiques %}
<div>
<h2>{{ scientifique.getNom() }} {{ scientifique.getPrenom() }}</h2>
<p>Sexe : {{ scientifique.getSexe() }}</p>
<p>Né(e) le {{ scientifique.getDateNess() }}</p>
<p>Thematique : {{ scientifique.getThematique() }}</p>
<p>Difficulté à trouver : {{ scientifique.getDifficulte() }}</p>
</div>
<br>
<br>
{% endfor %}
<div>
<a href="{{ dVue.pagePrec }}"><</a>
<a href="1">1</a>
<p>{{ dVue.page }}</p>
<a href="{{ dVue.pageMax }}">1</a>
<a href="{{ dVue.pageSuiv }}">></a>
</div>
</center>
<script src="js/bootstrap.min.js"></script>
</body>
</html>
Write Preview
Loading…
Cancel
Save