diff --git a/src/UnicaenValidation/Entity/Db/ValidationInstance.php b/src/UnicaenValidation/Entity/Db/ValidationInstance.php index e06368d378c9691e25f515a3062a8cee828735ba..fc58cd5b6404a067b645dd8793a0f9287f0b46c2 100755 --- a/src/UnicaenValidation/Entity/Db/ValidationInstance.php +++ b/src/UnicaenValidation/Entity/Db/ValidationInstance.php @@ -66,7 +66,7 @@ class ValidationInstance implements HistoriqueAwareInterface { public function toStringJustification() : string { - if ($this->getJustification() === null) return "Aucune justification associée à la validation"; + if ($this->getJustification() === null || $this->getJustification()==="") return "Aucune justification associée à la validation"; return $this->getJustification(); } diff --git a/src/UnicaenValidation/View/Helper/ValidationAfficherViewHelper.php b/src/UnicaenValidation/View/Helper/ValidationAfficherViewHelper.php index 85ed6e92d0c68aaa9670187e79a605db0e615c04..e80f9cc2e1e95c656075db7e77d35e0985b37aaa 100644 --- a/src/UnicaenValidation/View/Helper/ValidationAfficherViewHelper.php +++ b/src/UnicaenValidation/View/Helper/ValidationAfficherViewHelper.php @@ -13,6 +13,10 @@ class ValidationAfficherViewHelper extends AbstractHelper /** * @param ValidationInstance $validation * @param array $options + * @desc Options possible : + * 'afficher-code' default false : affiche le code du type de validation + * 'afficher-type' default true : affiche le libellé du type de validation + * 'afficher-justification' default true : affiche la justification * @return string|Partial */ public function __invoke(ValidationInstance $validation, array $options = []) diff --git a/src/UnicaenValidation/View/Helper/partial/validation-afficher.phtml b/src/UnicaenValidation/View/Helper/partial/validation-afficher.phtml index 6d7385de046cb548fbacd4f26e28e09e1641036d..c033bc41725e274f0596f18f23cd9aeff0b9dad6 100644 --- a/src/UnicaenValidation/View/Helper/partial/validation-afficher.phtml +++ b/src/UnicaenValidation/View/Helper/partial/validation-afficher.phtml @@ -10,6 +10,7 @@ use UnicaenValidation\Entity\Db\ValidationInstance; $type = $instance->getType(); $afficherCode = isset($options['afficher-code']) && $options['afficher-code'] === true ; +$afficherType = ($options['afficher-type']) ?? true ; $afficherJustificatif = isset($options['afficher-justificatif']) && $options['afficher-justificatif'] === true ; ?> @@ -20,8 +21,10 @@ $afficherJustificatif = isset($options['afficher-justificatif']) && $options['af <code><?php echo $type->getCode(); ?></code> <?php endif; ?> + <?php if ($afficherCode) : ?> <strong><?php echo $type->getLibelle(); ?></strong> <br> + <?php endif; ?> <?php echo $instance->toStringRefus() ?>