Skip to content
Snippets Groups Projects
Commit 51f3681f authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Page RDV BU: la case à cocher exemplaire papier remis n'était jamais affichée

parent 29873543
Branches
No related tags found
No related merge requests found
...@@ -505,6 +505,8 @@ class TheseController extends AbstractController ...@@ -505,6 +505,8 @@ class TheseController extends AbstractController
$validationsPdc = $this->validationService->getRepository()->findValidationByCodeAndThese(TypeValidation::CODE_PAGE_DE_COUVERTURE, $these); $validationsPdc = $this->validationService->getRepository()->findValidationByCodeAndThese(TypeValidation::CODE_PAGE_DE_COUVERTURE, $these);
$pageCouvValidee = !empty($validationsPdc); $pageCouvValidee = !empty($validationsPdc);
$isExemplPapierFourniPertinent = $this->theseService->isExemplPapierFourniPertinent($these);
$view = new ViewModel([ $view = new ViewModel([
'these' => $these, 'these' => $these,
'diffusion' => $these->getDiffusionForVersion($version), 'diffusion' => $these->getDiffusionForVersion($version),
...@@ -523,6 +525,7 @@ class TheseController extends AbstractController ...@@ -523,6 +525,7 @@ class TheseController extends AbstractController
'hasVD' => $hasVD, 'hasVD' => $hasVD,
'pageCouvValidee' => $pageCouvValidee, 'pageCouvValidee' => $pageCouvValidee,
'asynchronous' => $asynchronous, 'asynchronous' => $asynchronous,
'isExemplPapierFourniPertinent' => $isExemplPapierFourniPertinent,
]); ]);
......
...@@ -59,7 +59,7 @@ $ddPageCouv = $pageCouvValidee ? $checked : $unchecked; ...@@ -59,7 +59,7 @@ $ddPageCouv = $pageCouvValidee ? $checked : $unchecked;
<?php $class = ($ok = $rdvBu->getConventionMelSignee()) ? '' : 'text-danger' ?> <?php $class = ($ok = $rdvBu->getConventionMelSignee()) ? '' : 'text-danger' ?>
<dd class="<?php echo $class ?>"><?php echo $ok ? $checked : $unchecked ?></dd> <dd class="<?php echo $class ?>"><?php echo $ok ? $checked : $unchecked ?></dd>
<?php if ($isExemplPapierFourniPertinent): ?> <?php if ($isExemplPapierFourniPertinent || $rdvBu->getExemplPapierFourni()): ?>
<dt>Exemplaire papier fourni :</dt> <dt>Exemplaire papier fourni :</dt>
<?php $class = ($ok = $rdvBu->getExemplPapierFourni()) ? '' : 'text-danger' ?> <?php $class = ($ok = $rdvBu->getExemplPapierFourni()) ? '' : 'text-danger' ?>
<dd class="<?php echo $class ?>"><?php echo $ok ? $checked : $unchecked ?></dd> <dd class="<?php echo $class ?>"><?php echo $ok ? $checked : $unchecked ?></dd>
......
...@@ -2,14 +2,13 @@ ...@@ -2,14 +2,13 @@
use Application\Controller\TheseController; use Application\Controller\TheseController;
use Application\Entity\Db\Diffusion; use Application\Entity\Db\Diffusion;
use Application\Entity\Db\Repository\FichierTheseRepository;
use Application\Entity\Db\These; use Application\Entity\Db\These;
use Application\Entity\Db\Validation; use Application\Entity\Db\Validation;
use Application\Entity\Db\WfEtape;
use Application\Provider\Privilege\ThesePrivileges; use Application\Provider\Privilege\ThesePrivileges;
use Application\Provider\Privilege\ValidationPrivileges; use Application\Provider\Privilege\ValidationPrivileges;
use Application\View\Renderer\PhpRenderer; use Application\View\Renderer\PhpRenderer;
use UnicaenApp\Service\MessageCollector; use UnicaenApp\Service\MessageCollector;
use Application\Entity\Db\Repository\FichierTheseRepository;
/** /**
* @var PhpRenderer $this * @var PhpRenderer $this
...@@ -25,7 +24,7 @@ use Application\Entity\Db\Repository\FichierTheseRepository; ...@@ -25,7 +24,7 @@ use Application\Entity\Db\Repository\FichierTheseRepository;
* @var FichierTheseRepository $fichierRepository * @var FichierTheseRepository $fichierRepository
* @var boolean $asynchronous * @var boolean $asynchronous
* *
* @see TheseController::modifierRdvBuAction() * @see TheseController::detailRdvBuAction()
*/ */
$canEdit = $this->isAllowed($these, ThesePrivileges::THESE_SAISIE_RDV_BU); $canEdit = $this->isAllowed($these, ThesePrivileges::THESE_SAISIE_RDV_BU);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment