From ce1e779f1cf442a1337a2a12b9fe6033e065722a Mon Sep 17 00:00:00 2001 From: Sofiane Lasri <alasri250@gmail.com> Date: Mon, 17 Oct 2022 09:57:18 +0200 Subject: [PATCH] =?UTF-8?q?Recr=C3=A9ation=20du=20code=20termin=C3=A9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TP4/ex1/controller/ControleurAuteur.php | 12 +++++------- TP4/ex1/helpers/views.php | 7 +++---- TP4/ex1/index.php | 12 ++++++++---- TP4/ex1/resources/views/auteurs/auteur-info.php | 14 ++++++++++++++ TP4/ex1/resources/views/debut.php | 8 -------- TP4/ex1/resources/views/fin.html | 2 -- TP4/ex1/resources/views/lesAuteurs.php | 5 ----- TP4/ex1/resources/views/menu.html | 3 --- TP4/ex1/resources/views/unAuteur.php | 3 --- 9 files changed, 30 insertions(+), 36 deletions(-) create mode 100644 TP4/ex1/resources/views/auteurs/auteur-info.php delete mode 100644 TP4/ex1/resources/views/debut.php delete mode 100644 TP4/ex1/resources/views/fin.html delete mode 100644 TP4/ex1/resources/views/lesAuteurs.php delete mode 100644 TP4/ex1/resources/views/menu.html delete mode 100644 TP4/ex1/resources/views/unAuteur.php diff --git a/TP4/ex1/controller/ControleurAuteur.php b/TP4/ex1/controller/ControleurAuteur.php index d0b28fe..3a1f761 100644 --- a/TP4/ex1/controller/ControleurAuteur.php +++ b/TP4/ex1/controller/ControleurAuteur.php @@ -11,13 +11,11 @@ class ControleurAuteur public static function lireAuteur() { - $titre = "un auteur"; - $numAuteur = $_GET["numAuteur"]; - $auteur = Auteur::getAuteurByNum($numAuteur); - include("resources/views/debut.php"); - include("resources/views/menu.html"); - include("resources/views/unAuteur.php"); - include("resources/views/fin.html"); + if(empty($_GET["numAuteur"])){ + die("Le paramètre numAuteur n'est pas spécifié."); + } + $auteur = Auteur::getAuteurByNum($_GET["numAuteur"]); + return view('auteurs.auteur-info', ['auteur' => $auteur]); } } diff --git a/TP4/ex1/helpers/views.php b/TP4/ex1/helpers/views.php index b22aefb..97c4040 100644 --- a/TP4/ex1/helpers/views.php +++ b/TP4/ex1/helpers/views.php @@ -1,5 +1,5 @@ <?php -function view(string $viewName, array $args = []): bool +function view(string $viewName, array $args = []): string { $viewPathParts = explode(".", $viewName); $viewPath = ""; @@ -10,9 +10,8 @@ function view(string $viewName, array $args = []): bool if(file_exists($viewPath)){ extract($args); include $viewPath; - return true; + return ""; }else{ - echo "La vue " . $viewName . " est introuvable."; - return false; + return "La vue " . $viewName . " est introuvable."; } } \ No newline at end of file diff --git a/TP4/ex1/index.php b/TP4/ex1/index.php index 9887eb0..43e88f9 100644 --- a/TP4/ex1/index.php +++ b/TP4/ex1/index.php @@ -9,9 +9,13 @@ require_once("controller/ControleurAuteur.php"); Database::connect(); -$action = "lireAuteurs"; -if (isset($_GET["action"]) && in_array($_GET["action"], get_class_methods('ControleurAuteur'))) { - $action = $_GET["action"]; +if(empty($_GET["action"])){ + ControleurAuteur::lireAuteurs(); +}else{ + if(in_array($_GET["action"], get_class_methods('ControleurAuteur'))){ + $action = $_GET["action"]; + ControleurAuteur::$action(); + } } -ControleurAuteur::$action(); + ?> diff --git a/TP4/ex1/resources/views/auteurs/auteur-info.php b/TP4/ex1/resources/views/auteurs/auteur-info.php new file mode 100644 index 0000000..b8357ea --- /dev/null +++ b/TP4/ex1/resources/views/auteurs/auteur-info.php @@ -0,0 +1,14 @@ +<html lang="fr"> +<head> + <meta charset="utf-8"> + <title>Info de l'auteur</title> + <?=view('layouts.head')?> +</head> +<body class=""> +<div class="container"> + <h1>Information de l'auteur</h1> + <?=$auteur->afficher()?> +</div> +<?=view('layouts.footer')?> +</body> +</html><?php diff --git a/TP4/ex1/resources/views/debut.php b/TP4/ex1/resources/views/debut.php deleted file mode 100644 index 250267f..0000000 --- a/TP4/ex1/resources/views/debut.php +++ /dev/null @@ -1,8 +0,0 @@ -<!DOCTYPE html> -<html lang="fr"> - <head> - <meta charset="utf-8"> - <title><?php echo $titre; ?></title> - <link rel="stylesheet" href="css/styles.css"> - </head> - <body> diff --git a/TP4/ex1/resources/views/fin.html b/TP4/ex1/resources/views/fin.html deleted file mode 100644 index b605728..0000000 --- a/TP4/ex1/resources/views/fin.html +++ /dev/null @@ -1,2 +0,0 @@ - </body> -</html> diff --git a/TP4/ex1/resources/views/lesAuteurs.php b/TP4/ex1/resources/views/lesAuteurs.php deleted file mode 100644 index 17763fe..0000000 --- a/TP4/ex1/resources/views/lesAuteurs.php +++ /dev/null @@ -1,5 +0,0 @@ -<?php - foreach ($tableauAffichage as $ligne) { - echo $ligne; - } -?> diff --git a/TP4/ex1/resources/views/menu.html b/TP4/ex1/resources/views/menu.html deleted file mode 100644 index 80916a3..0000000 --- a/TP4/ex1/resources/views/menu.html +++ /dev/null @@ -1,3 +0,0 @@ -<nav> - <a href="index.php?action=lireAuteurs">tous les auteurs</a> -</nav> diff --git a/TP4/ex1/resources/views/unAuteur.php b/TP4/ex1/resources/views/unAuteur.php deleted file mode 100644 index 8e7b2b7..0000000 --- a/TP4/ex1/resources/views/unAuteur.php +++ /dev/null @@ -1,3 +0,0 @@ -<?php - $auteur->afficher(); -?> -- GitLab