diff --git a/src/UnicaenValidation/Controller/ValidationInstanceControllerFactory.php b/src/UnicaenValidation/Controller/ValidationInstanceControllerFactory.php index 031bf574522d870fce66b543e89ac054827e7f3a..7904a378d4c976a2ab8e14122d6df62dc06a1039 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 7541b0da5b4c5d7e5f841b122c9916ba9981951f..e1558b0d0a823bfd0c836f48da3f42bb635b2a1c 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>