fin de l'utilisation du champ article_timestamp de la table node, résolue erreur lorsque deux news sont créées dans la même minute (pas dans la même seconde par contre)

4 files changed, 45 insertions, 27 deletions

diff --git a/src/view/MainBuilder.php b/src/view/MainBuilder.php
index e6fc61a..8a40d82 100644
--- a/src/view/MainBuilder.php
+++ b/src/view/MainBuilder.php
@@ -23,11 +23,13 @@ class MainBuilder extends AbstractBuilder
                 die;
             }
 
+            // nouvel article
             if($node->getAdoptedChild() == null){
                 $date = new \DateTime;
                 $article = new Article('', $date);
-                $new = new Node('new', 'i' . (string)$date->getTimestamp(), [], 0, null, null, $article);
+                $new = new Node('new', [], 0, null, null, $article);
             }
+            // modification
             else{
                 $new = $node->getAdoptedChild();
             }
diff --git a/src/view/NewBuilder.php b/src/view/NewBuilder.php
index 332d92b..9965d15 100644
--- a/src/view/NewBuilder.php
+++ b/src/view/NewBuilder.php
@@ -9,31 +9,47 @@ class NewBuilder extends AbstractBuilder
 {
     static public bool $new_article_mode = false;
 
-    public function __construct(Node $node, )
+    public function __construct(Node $node)
     {
         $viewFile = self::VIEWS_PATH . $node->getName() . '.php';
 
         if(file_exists($viewFile))
         {
-            // id (timestamp)
-            if(!empty($node->getAttributes()))
-            {
-                extract($node->getAttributes());
+            if(self::$new_article_mode){
+                $id = $_GET['id']; // ici l'id est le nom du block news_block parent
+                $title = '';
+                $preview = '';
+
+                // lettre au début de l'id: t = title, p = preview, i = article, d = date
+                $id_title = $id;
+                $id_title[0] = 't';
+                $id_preview = $id;
+                $id_preview[0] = 'p';
+                $id_content = 'i' . $id;
+                $id_content[0] = 'i';
+                $id_date = $id;
+                $id_date[0] = 'd';
             }
+            else{
+                $id = (string)$node->getId();
 
-            // html, date
-            $title = $node->getArticle()->getTitle();
-            $preview = $node->getArticle()->getPreview();
-            
-            // lettre au début de l'id: i = article, p = preview, t = title, d = date
-            $id = $node->getArticleTimestamp();
-            $id_title = $id;
-            $id_title[0] = 't';
-            $id_preview = $id;
-            $id_preview[0] = 'p';
-            $id_date = $id;
-            $id_date[0] = 'd';
+                // id (timestamp)
+                if(!empty($node->getAttributes()))
+                {
+                    extract($node->getAttributes());
+                }
 
+                // html, date
+                $title = $node->getArticle()->getTitle();
+                $preview = $node->getArticle()->getPreview();
+
+                // lettre au début de l'id: t = title, p = preview, i = article, d = date
+                $id_title = 't' . $id;
+                $id_preview = 'p' . $id;
+                $id_content = 'i' . $id;
+                $id_date = 'd' . $id;
+            }
+            
             $content = '';
 
             // page article unique
@@ -85,12 +101,12 @@ class NewBuilder extends AbstractBuilder
                     $submit_preview = '<p id="submit-' . $id_preview . '" class="hidden"><button ' . $submit_js_preview . '>Valider</button></p>';
                     $preview_buttons = '<div class="button_zone">' . $modify_preview . $close_editor_preview . $submit_preview . '</div>';
 
-                    $article_js = 'onclick="openEditor(\'' . $id . '\')"';
-                    $modify_article = '<p id="edit-' . $id . '"><button ' . $article_js . '><img class="action_icon" src="assets/edit.svg">Article</button></p>' . "\n";
-                    $close_js_article = 'onclick="closeEditor(\'' . $id . '\')"';
-                    $close_editor_article = '<p id="cancel-' . $id . '" class="hidden"><button ' . $close_js_article . '>Annuler</button></p>';
-                    $submit_js_article = 'onclick="submitArticle(\'' . $id . '\')"';
-                    $submit_article = '<p id="submit-' . $id . '" class="hidden"><button ' . $submit_js_article . '>Valider</button></p>';
+                    $article_js = 'onclick="openEditor(\'' . $id_content . '\')"';
+                    $modify_article = '<p id="edit-' . $id_content . '"><button ' . $article_js . '><img class="action_icon" src="assets/edit.svg">Article</button></p>' . "\n";
+                    $close_js_article = 'onclick="closeEditor(\'' . $id_content . '\')"';
+                    $close_editor_article = '<p id="cancel-' . $id_content . '" class="hidden"><button ' . $close_js_article . '>Annuler</button></p>';
+                    $submit_js_article = 'onclick="submitArticle(\'' . $id_content . '\')"';
+                    $submit_article = '<p id="submit-' . $id_content . '" class="hidden"><button ' . $submit_js_article . '>Valider</button></p>';
                     $article_buttons = '<div class="button_zone">' . $modify_article . $close_editor_article . $submit_article . '</div>';
 
                     $date_js = 'onclick="changeDate(\'' . $id_date . '\', \'article\');';
diff --git a/src/view/PostBuilder.php b/src/view/PostBuilder.php
index ae5cc9b..70a2d77 100644
--- a/src/view/PostBuilder.php
+++ b/src/view/PostBuilder.php
@@ -22,7 +22,7 @@ class PostBuilder extends AbstractBuilder
             // html
             $title = $node->getArticle()->getTitle();
             $html = $node->getArticle()->getContent();
-            $id = $node->getArticleTimestamp();
+            $id = (string)$node->getId();
 
             // partage
             $share_link = new URL(['page' => CURRENT_PAGE], $id);
diff --git a/src/view/templates/new.php b/src/view/templates/new.php
index 1b25eba..fadf1a2 100644
--- a/src/view/templates/new.php
+++ b/src/view/templates/new.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1); ?>
 <article>
-    <div class="new_content">
+    <div class="new_content" id="<?= $id ?>">
         <div class="article_title_zone">
             <?= $share_button ?>
             <div class="data" id="<?= $id_title ?>">
@@ -12,7 +12,7 @@
             <?= $preview ?>
         </div>
         <?= $preview_buttons ?>
-        <div class="data article_content_text" id="<?= $id ?>">
+        <div class="data article_content_text" id="<?= $id_content ?>">
             <?= $content ?>
         </div>
         <?= $article_buttons ?>