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/src/Application/Form/MetadonneeTheseForm.php b/module/Application/src/Application/Form/MetadonneeTheseForm.php index ec76ff00d6e7c6b81410db4479f06deed7fd9b85..585aee40180a38d302628a4cff243428fcf7438f 100644 --- a/module/Application/src/Application/Form/MetadonneeTheseForm.php +++ b/module/Application/src/Application/Form/MetadonneeTheseForm.php @@ -84,7 +84,7 @@ class MetadonneeTheseForm extends Form implements InputFilterProviderInterface 'type' => 'Textarea', 'name' => $name = 'resume', 'options' => [ - 'label' => "Resumé en <u>français</u> (" . ($ml = $this->resumeMaxlength[$name]) . " caractères maximum, espaces compris)", + 'label' => "Résumé en <u>français</u> (" . ($ml = $this->resumeMaxlength[$name]) . " caractères maximum, espaces compris)", 'label_options' => [ 'disable_html_escape' => true, ] @@ -100,7 +100,7 @@ class MetadonneeTheseForm extends Form implements InputFilterProviderInterface 'type' => 'Textarea', 'name' => $name = 'resumeAnglais', 'options' => [ - 'label' => "Resumé en <u>anglais</u> (" . ($ml = $this->resumeMaxlength[$name]) . " caractères maximum, espaces compris)", + 'label' => "Résumé en <u>anglais</u> (" . ($ml = $this->resumeMaxlength[$name]) . " caractères maximum, espaces compris)", 'label_options' => [ 'disable_html_escape' => true, ] diff --git a/module/Application/view/application/these/attestation.phtml b/module/Application/view/application/these/attestation.phtml index 3cf6bb98f0a3e4f67b3952eeabc6e3d7b3bd88ac..47de30a31a6523013ed173a6cff1f9239d27f499 100644 --- a/module/Application/view/application/these/attestation.phtml +++ b/module/Application/view/application/these/attestation.phtml @@ -26,7 +26,7 @@ $canEdit = $this->isAllowed($these, $privilege); <div class="box panel panel-info"> <div class="panel-heading"> - <h2>Attestations</h2> + <h2>Attestation</h2> </div> <div class="panel-body"> diff --git a/module/Application/view/application/these/modifier-description.phtml b/module/Application/view/application/these/modifier-description.phtml index 588b1996259c3ab15f121e2e8f491301eddab561..f2d8f54c2bf3f52425f817a69273b8db226ed0e4 100644 --- a/module/Application/view/application/these/modifier-description.phtml +++ b/module/Application/view/application/these/modifier-description.phtml @@ -1,5 +1,6 @@ <?php +use Application\Controller\TheseController; use Application\Entity\Db\These; use Application\Provider\Privilege\ThesePrivileges; use Application\View\Renderer\PhpRenderer; @@ -12,6 +13,8 @@ use Zend\Form\Form; * @var Form $form * * @method string formControlGroup() + * + * @see TheseController::modifierDescriptionAction() */ $canEdit = true; 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);