From d62cfddcc5104db7f68cde08e5d025f70af38745 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Metivier <jean-philippe.metivier@unicaen.fr>
Date: Fri, 19 Jan 2024 16:00:50 +0100
Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20VH?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ValidationInstanceControllerFactory.php | 2 +-
.../Helper/partial/validation-afficher.phtml | 17 ++++++++++++++---
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/UnicaenValidation/Controller/ValidationInstanceControllerFactory.php b/src/UnicaenValidation/Controller/ValidationInstanceControllerFactory.php
index 031bf57..7904a37 100644
--- a/src/UnicaenValidation/Controller/ValidationInstanceControllerFactory.php
+++ b/src/UnicaenValidation/Controller/ValidationInstanceControllerFactory.php
@@ -33,7 +33,7 @@ class ValidationInstanceControllerFactory {
$controller = new ValidationInstanceController();
$controller->setValidationInstanceService($validationInstanceService);
- $controller->setValidationInstancForm($validationInstanceForm);
+ $controller->setValidationInstanceForm($validationInstanceForm);
$controller->setValidationTypeService($validationTypeService);
return $controller;
}
diff --git a/src/UnicaenValidation/View/Helper/partial/validation-afficher.phtml b/src/UnicaenValidation/View/Helper/partial/validation-afficher.phtml
index 7541b0d..e1558b0 100644
--- a/src/UnicaenValidation/View/Helper/partial/validation-afficher.phtml
+++ b/src/UnicaenValidation/View/Helper/partial/validation-afficher.phtml
@@ -9,15 +9,26 @@ use UnicaenValidation\Entity\Db\ValidationInstance;
$type = $instance->getType();
+$afficherCode = isset($options['afficher-code']) && $options['afficher-code'] === true ;
+
?>
+<div class="alert <?php echo ($instance->isRefus())?"alert-danger":"alert-success"; ?>">
<div class="validation validation-affichage <?php echo ($instance->isRefus())?"validation-refuser":"validation-valider" ?>">
- <code><?php echo $type->getCode(); ?></code> <?php echo $type->getLibelle(); ?> <br/>
+ <?php if ($afficherCode) : ?>
+ <code><?php echo $type->getCode(); ?></code>
+ <?php endif; ?>
+
+ <strong><?php echo $type->getLibelle(); ?></strong>
+ <br>
+
<?php if ($instance->isRefus()) : ?>
- Refusé
+ Refusée
<?php else : ?>
- Validé
+ Validée
<?php endif; ?>
+
le <?php echo $instance->getHistoModification()->format('d/m/Y à H:i:s'); ?>
par <?php echo $instance->getHistoModificateur()->getDisplayName(); ?>.
</div>
+</div>
--
GitLab