4 files changed, 12 insertions, 92 deletions

diff --git a/src/model/Blocks.php b/src/model/Blocks.php
index a6fab45..53268db 100644
--- a/src/model/Blocks.php
+++ b/src/model/Blocks.php
@@ -1,38 +1,7 @@
 <?php
-// src/Blocks.php
+// src/model/Blocks.php
 
 class Blocks{
-    /*private array $types = ['blog', 'grid', 'calendar', 'galery', 'form'];*/
-    static private array $types = ['post_block', 'news_block', 'galery', 'calendar', 'form'];
-
-    /*private array $names = ['Blog', 'Grille', 'Calendrier', 'Galerie', 'Formulaire'];*/
-    static private array $names = ['Articles libres', 'Actualités', 'Galerie', 'Calendrier', 'Formulaire'];
-
-    static public function getNameList(): array
-    {
-        $blocks = [];
-        foreach(self::$types as $type){
-            $blocks[] = $type;
-        }
-        return $blocks;
-    }
-
-    static public function getTypeNamePairs(): array
-    {
-        $blocks = [];
-        for($i = 0; $i < count(self::$types); $i++){
-            $blocks[] = ['type' => self::$types[$i], 'name' => self::$names[$i]];
-        }
-        return $blocks;
-    }
-
-    static public function getNameFromType(string $type): string
-    {
-        for($i=0; $i < count(self::$types); $i++){ 
-            if(self::$types[$i] === $type){
-                return self::$names[$i];
-            }
-        }
-        return 'server side error';
-    }
+    static public array $blocks = ['post_block' => 'Articles libres', 'news_block' => 'Actualités', 'galery' => 'Galerie', 'calendar' => 'Calendrier', 'form' => 'Formulaire'];
+    static public array $presentations = ['fullwidth' => 'Pleine largeur', 'grid' => 'Grille', 'mosaic' => 'Mosaïque', 'carousel' => 'Carrousel'];
 }
\ No newline at end of file
diff --git a/src/model/entities/Log.php b/src/model/entities/Log.php
index 39b4307..eeb76e4 100644
--- a/src/model/entities/Log.php
+++ b/src/model/entities/Log.php
@@ -16,15 +16,14 @@ class Log
     #[ORM\Column(type: "integer")]
     private int $id_log;
 
-    #[ORM\Column(type: 'datetime', options: ['default' => 'CURRENT_TIMESTAMP'])]
-    //#[ORM\Column(type: 'datetime', columnDefinition: "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")]
-    private ?\DateTime $date_time ; // le type datetime de doctrine convertit en type \DateTime de PHP
+    #[ORM\Column(type: 'datetime', options: ['default' => 'CURRENT_TIMESTAMP'])] // CURRENT_TIMESTAMP "inutile", date générée par PHP
+    private \DateTime $date_time; // type datetime de doctrine <=> type \DateTime de PHP
 
     #[ORM\Column(type: "boolean")]
     private bool $success;
 
     public function __construct(bool $success){
-        $this->date_time = new \DateTime();
+        $this->date_time = new \DateTime;
         $this->success = $success;
     }
 }
diff --git a/src/model/entities/NodeData.php b/src/model/entities/NodeData.php
index 3688e4a..99dda83 100644
--- a/src/model/entities/NodeData.php
+++ b/src/model/entities/NodeData.php
@@ -27,9 +27,8 @@ class NodeData
     #[ORM\Column(type: "json")]
     private array $data;
 
-    #[ORM\ManyToOne(targetEntity: Presentation::class)]
-    #[ORM\JoinColumn(name: "presentation_id", referencedColumnName: "id_presentation", nullable: true)]
-    private ?Presentation $presentation;
+    #[ORM\Column(type: "string", length: 255, nullable: true)]
+    private ?string $presentation;
 
     #[ORM\Column(type: "integer", length: 255, nullable: true)]
     private ?int $grid_cols_min_width = null; // pour le mode grille
@@ -43,12 +42,12 @@ class NodeData
     )]
     private Collection $images;
 
-    public function __construct(array $data, Node $node, Collection $images = new ArrayCollection, Presentation $presentation = null)
+    public function __construct(array $data, Node $node, Collection $images = new ArrayCollection, string $presentation = null)
     {
         $this->data = $data;
         $this->node = $node;
         $this->images = $images;
-        if(!empty($presentation) && $presentation->getName() === 'grid'){
+        if(!empty($presentation) && $presentation === 'grid'){
             $this->grid_cols_min_width = 250;
         }
     }
@@ -75,11 +74,11 @@ class NodeData
             unset($this->data[$key]);
         }
     }
-    public function getPresentation(): ?Presentation
+    public function getPresentation(): ?string
     {
         return $this->presentation;
     }
-    public function setPresentation(Presentation $presentation): void
+    public function setPresentation(string $presentation): void
     {
         $this->presentation = $presentation;
     }
diff --git a/src/model/entities/Presentation.php b/src/model/entities/Presentation.php
deleted file mode 100644
index 6ada565..0000000
--- a/src/model/entities/Presentation.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-// src/model/entities/Presentation.php
-
-declare(strict_types=1);
-
-namespace App\Entity;
-
-use Doctrine\ORM\EntityManager;
-use Doctrine\ORM\Mapping as ORM;
-
-#[ORM\Entity]
-#[ORM\Table(name: TABLE_PREFIX . "presentation")]
-class Presentation
-{
-    static public array $option_list = ['fullwidth' => 'Pleine largeur', 'grid' => 'Grille', 'mosaic' => 'Mosaïque', 'carousel' => 'Carrousel'];
-
-    #[ORM\Id]
-    #[ORM\GeneratedValue]
-    #[ORM\Column(type: "integer")]
-    private int $id_presentation;
-
-    #[ORM\Column(type: "string", length: 255)]
-    private string $name;
-
-    public function __construct(string $name)
-    {
-        $this->name = array_keys(self::$option_list)[0]; // = fullwidth, sécurité option inconnue
-        foreach(self::$option_list as $key => $value){
-            if($name === $key){
-                $this->name = $name;
-            }
-        }
-    }
-
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    static public function findPresentation(EntityManager $entityManager, string $name): ?self
-    {
-        return $entityManager
-            ->createQuery('SELECT p FROM App\Entity\Presentation p WHERE p.name = :name')
-            ->setParameter('name', $name)
-            ->getOneOrNullResult();
-    }
-}
\ No newline at end of file