pagination partie 2, nouvelles fonctions + renommage dans Director, ArticleController::fetch, et en JS: fetchArticles, insertLocalDates, modifs dans changePaginationLimit, dans les vues

7 files changed, 22 insertions, 9 deletions

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