diff --git a/src/UnicaenValidation/Entity/Db/ValidationInstance.php b/src/UnicaenValidation/Entity/Db/ValidationInstance.php index c8c6bbd2f8b02d25f8930d70ed053f993f8e8f59..c1fe2f75bca33c83d7adf55499048e65689129e9 100755 --- a/src/UnicaenValidation/Entity/Db/ValidationInstance.php +++ b/src/UnicaenValidation/Entity/Db/ValidationInstance.php @@ -70,10 +70,9 @@ class ValidationInstance implements HistoriqueAwareInterface { return $this->getJustification(); } - public function toStringValeur() : string + public function toStringRefus() : string { - if ($this->getJustification() === null) return "Aucune valeur associée à la validation"; - return $this->getJustification(); + return (!$this->isRefus()) ? "Validée" : "Refusée"; } public function toStringValidateur() : string diff --git a/src/UnicaenValidation/View/Helper/ValidationAfficherViewHelper.php b/src/UnicaenValidation/View/Helper/ValidationAfficherViewHelper.php index 1c0ab3d36eafc727a4ac3ac86af4dfafd3582cf0..85ed6e92d0c68aaa9670187e79a605db0e615c04 100644 --- a/src/UnicaenValidation/View/Helper/ValidationAfficherViewHelper.php +++ b/src/UnicaenValidation/View/Helper/ValidationAfficherViewHelper.php @@ -21,6 +21,6 @@ class ValidationAfficherViewHelper extends AbstractHelper $view = $this->getView(); $view->resolver()->attach(new TemplatePathStack(['script_paths' => [__DIR__ . "/partial"]])); - return $view->partial('validation-afficher', ['instance' => $validation]); + return $view->partial('validation-afficher', ['instance' => $validation, 'options' => $options]); } } \ No newline at end of file diff --git a/src/UnicaenValidation/View/Helper/partial/validation-afficher.phtml b/src/UnicaenValidation/View/Helper/partial/validation-afficher.phtml index e1558b0d0a823bfd0c836f48da3f42bb635b2a1c..6d7385de046cb548fbacd4f26e28e09e1641036d 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 ; +$afficherJustificatif = isset($options['afficher-justificatif']) && $options['afficher-justificatif'] === true ; ?> @@ -22,13 +23,13 @@ $afficherCode = isset($options['afficher-code']) && $options['afficher-code'] == <strong><?php echo $type->getLibelle(); ?></strong> <br> - <?php if ($instance->isRefus()) : ?> - Refusée - <?php else : ?> - Validée - <?php endif; ?> + <?php echo $instance->toStringRefus() ?> le <?php echo $instance->getHistoModification()->format('d/m/Y à H:i:s'); ?> par <?php echo $instance->getHistoModificateur()->getDisplayName(); ?>. + + <?php if($afficherJustificatif) :?> + <br/> <strong>Justification :</strong> <?= $instance->toStringJustification() ?> + <?php endif; ?> </div> </div> diff --git a/src/UnicaenValidation/View/Helper/partial/validation-badge.phtml b/src/UnicaenValidation/View/Helper/partial/validation-badge.phtml index e6835f9b88d059a4538d4389baa7ed8e330f85e8..e12e34b0cfe661b19b46e02934e63e0745a20e2b 100644 --- a/src/UnicaenValidation/View/Helper/partial/validation-badge.phtml +++ b/src/UnicaenValidation/View/Helper/partial/validation-badge.phtml @@ -10,7 +10,6 @@ use UnicaenValidation\Entity\Db\ValidationInstance; $texte = (isset($options['texte']) AND $options['texte'] === true); ?> - <?php if ($validation !== null) : ?> <?php if (!$validation->isRefus()) : ?> <span class="icon ok" style="color: darkgreen;"