renommage des présentations,modif présentation des blocs et largeur min (donc nb de colonnes) en mode grid, corrections de bugs et erreurs 404, le param page_modif n'est plus une action, légère symfonyfication du routeur

4 files changed, 85 insertions, 20 deletions

diff --git a/src/controller/ArticleController.php b/src/controller/ArticleController.php
index 71bfdc3..b8af290 100644
--- a/src/controller/ArticleController.php
+++ b/src/controller/ArticleController.php
@@ -32,7 +32,10 @@ class ArticleController
                 if($id[0] === 'n')
                 {
                         $section_id = (int)substr($id, 1); // id du bloc <section>
-                        $director->findNodeById($section_id);
+                        if(!$director->findNodeById($section_id)){
+                                echo json_encode(['success' => false, 'error' => 'article_not_saved']);
+                                die;
+                        }
                         $director->makeSectionNode();
                         $node = $director->getNode(); // = <section>
 
diff --git a/src/controller/Director.php b/src/controller/Director.php
index b154432..6ee0993 100644
--- a/src/controller/Director.php
+++ b/src/controller/Director.php
@@ -13,7 +13,7 @@ class Director
     static public Menu $menu_data; // pour NavBuilder
     static public ?Path $page_path = null; // pour $current dans NavBuilder et pour BreadcrumbBuilder
         private Page $page;
-        private Node $node;
+        private ?Node $node;
     private Node $article;
 
         public function __construct(EntityManager $entityManager, bool $get_menu = false)
@@ -82,8 +82,10 @@ class Director
                 $node->getParent()->addChild($node);
 
                 // spécifique page article
-                if($node->getName() === 'new' && $this->page->getEndOfPath() == 'article'){
-                    $new = $node;
+                if($this->page->getEndOfPath() == 'article'){
+                    if($node->getName() === 'new'){
+                        $new = $node;
+                    }
                 }
             }
         }
@@ -93,9 +95,10 @@ class Director
     }
 
     // le basique
-    public function findNodeById(int $id): void
+    public function findNodeById(int $id): bool
     {
         $this->node = $this->entityManager->find('App\Entity\Node', $id);
+        return $this->node === null ? false : true;
     }
 
     // récupération d'un article pour modification
diff --git a/src/controller/PageManagementController.php b/src/controller/PageManagementController.php
index 50ce193..4528810 100644
--- a/src/controller/PageManagementController.php
+++ b/src/controller/PageManagementController.php
@@ -39,7 +39,7 @@ class PageManagementController
                 }
             }
             $entityManager->flush();
-            header("Location: " . new URL(['page' => $page->getPagePath(), 'action' => 'modif_page']));
+            header("Location: " . new URL(['page' => $page->getPagePath(), 'mode' => 'page_modif']));
             die;
         }
 
@@ -104,7 +104,7 @@ class PageManagementController
             $entityManager->flush();
 
             // page créée, direction la page en mode modification pour ajouter des blocs
-            header("Location: " . new URL(['page' => $page->getPagePath(), 'action' => 'modif_page']));
+            header("Location: " . new URL(['page' => $page->getPagePath(), 'mode' => 'page_modif']));
             die;
         }
 
@@ -146,10 +146,10 @@ class PageManagementController
             if($_POST["bloc_select"] === 'calendar' || $_POST["bloc_select"] === 'form'){
                 $dql = 'SELECT n FROM App\Entity\Node n WHERE n.page = :page AND n.name_node = :name'; // noeud 'head' de la page
                 $bulk_data = $entityManager
-                ->createQuery($dql)
-                ->setParameter('page', $page)
-                ->setParameter('name', 'head')
-                ->getResult();
+                        ->createQuery($dql)
+                        ->setParameter('page', $page)
+                        ->setParameter('name', 'head')
+                        ->getResult();
 
                 if(count($bulk_data) != 1){ // 1 head par page
                     header("Location: " . new URL(['page' => $_GET['page'], 'error' => 'head_node_not_found']));
@@ -175,16 +175,20 @@ class PageManagementController
 
             // valeurs par défaut
             if($_POST["bloc_select"] === 'post_block'){
-                $data->setPresentation($entityManager->find('App\Entity\Presentation', 1)); // pas génial l'utilisation de l'index dans la table
+                $data->setPresentation(Presentation::findPresentation($entityManager, 'fullwidth')); // pas génial l'utilisation de l'index dans la table
             }
             elseif($_POST["bloc_select"] === 'news_block'){
-                $data->setPresentation($entityManager->find('App\Entity\Presentation', 2));
+                $data->setPresentation(Presentation::findPresentation($entityManager, 'grid'));
+            }
+            elseif($_POST["bloc_select"] === 'galery'){
+                $data->setPresentation(Presentation::findPresentation($entityManager, 'mosaic')); // mieux que carousel pour commencer
             }
+            // else = null par défaut
 
             $entityManager->persist($block);
             $entityManager->persist($data);
             $entityManager->flush();
-            header("Location: " . new URL(['page' => $_GET['page'], 'action' => 'modif_page']));
+            header("Location: " . new URL(['page' => $_GET['page'], 'mode' => 'page_modif']));
             die;
         }
 
@@ -208,7 +212,8 @@ class PageManagementController
                 $entityManager->remove($bloc); // suppression en BDD
                 $entityManager->flush();
             }
-            header("Location: " . new URL(['page' => $_GET['page'], 'action' => 'modif_page']));
+
+            header("Location: " . new URL(['page' => $_GET['page'], 'mode' => 'page_modif']));
             die;
         }
         
@@ -235,7 +240,7 @@ class PageManagementController
         static public function SwitchBlocsPositions(EntityManager $entityManager, array $json): void
         {
                 if(isset($json['id1']) && is_int($json['id1']) && isset($json['id2']) && is_int($json['id2']) && isset($_GET['page'])){
-                $director = new Director($entityManager, true);
+                $director = new Director($entityManager, true); // true pour $director->findItsChildren();
                 $director->findUniqueNodeByName('main');
             $director->findItsChildren();
             $main = $director->getNode();
@@ -269,4 +274,42 @@ class PageManagementController
                 }
                 die;
         }
+
+        static public function changePresentation(EntityManager $entityManager, array $json): void
+        {
+                if(isset($json['id']) && isset($json['presentation'])){
+                        $director = new Director($entityManager, false);
+                        $director->findNodeById($json['id']);
+
+                        $presentation = Presentation::findPresentation($entityManager, $json['presentation']);
+                        if($presentation !== null){
+                                $director->getNode()->getNodeData()->setPresentation($presentation);
+
+                                $entityManager->flush();
+                                echo json_encode(['success' => true, 'presentation' => $json['presentation'], 'cols_min_width' => $director->getNode()->getNodeData()->getColsMinWidth()]);
+                        }
+                        else{
+                                echo json_encode(['success' => false]);
+                        }
+                }
+                else{
+                        echo json_encode(['success' => false]);
+                }
+                die;
+        }
+        static public function changeColsMinWidth(EntityManager $entityManager, array $json): void
+        {
+                if(isset($json['id']) && isset($json['cols_min_width'])){
+                        $director = new Director($entityManager, false);
+                        $director->findNodeById($json['id']);
+                        $director->getNode()->getNodeData()->setColsMinWidth((int)$json['cols_min_width']); // attention conversion?
+
+                        $entityManager->flush();
+                        echo json_encode(['success' => true, 'cols_min_width' => $json['cols_min_width']]);
+                }
+                else{
+                        echo json_encode(['success' => false]);
+                }
+                die;
+        }
 }
\ No newline at end of file
diff --git a/src/controller/ViewController.php b/src/controller/ViewController.php
index 0830a5b..668fa25 100644
--- a/src/controller/ViewController.php
+++ b/src/controller/ViewController.php
@@ -5,16 +5,17 @@
 
 declare(strict_types=1);
 
+use App\Entity\Article;
 use App\Entity\Node;
 use Doctrine\ORM\EntityManager;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
-class ViewController extends AbstractBuilder
+class ViewController extends AbstractBuilder // ViewController est aussi le premier Builder
 {
     static public Node $root_node;
 
-    public function __construct(){}
+    public function __construct(){} // surcharge celui de AbstractBuilder
 
     public function buildView(EntityManager $entityManager, Request $request): Response
     {
@@ -25,13 +26,28 @@ class ViewController extends AbstractBuilder
 
         // mode modification d'une page activé
         if($_SESSION['admin'] && $request->query->has('page')
-            && $request->query->has('action') && $request->query->get('action') === 'modif_page'
+            && $request->query->has('mode') && $request->query->get('mode') === 'page_modif'
             && $request->query->get('page') !== 'connexion' && $request->query->get('page') !== 'article' && $request->query->get('page') !== 'nouvelle_page' && $request->query->get('page') !== 'menu_chemins'){
             // les contrôles de la 2è ligne devraient utiliser un tableau
             MainBuilder::$modif_mode = true;
         }
 
-        // construction de la page
+        // page article: mode création et erreurs d'id
+        if($_SESSION['admin'] && $request->query->has('page') && $request->query->get('page') === 'article'){
+            if(!$request->query->has('id')){
+                return new Response($this->html, 302);
+            }
+            else{
+                if($request->query->get('id')[0] === 'n'){ // mode création d'article (vérification de l'id du bloc dans ArticleController)
+                    NewBuilder::$new_article_mode = true;
+                }
+                elseif(self::$root_node->getNodeByName('main')->getAdoptedChild() === null){ // id inconnu
+                    return new Response($this->html, 302);
+                }
+            }
+        }
+
+        //début de la construction de la page
         $this->useChildrenBuilder(self::$root_node);
 
         return new Response($this->html, 200);