From 64312ad5a64e090845a736166ee04274897b069d Mon Sep 17 00:00:00 2001 From: "maxime.point2" Date: Sat, 18 Nov 2023 23:12:50 +0100 Subject: [PATCH] ajout des fonctions perdus --- fluxRSS/src/controleur/AdminControleur.php | 18 +++++++++++++++- fluxRSS/src/controleur/UserControleur.php | 6 ++++-- fluxRSS/src/metier/Article.php | 6 ++++++ fluxRSS/templates/listArticle.html | 18 ++++++---------- fluxRSS/templates/listArticleAdmin.html | 25 +++++++++------------- 5 files changed, 43 insertions(+), 30 deletions(-) diff --git a/fluxRSS/src/controleur/AdminControleur.php b/fluxRSS/src/controleur/AdminControleur.php index 1ad46f0..9d8cadd 100755 --- a/fluxRSS/src/controleur/AdminControleur.php +++ b/fluxRSS/src/controleur/AdminControleur.php @@ -56,6 +56,10 @@ class AdminControleur $this->ajoutFlux(); break; + case 'changeNbArticle': + $this->changeNbArticle(); + break; + //mauvaise action default: $dVueEreur[] = "Erreur d'appel php"; @@ -79,9 +83,12 @@ class AdminControleur { global $twig; $articleModel = new ArticleModel(); + $nbArticle = isset($_SESSION['nbArticle']) ? intval($_SESSION['nbArticle']) : 5; + $allArticles = $articleModel->getArticles(); + $articles = array_slice($allArticles, 0, $nbArticle); if (AdminModel::isAdmin()) { $dVue = [ - 'data' => $articleModel->findAllArticleByAllFlux() + 'data' => $articles ]; echo $twig->render('listArticleAdmin.html', [ 'dVue' => $dVue, @@ -173,4 +180,13 @@ class AdminControleur $this->connection(); } } + + public function changeNbArticle() + { + if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['nbArticle'])) { + $_SESSION['nbArticle'] = $_POST['nbArticle']; + unset($_POST['action']); + } + $this->init(); + } } \ No newline at end of file diff --git a/fluxRSS/src/controleur/UserControleur.php b/fluxRSS/src/controleur/UserControleur.php index 247ab39..3246bc7 100755 --- a/fluxRSS/src/controleur/UserControleur.php +++ b/fluxRSS/src/controleur/UserControleur.php @@ -3,7 +3,6 @@ namespace controleur; use model\AdminModel; use model\ArticleModel; -use model\Parser; class UserControleur { @@ -59,8 +58,11 @@ class UserControleur { global $twig; $articleModel = new ArticleModel(); + $nbArticle = isset($_SESSION['nbArticle']) ? intval($_SESSION['nbArticle']) : 5; + $allArticles = $articleModel->getArticles(); + $articles = array_slice($allArticles, 0, $nbArticle); $dVue = [ - 'data' => $articleModel->findAllArticleByAllFlux() + 'data' => $articles ]; echo $twig->render('listArticle.html', [ 'dVue' => $dVue, diff --git a/fluxRSS/src/metier/Article.php b/fluxRSS/src/metier/Article.php index 6a2c8b2..e3c8cc7 100755 --- a/fluxRSS/src/metier/Article.php +++ b/fluxRSS/src/metier/Article.php @@ -2,6 +2,8 @@ namespace metier; +use DateTime; + class Article { private int $id; @@ -128,4 +130,8 @@ class Article return $this->title . $this->date . $this->description; } + public function dateStr(): string{ + $dateTime = new DateTime($this->date); + return $dateTime->format('d/m/y à H:i') . ''; + } } \ No newline at end of file diff --git a/fluxRSS/templates/listArticle.html b/fluxRSS/templates/listArticle.html index 7cb0003..4decf81 100755 --- a/fluxRSS/templates/listArticle.html +++ b/fluxRSS/templates/listArticle.html @@ -5,22 +5,16 @@ All Articles -{% for value in dVue.data %} -

- {{ value.0.getFlux() }} - {% for article in value.1 %} -

- {{article}} -

- {% endfor %} -
-
-

+{% for article in dVue.data %} +

+ {{article.dateStr()}} + {{ article.getTitle() }} + {{ article.getDescription() }} +

{% endfor %} {% if not isAdmin %} Connect {% else %} -Vue admin Déconnection {% endif %} diff --git a/fluxRSS/templates/listArticleAdmin.html b/fluxRSS/templates/listArticleAdmin.html index 2643f24..f028236 100755 --- a/fluxRSS/templates/listArticleAdmin.html +++ b/fluxRSS/templates/listArticleAdmin.html @@ -5,22 +5,17 @@ All Articles -admin -{% for value in dVue.data %} -
- {{ value.0.getFlux() }} -
- - -
- {% for article in value.1 %} -

- {{article}} -

- {% endfor %} -
+
+ + +
+{% for article in dVue.data %} +

+ {{article.dateStr()}} + {{ article.getTitle() }} + {{ article.getDescription() }} +

{% endfor %} -Vue user Vue flux Déconnection