12 files changed, 192 insertions, 77 deletions

diff --git a/src/controller/ArticleController.php b/src/controller/ArticleController.php
index 411c1dc..8bbef19 100644
--- a/src/controller/ArticleController.php
+++ b/src/controller/ArticleController.php
@@ -6,10 +6,51 @@ declare(strict_types=1);
 use App\Entity\Node;
 use App\Entity\Article;
 use Doctrine\ORM\EntityManager;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
 class ArticleController
 {
+        static public function fetch(EntityManager $entityManager, Request $request): void
+        {
+                if($request->query->has('id') && !empty($request->query->get('id')) && $request->query->has('last_article')){
+                        //var_dump($request->query->get('last_article'));
+                        $id = (int)$request->get('id'); // type et nettoie
+                        $director = new Director($entityManager);
+                        $director->findNodeById($id);
+                        $parent_block = $director->getNode();
+
+                        if(Blocks::hasPresentation($parent_block->getName())){
+                                $get_articles_return = $director->getNextArticles($parent_block, $request);
+                                $bulk_data = $get_articles_return[0];
+
+                                if($parent_block->getName() === 'post_block'){
+                                        $builder_name = 'PostBuilder';
+                                }
+                                elseif($parent_block->getName() === 'news_block'){
+                                        $builder_name = 'NewBuilder';
+                                }
+
+                                $html = '';
+                                foreach($bulk_data as $article){
+                                        $builder = new $builder_name($article);
+                                        $html .= $builder->render();
+                                }
+
+                                echo json_encode(['success' => true, 'html' => $html, 'truncated' => $get_articles_return[1]]);
+                                die;
+                        }
+                        else{
+                                echo json_encode(['success' => false, 'error' => 'mauvais type de bloc']);
+                                die;
+                        }
+                }
+                else{
+                        echo json_encode(['success' => false, 'error' => 'la requête ne comporte pas les paramètres attendus']);
+                        die;
+                }
+        }
+
         static public function editorSubmit(EntityManager $entityManager, array $json): void
         {
                 if(json_last_error() === JSON_ERROR_NONE)
diff --git a/src/controller/Director.php b/src/controller/Director.php
index 8f038fa..9c1c6e3 100644
--- a/src/controller/Director.php
+++ b/src/controller/Director.php
@@ -1,12 +1,14 @@
 <?php
 // src/controller/Director.php
 
+// => src/model/Model.php serait mieux
+
 declare(strict_types=1);
 
 use Doctrine\ORM\EntityManager;
 use App\Entity\Page;
 use App\Entity\Node;
-//use Doctrine\ORM\QueryBuilder;
+use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\HttpFoundation\Request;
 
 class Director
@@ -24,7 +26,9 @@ class Director
         $this->node = new Node; // instance mère "vide" ne possédant rien d'autre que des enfants
         }
 
-    public function makeMenuAndPaths(): void
+    // à déplacer dans Path ou un truc comme ça?
+    // couper Director en deux classes NodeModel et PageModel?
+    public function makeMenuAndPaths(): void // lit la table "page"
     {
         self::$menu_data = new Menu($this->entityManager);
         self::$page_path = new Path();
@@ -41,13 +45,12 @@ class Director
     }
 
     // affichage d'une page ordinaire
-        public function getWholePageData(Request $request): void
+        public function getWholePageData(Request $request): void // lit la table "node" + jointures
     {
         $id = CURRENT_PAGE === 'article' ? htmlspecialchars($request->query->get('id')) : '';
 
-        if($id === '') // page "normale"
-        {
-            // tous les noeuds sauf les articles, tri par page
+        if($id === ''){ // page "normale"
+            // récupérer tous les noeuds sauf les articles
             $dql = "SELECT n FROM App\Entity\Node n WHERE n.name_node != 'new' AND n.name_node != 'post' AND (n.page = :page OR n.page IS null)";
             $bulk_data = $this->entityManager
                 ->createQuery($dql)
@@ -57,45 +60,11 @@ class Director
             // groupes d'articles triés par bloc, permet de paginer par bloc
             foreach($bulk_data as $parent_block){
                 if(Blocks::hasPresentation($parent_block->getName())){ // = post_block ou news_block
-                    $qb = $this->entityManager->createQueryBuilder();
-                    $qb->select('n')
-                       ->from('App\Entity\Node', 'n')
-                       ->where('n.parent = :parent')
-                       ->setParameter('parent', $parent_block);
-
-                    if($parent_block->getName() === 'post_block'){
-                        $qb->orderBy('n.position');
-                    }
-                    elseif($parent_block->getName() === 'news_block'){
-                        $qb->join('n.article', 'a');
-                        if($parent_block->getNodeData()->getChronoOrder() ?? false){ // ordre antichrono par défaut
-                            $qb->orderBy('a.date_time', 'ASC');
-                        }
-                        else{
-                            $qb->orderBy('a.date_time', 'DESC');
-                        }
-                    }
-
-                    // pagination
-                    $limit = $parent_block->getNodeData()->getPaginationLimit() ?? 0; // 0 par défaut = pas de pagination, sinon 12 rend bien avec des grilles de 2, 3 ou 4 colonnes
-                    if($limit > 0){
-                        //$this->paginateWithCursor($qb, $request->query->get('last_position') ?? 0, $limit);
-                        $qb->andWhere('n.position > :last_position')
-                           ->setParameter('last_position', $request->query->get('last_position') ?? 0)
-                           ->setMaxResults($limit);
-
-                        $nb_pages = $this->getNumberOfPages($parent_block, $limit); // nombres de "pages" d'articles
-                        if($nb_pages > 1){
-                            //$parent_block->setNumberOfPages($nb_pages); // => navigation en HTML
-                        }
-                    }
-
-                    $bulk_data = array_merge($bulk_data, $qb->getQuery()->getResult());
+                    $bulk_data = array_merge($bulk_data, $this->getNextArticles($parent_block, $request)[0]);
                 }
             }
         }
-        else // page "article"
-        {
+        else{ // page "article"
             $dql = 'SELECT n FROM App\Entity\Node n WHERE n.page = :page OR n.page IS null OR n.id_node = :id';
             $bulk_data = $this->entityManager
                 ->createQuery($dql)
@@ -103,18 +72,74 @@ class Director
                 ->setParameter('id', $id)
                 ->getResult();
         }
+
         $this->makeNodeTree($bulk_data);
     }
 
-    /*private function paginateWithCursor(QueryBuilder $qb, int $last_position = 0, int $limit = 0): void
+    // récupération d'articles
+    public function getNextArticles(Node $parent_block, Request $request): array
+    {
+        $qb = $this->entityManager->createQueryBuilder();
+        $qb->select('n')
+           ->from('App\Entity\Node', 'n')
+           ->where('n.parent = :parent')
+           ->setParameter('parent', $parent_block);
+
+        if($parent_block->getName() === 'post_block'){
+            $qb->orderBy('n.position');
+        }
+        elseif($parent_block->getName() === 'news_block'){
+            $qb->join('n.article', 'a');
+            if($parent_block->getNodeData()->getChronoOrder() ?? false){ // ordre antichrono par défaut
+                $qb->orderBy('a.date_time', 'ASC');
+            }
+            else{
+                $qb->orderBy('a.date_time', 'DESC');
+            }
+        }
+
+        // pagination
+        $limit = $parent_block->getNodeData()->getPaginationLimit(); // = 12 par défaut si = null en BDD
+        $this->paginateWithCursor($qb, $parent_block, $request->query->get('last_article'));
+        $result = $qb->getQuery()->getResult();
+
+        // il reste des articles à récupérer SI on vient d'en récupérer trop
+        // ET on gère le cas particulier de $limit <= 0
+        $truncated = false;
+        if(count($result) > $limit && $limit > 0){ // si nb résultat > limit > 0
+            $truncated = true;
+            array_pop($result); // compenser le $limit + 1 dans paginateWithCursor
+        }
+        
+        return [$result, $truncated]; // besoin exceptionnel de retourner deux valeurs
+    }
+
+    private function paginateWithCursor(QueryBuilder $qb, Node $parent_block, ?string $last_article): void
     {
-        $qb->andWhere('n.position > :last_position')
-           ->setParameter('last_position', $last_position)
-           ->setMaxResults($limit);
-    }*/
+        //var_dump($last_article);
+        $limit = $parent_block->getNodeData()->getPaginationLimit(); // = 12 par défaut si = null en BDD
+
+        if($limit > 0){ // si 0 ou moins pas de pagination
+            // nombres de "pages" d'articles
+            $nb_pages = $this->getNumberOfPages($parent_block, $limit);
+            $parent_block->getNodeData()->setNumberOfPages($nb_pages > 1 ? $nb_pages : 1);
+
+            // adaptation de la requête
+            if($parent_block->getName() === 'post_block'){
+                $qb->andWhere('n.position > :last_position')
+                   ->setParameter('last_position', empty($last_article) ? 0 : $last_article)
+                   ->setMaxResults($limit + 1);
+            }
+            elseif($parent_block->getName() === 'news_block'){
+                $cursor_start = $parent_block->getNodeData()->getChronoOrder() ? '1970-01-01' : '9999-12-31';
+                $qb->andWhere($parent_block->getNodeData()->getChronoOrder() ? 'a.date_time > :date_time' : 'a.date_time < :date_time')
+                    ->setParameter('date_time', empty($last_article) ? $cursor_start : $last_article)
+                    ->setMaxResults($limit + 1);
+            }
+        }
+    }
 
-    // requête à part n'alimentant pas $bulk_data
-    // fonctionnalité offerte par le Paginator de doctrine si on décidait de s'en servir
+    // le Paginator de doctrine le fait aussi si on décidait de s'en servir
     private function getNumberOfPages(Node $parent_block, int $limit): int
     {
         $dql = 'SELECT COUNT(n.id_node) FROM App\Entity\Node n WHERE n.parent = :parent';
@@ -129,11 +154,9 @@ class Director
     {
         // puis on les range
         // (attention, risque de disfonctionnement si les noeuds de 1er niveau ne sont pas récupérés en 1er dans la BDD)
-        foreach($bulk_data as $node)
-        {
+        foreach($bulk_data as $node){
             // premier niveau
-            if($node->getParent() == null)
-            {
+            if($node->getParent() == null){
                 $this->node->addChild($node);
 
                 // spécifique page article
@@ -142,8 +165,7 @@ class Director
                 }
             }
             // autres niveaux
-            else
-            {
+            else{
                 $node->getParent()->addChild($node);
 
                 // spécifique page article
diff --git a/src/controller/PageManagementController.php b/src/controller/PageManagementController.php
index 2cc88a5..8efcb79 100644
--- a/src/controller/PageManagementController.php
+++ b/src/controller/PageManagementController.php
@@ -334,4 +334,21 @@ class PageManagementController
                 }
                 die;
         }
+        static public function changePaginationLimit(EntityManager $entityManager, array $json): void
+        {
+                if(isset($json['id']) && isset($json['pagination_limit'])){
+                        $director = new Director($entityManager);
+                        $director->findNodeById($json['id']);
+                        $old_limit = $director->getNode()->getNodeData()->getPaginationLimit() ?? 12;
+                        $director->getNode()->getNodeData()->setPaginationLimit((int)$json['pagination_limit']); // attention conversion?
+
+                        $entityManager->flush();
+
+                        echo json_encode(['success' => true, 'old_limit' => $old_limit, 'new_limit' => $json['pagination_limit']]);
+                }
+                else{
+                        echo json_encode(['success' => false]);
+                }
+                die;
+        }
 }
\ No newline at end of file
diff --git a/src/model/entities/NodeData.php b/src/model/entities/NodeData.php
index 1d7db4c..d8281c0 100644
--- a/src/model/entities/NodeData.php
+++ b/src/model/entities/NodeData.php
@@ -48,6 +48,8 @@ class NodeData
     )]
     private Collection $images;
 
+    private int $nb_pages = 1;
+
     public function __construct(array $data, Node $node, Collection $images = new ArrayCollection, ?string $presentation = null, ?bool $chrono_order = null)
     {
         $this->data = $data;
@@ -111,7 +113,20 @@ class NodeData
 
     public function getPaginationLimit(): ?int
     {
-        return $this->pagination_limit ?? null;
+        $default = 12; // si 0 pas de pagination, 12 rend bien avec des grilles de 2, 3 ou 4 colonnes
+        return $this->pagination_limit === null ? $default : $this->pagination_limit;
+    }
+    public function setPaginationLimit(int $pagination_limit): void
+    {
+        $this->pagination_limit = $pagination_limit;
+    }
+    public function getNumberOfPages(): int
+    {
+        return $this->nb_pages;
+    }
+    public function setNumberOfPages(int $nb_pages): void
+    {
+        $this->nb_pages = $nb_pages;
     }
     
     /*public function setNode(Node $node): void
diff --git a/src/router.php b/src/router.php
index 773a25c..8d19e49 100644
--- a/src/router.php
+++ b/src/router.php
@@ -1,7 +1,7 @@
 <?php
 // src/router.php
 //
-/* fonctionnement du routeur
+/* fonctionnement:
 => 1er test, méthode http: GET, POST ou autre chose
 => 2ème test, type de contenu (méthode POST uniquement):
 "application/x-www-form-urlencoded" = formulaire
@@ -13,22 +13,27 @@ $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest' requête AJAX xhs, non uti
 
 declare(strict_types=1);
 
-if($_SERVER['REQUEST_METHOD'] === 'GET'){
+if($request->getMethod() === 'GET'){
     // table "user" vide
     if(!UserController::existUsers($entityManager)){
-        require '../src/view/templates/user_create.php';
+        require AbstractBuilder::VIEWS_PATH . 'user_create.php';
         die;
     }
 
-    // bouton déconnexion
+    // bouton déconnexion (méthode GET parce que l'utilisateur ne modifie plus de données à partir de là)
     if($request->query->has('action') && $request->query->get('action') === 'deconnection'){
         UserController::disconnect($entityManager);
     }
 
+    // articles suivants
+    if($request->query->has('fetch') && $request->query->get('fetch') === 'next_articles'){
+        ArticleController::fetch($entityManager, $request);
+    }
+
     // données du calendrier
     // création du calendrier et changement de dates affichées (boutons flèches mais pas changement de vue)
-    if($_SERVER['REQUEST_METHOD'] === 'GET' && $request->query->has('action') && $request->query->get('action') === 'get_events'
-        && $request->query->has('start') && $request->query->has('end') && empty($_POST))
+    if($request->query->has('action') && $request->query->get('action') === 'get_events'
+        && $request->query->has('start') && $request->query->has('end') && empty($request->getPayload()->all())) // getPayload ne récupère pas que des POST
     {
         CalendarController::getData($entityManager);
     }
@@ -43,7 +48,7 @@ if($_SERVER['REQUEST_METHOD'] === 'GET'){
 }
 
 
-elseif($_SERVER['REQUEST_METHOD'] === 'POST'){
+elseif($request->getMethod() === 'POST'){
     /* -- contrôleurs appellables par tout le monde -- */
 
     // table "user" vide
@@ -54,8 +59,7 @@ elseif($_SERVER['REQUEST_METHOD'] === 'POST'){
     // requêtes JSON avec fetch()
     if($_SERVER['CONTENT_TYPE'] === 'application/json')
     {
-        $data = file_get_contents('php://input');
-        $json = json_decode($data, true);
+        $json = json_decode($request->getContent(), true); // = json_decode(file_get_contents('php://input'), true);
 
         if(isset($_GET['action']))
         {
@@ -195,6 +199,9 @@ elseif($_SERVER['REQUEST_METHOD'] === 'POST'){
                 elseif($request->query->get('bloc_edit') === 'change_cols_min_width'){
                     PageManagementController::changeColsMinWidth($entityManager, $json);
                 }
+                elseif($request->query->get('bloc_edit') === 'change_pagination_limit'){
+                    PageManagementController::changePaginationLimit($entityManager, $json);
+                }
             }
         }
 
@@ -316,7 +323,7 @@ if(isset($response)){
         header('Location: ' . new URL(['page' => !empty($_GET['from']) ? $_GET['from'] : 'accueil']));
     }
     // redirection après traitement de formulaires HTTP
-    elseif($_SERVER['REQUEST_METHOD'] === 'POST' && $_SERVER['CONTENT_TYPE'] === 'application/x-www-form-urlencoded'){
+    elseif($request->getMethod() === 'POST' && $_SERVER['CONTENT_TYPE'] === 'application/x-www-form-urlencoded'){
         $response_data = json_decode(($response)->getContent(), true);
         $url = new URL(['page' => !empty($_GET['from']) ? $_GET['from'] : 'accueil']);
         $url->addParams(['success' => $response_data['success'], 'message' => $response_data['message']]);
@@ -329,7 +336,7 @@ if(isset($response)){
 }
 // pas utilisation de RESPONSE (cas destiné à disparaître)
 else{
-    if($_SERVER['REQUEST_METHOD'] === 'POST' && $_SERVER['CONTENT_TYPE'] === 'application/x-www-form-urlencoded'){
+    if($request->getMethod() === 'POST' && $_SERVER['CONTENT_TYPE'] === 'application/x-www-form-urlencoded'){
         header("Location: " . new URL(['error' => 'erreur côté serveur']));
     }
     else{
@@ -337,4 +344,4 @@ else{
         echo "erreur côté serveur";
     }
 }
-//die; // inutile normalement
\ No newline at end of file
+//die; // inutile
\ No newline at end of file
diff --git a/src/view/AbstractBuilder.php b/src/view/AbstractBuilder.php
index ab5e389..0748df0 100644
--- a/src/view/AbstractBuilder.php
+++ b/src/view/AbstractBuilder.php
@@ -7,7 +7,7 @@ use App\Entity\Node;
 
 abstract class AbstractBuilder
 {
-        protected const string VIEWS_PATH = '../src/view/templates/';
+        public const string VIEWS_PATH = '../src/view/templates/';
         protected string $html = '';
     protected int $id_node;
 
@@ -44,7 +44,7 @@ abstract class AbstractBuilder
         }
     }
 
-    protected function snakeToPascalCase(string $input): string
+    private function snakeToPascalCase(string $input): string
     {
         return str_replace('_', '', ucwords($input, '_'));
     }
diff --git a/src/view/NewBuilder.php b/src/view/NewBuilder.php
index 83dd728..ec48541 100644
--- a/src/view/NewBuilder.php
+++ b/src/view/NewBuilder.php
@@ -51,9 +51,7 @@ class NewBuilder extends AbstractBuilder
             }
             
             $content = '';
-
-            // page article unique
-            if(Director::$page_path->getLast()->getEndOfPath() === 'article'){
+            if(CURRENT_PAGE === 'article'){
                 $content = $node->getArticle()->getContent();
                 $from_to_button = '<p><a class="link_to_article" href="' . new URL(isset($_GET['from']) ? ['page' => $_GET['from']] : []) . '"><button>Retour</button></a></p>';
                 $overflow = '';
@@ -84,7 +82,7 @@ class NewBuilder extends AbstractBuilder
             $date_buttons = '';
             $admin_buttons = '';
             if($_SESSION['admin']){
-                if(Director::$page_path->getLast()->getEndOfPath() === 'article'){
+                if(CURRENT_PAGE === 'article'){
                     $title_js = 'onclick="openEditor(\'' . $id_title . '\')"';
                     $modify_title = '<p id="edit-' . $id_title . '"><button ' . $title_js . '><img class="action_icon" src="assets/edit.svg">Titre</button></p>' . "\n";
                     $close_js_title = 'onclick="closeEditor(\'' . $id_title . '\')"';
diff --git a/src/view/NewsBlockBuilder.php b/src/view/NewsBlockBuilder.php
index 963afe6..4c7c4ec 100644
--- a/src/view/NewsBlockBuilder.php
+++ b/src/view/NewsBlockBuilder.php
@@ -28,6 +28,7 @@ class NewsBlockBuilder extends AbstractBuilder
                 $min_width = $node->getNodeData()->getColsMinWidth();
                 $cols_min_width = 'grid-template-columns: repeat(auto-fit, minmax(' . (string)$min_width . 'px, 1fr));';
             }
+            $fetch_button_hidden = $node->getNodeData()->getNumberOfPages() > 1 ? '' : ' hidden';
 
             // ajouter un article
             $new_article = '';
@@ -54,7 +55,7 @@ class NewsBlockBuilder extends AbstractBuilder
                 $html = '';
                 $admin_buttons = $new_button . $modify_article . $delete_article . $close_editor . $submit_article;
 
-                // post vide mis là pour le bouton "Nouvel article" => déplace vers page "article"
+                // insérer post.php pour le bouton "Nouvel article", new.php pour les vrais articles
                 ob_start();
                 require self::VIEWS_PATH . 'post.php'; // nécéssite $admin_buttons et $html
                 $new_article = ob_get_clean();
diff --git a/src/view/PostBlockBuilder.php b/src/view/PostBlockBuilder.php
index ba54901..ba4de12 100644
--- a/src/view/PostBlockBuilder.php
+++ b/src/view/PostBlockBuilder.php
@@ -28,6 +28,7 @@ class PostBlockBuilder extends AbstractBuilder
                 $min_width = $node->getNodeData()->getColsMinWidth();
                 $cols_min_width = 'grid-template-columns: repeat(auto-fit, minmax(' . (string)$min_width . 'px, 1fr));';
             }
+            $fetch_button_hidden = $node->getNodeData()->getNumberOfPages() > 1 ? '' : ' hidden';
 
             // ajouter un article
             // => fait un peu double emploi avec PostBuilder
diff --git a/src/view/templates/modify_block.php b/src/view/templates/modify_block.php
index 1d097e0..3620100 100644
--- a/src/view/templates/modify_block.php
+++ b/src/view/templates/modify_block.php
@@ -47,4 +47,11 @@ if(Blocks::hasPresentation($child_node->getName())){
 <?php
 }
 ?>
+        <div class="pagination_limit">
+                <label for="pagination_limit_<?= $child_node->getId() ?>">
+                        Nombre max d'articles affichés
+                        <input type="number" id="pagination_limit_<?= $child_node->getId() ?>" name="pagination_limit" onchange="changePaginationLimit(<?= $child_node->getId() ?>)" min="0" max="30" value="<?= $child_node->getNodeData()->getPaginationLimit() ?>">
+                        <i>(mettre 0 désactive la pagination)</i>
+                </label>
+        </div>
 </div>
\ No newline at end of file
diff --git a/src/view/templates/news_block.php b/src/view/templates/news_block.php
index 9d01513..43dbe01 100644
--- a/src/view/templates/news_block.php
+++ b/src/view/templates/news_block.php
@@ -1,5 +1,5 @@
 <?php declare(strict_types=1); ?>
-<section class="<?= $section_class ?>" id="<?= $this->id_node ?>">
+<section class="<?= $section_class ?>" block-type="<?= $node->getName() ?>" id="<?= $this->id_node ?>">
         <h3><?= $title ?></h3>
 <?= $new_article ?>
         <script>
@@ -8,4 +8,7 @@
         <div class="section_child" style="<?= $cols_min_width ?>">
 <?= $content ?>
         </div>
+        <div class="fetch_articles">
+                <button class="<?= $fetch_button_hidden ?>" onclick="fetchArticles(<?= $this->id_node ?>)">Articles suivants</button>
+        </div>
 </section>
\ No newline at end of file
diff --git a/src/view/templates/post_block.php b/src/view/templates/post_block.php
index 9d01513..43dbe01 100644
--- a/src/view/templates/post_block.php
+++ b/src/view/templates/post_block.php
@@ -1,5 +1,5 @@
 <?php declare(strict_types=1); ?>
-<section class="<?= $section_class ?>" id="<?= $this->id_node ?>">
+<section class="<?= $section_class ?>" block-type="<?= $node->getName() ?>" id="<?= $this->id_node ?>">
         <h3><?= $title ?></h3>
 <?= $new_article ?>
         <script>
@@ -8,4 +8,7 @@
         <div class="section_child" style="<?= $cols_min_width ?>">
 <?= $content ?>
         </div>
+        <div class="fetch_articles">
+                <button class="<?= $fetch_button_hidden ?>" onclick="fetchArticles(<?= $this->id_node ?>)">Articles suivants</button>
+        </div>
 </section>
\ No newline at end of file