From d0cbe36c5a50a8d65af113d241a239a6ee194cf0 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Metivier <jean-philippe.metivier@unicaen.fr>
Date: Fri, 15 Oct 2021 11:46:47 +0200
Subject: [PATCH] =?UTF-8?q?Modification=20suite=20r=C3=A9union?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/UnicaenRenderer/Controller/RenduController.php |  2 +-
 .../Controller/TemplateController.php              |  1 +
 src/UnicaenRenderer/Entity/Db/Template.php         |  5 +++++
 src/UnicaenRenderer/Service/Rendu/RenduService.php |  4 ++--
 .../View/Helper/partial/rendu.phtml                | 14 +++++++-------
 .../{contenu => rendu}/afficher.phtml              |  0
 .../{contenu => rendu}/index.phtml                 |  0
 7 files changed, 16 insertions(+), 10 deletions(-)
 rename view/unicaen-renderer/{contenu => rendu}/afficher.phtml (100%)
 rename view/unicaen-renderer/{contenu => rendu}/index.phtml (100%)

diff --git a/src/UnicaenRenderer/Controller/RenduController.php b/src/UnicaenRenderer/Controller/RenduController.php
index dae34c7..5da2ad2 100644
--- a/src/UnicaenRenderer/Controller/RenduController.php
+++ b/src/UnicaenRenderer/Controller/RenduController.php
@@ -25,7 +25,7 @@ class RenduController extends AbstractActionController {
 
         return new ViewModel([
             'title' => "Affichage du contenu #" . $rendu->getId(),
-            'contenu' => $rendu,
+            'rendu' => $rendu,
         ]);
     }
 
diff --git a/src/UnicaenRenderer/Controller/TemplateController.php b/src/UnicaenRenderer/Controller/TemplateController.php
index e7435de..3f6d38e 100755
--- a/src/UnicaenRenderer/Controller/TemplateController.php
+++ b/src/UnicaenRenderer/Controller/TemplateController.php
@@ -67,6 +67,7 @@ class TemplateController extends AbstractActionController {
         $form = $this->getTemplateForm();
         $form->setAttribute('action', $this->url()->fromRoute('contenu/template/modifier', ['template' => $template->getId()], [], true));
         $form->bind($template);
+        $form->setOldCode($template->getCode());
 
         $request = $this->getRequest();
         if ($request->isPost()) {
diff --git a/src/UnicaenRenderer/Entity/Db/Template.php b/src/UnicaenRenderer/Entity/Db/Template.php
index 9e7c01c..b2bbc46 100755
--- a/src/UnicaenRenderer/Entity/Db/Template.php
+++ b/src/UnicaenRenderer/Entity/Db/Template.php
@@ -8,6 +8,11 @@ class Template implements ResourceInterface
 {
     const RESOURCE_ID = 'Template';
 
+    public function generateTag() : string
+    {
+        return (implode('_', [$this->getResourceId(), $this->getCode()]));
+    }
+
     /**
      * @return string
      */
diff --git a/src/UnicaenRenderer/Service/Rendu/RenduService.php b/src/UnicaenRenderer/Service/Rendu/RenduService.php
index 55bd225..05b5dc4 100644
--- a/src/UnicaenRenderer/Service/Rendu/RenduService.php
+++ b/src/UnicaenRenderer/Service/Rendu/RenduService.php
@@ -92,7 +92,7 @@ class RenduService {
      * @param int $id
      * @return Rendu|null
      */
-    public function getRendu(int $id) : ?Rendu
+    public function getRendu(?int $id) : ?Rendu
     {
         $qb = $this->createQueryBuilder()
             ->andWhere('contenu.id = :id')
@@ -111,7 +111,7 @@ class RenduService {
      * @param string $param
      * @return Rendu|null
      */
-    public function getRequestedRendu(AbstractActionController $controller, string $param='contenu') : ?Rendu
+    public function getRequestedRendu(AbstractActionController $controller, string $param='rendu') : ?Rendu
     {
         $id = $controller->params()->fromRoute($param);
         $result = $this->getRendu($id);
diff --git a/src/UnicaenRenderer/View/Helper/partial/rendu.phtml b/src/UnicaenRenderer/View/Helper/partial/rendu.phtml
index e868467..036bcce 100644
--- a/src/UnicaenRenderer/View/Helper/partial/rendu.phtml
+++ b/src/UnicaenRenderer/View/Helper/partial/rendu.phtml
@@ -2,7 +2,7 @@
 
 /**
  * @see \UnicaenRenderer\View\Helper\RenduViewHelper
- * @var Rendu $contenu
+ * @var Rendu $rendu
  * @var array $options
  */
 
@@ -15,29 +15,29 @@ use UnicaenRenderer\Entity\Db\Rendu;
         <dl>
             <dt> Identifiant </dt>
             <dd>
-                <?php echo $contenu->getId(); ?>
+                <?php echo $rendu->getId(); ?>
             </dd>
             <dt> Template </dt>
             <dd>
-                <?php if ($contenu->getTemplate()) : ?>
-                    <?php echo $contenu->getTemplate()->getCode(); ?>
+                <?php if ($rendu->getTemplate()) : ?>
+                    <?php echo $rendu->getTemplate()->getCode(); ?>
                 <?php else: ?>
                     <i>Aucun template associé</i>
                 <?php endif; ?>
             </dd>
             <dt> Date de génération </dt>
             <dd>
-                <?php echo $contenu->getDate()->format('d/m/Y'); ?>
+                <?php echo $rendu->getDate()->format('d/m/Y'); ?>
             </dd>
         </dl>
     </div>
     <div class="col-md-8">
         <div class="panel panel-default">
             <div class="panel-heading">
-                <?php echo $contenu->getSujet(); ?>
+                <?php echo $rendu->getSujet(); ?>
             </div>
             <div class="panel-body">
-                <?php echo $contenu->getCorps(); ?>
+                <?php echo $rendu->getCorps(); ?>
             </div>
         </div>
     </div>
diff --git a/view/unicaen-renderer/contenu/afficher.phtml b/view/unicaen-renderer/rendu/afficher.phtml
similarity index 100%
rename from view/unicaen-renderer/contenu/afficher.phtml
rename to view/unicaen-renderer/rendu/afficher.phtml
diff --git a/view/unicaen-renderer/contenu/index.phtml b/view/unicaen-renderer/rendu/index.phtml
similarity index 100%
rename from view/unicaen-renderer/contenu/index.phtml
rename to view/unicaen-renderer/rendu/index.phtml
-- 
GitLab