diff --git a/module/Application/src/Application/Controller/TheseController.php b/module/Application/src/Application/Controller/TheseController.php index 30ff5b2454f396117a40f5ce16deee7c64e20395..d6b731e477304ce3ed5c656d9195f10d7c6954f1 100755 --- a/module/Application/src/Application/Controller/TheseController.php +++ b/module/Application/src/Application/Controller/TheseController.php @@ -505,6 +505,8 @@ class TheseController extends AbstractController $validationsPdc = $this->validationService->getRepository()->findValidationByCodeAndThese(TypeValidation::CODE_PAGE_DE_COUVERTURE, $these); $pageCouvValidee = !empty($validationsPdc); + $isExemplPapierFourniPertinent = $this->theseService->isExemplPapierFourniPertinent($these); + $view = new ViewModel([ 'these' => $these, 'diffusion' => $these->getDiffusionForVersion($version), @@ -523,6 +525,7 @@ class TheseController extends AbstractController 'hasVD' => $hasVD, 'pageCouvValidee' => $pageCouvValidee, 'asynchronous' => $asynchronous, + 'isExemplPapierFourniPertinent' => $isExemplPapierFourniPertinent, ]); diff --git a/module/Application/view/application/these/partial/rdv-bu.phtml b/module/Application/view/application/these/partial/rdv-bu.phtml index ffe71c1a1c7d5c5d778c15eb94f7d3debe6535c7..9f2cce2e3a07604944f0ecb7d94bab84f22f1210 100644 --- a/module/Application/view/application/these/partial/rdv-bu.phtml +++ b/module/Application/view/application/these/partial/rdv-bu.phtml @@ -59,7 +59,7 @@ $ddPageCouv = $pageCouvValidee ? $checked : $unchecked; <?php $class = ($ok = $rdvBu->getConventionMelSignee()) ? '' : 'text-danger' ?> <dd class="<?php echo $class ?>"><?php echo $ok ? $checked : $unchecked ?></dd> - <?php if ($isExemplPapierFourniPertinent): ?> + <?php if ($isExemplPapierFourniPertinent || $rdvBu->getExemplPapierFourni()): ?> <dt>Exemplaire papier fourni :</dt> <?php $class = ($ok = $rdvBu->getExemplPapierFourni()) ? '' : 'text-danger' ?> <dd class="<?php echo $class ?>"><?php echo $ok ? $checked : $unchecked ?></dd> diff --git a/module/Application/view/application/these/rdv-bu.phtml b/module/Application/view/application/these/rdv-bu.phtml index b187557d99cd108ee2a720df2b22a9d26895d65e..883b6010c1f2b734fbe34c32e63196841dd2991d 100644 --- a/module/Application/view/application/these/rdv-bu.phtml +++ b/module/Application/view/application/these/rdv-bu.phtml @@ -2,14 +2,13 @@ use Application\Controller\TheseController; use Application\Entity\Db\Diffusion; +use Application\Entity\Db\Repository\FichierTheseRepository; use Application\Entity\Db\These; use Application\Entity\Db\Validation; -use Application\Entity\Db\WfEtape; use Application\Provider\Privilege\ThesePrivileges; use Application\Provider\Privilege\ValidationPrivileges; use Application\View\Renderer\PhpRenderer; use UnicaenApp\Service\MessageCollector; -use Application\Entity\Db\Repository\FichierTheseRepository; /** * @var PhpRenderer $this @@ -25,7 +24,7 @@ use Application\Entity\Db\Repository\FichierTheseRepository; * @var FichierTheseRepository $fichierRepository * @var boolean $asynchronous * - * @see TheseController::modifierRdvBuAction() + * @see TheseController::detailRdvBuAction() */ $canEdit = $this->isAllowed($these, ThesePrivileges::THESE_SAISIE_RDV_BU);