Loading module/Application/src/Application/Controller/TheseController.php +5 −5 Changes for module/Application/src/Application/Controller/TheseController.php: 5 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -593,6 +593,10 @@ class TheseController extends AbstractController $form = $this->getServiceLocator()->get('formElementManager')->get($estDoctorant ? 'RdvBuTheseDoctorantForm' : 'RdvBuTheseForm'); $form->bind($rdvBu); if (! $rdvBu->isExemplPapierFourniPertinent()) { $form->disableExemplPapierFourni(); } if ($this->getRequest()->isPost()) { $post = $this->getRequest()->getPost(); $form->setData($post); Loading Loading @@ -1122,11 +1126,7 @@ class TheseController extends AbstractController /** @var AttestationTheseForm $form */ $form = $this->getServiceLocator()->get('formElementManager')->get('AttestationTheseForm'); $rule = new AutorisationDiffusionRule(); $rule->setDiffusion($these->getDiffusion()); $rule->execute(); $exemplairePaiperRequis = $rule->computeRemiseExemplairePapierEstRequise(); if (! $exemplairePaiperRequis) { if (! $these->getDiffusion()->isRemiseExemplairePapierRequise()) { $form->disableExemplaireImprimeConformeAVersionDeposee(); } Loading module/Application/src/Application/Entity/Db/Diffusion.php +12 −0 Changes for module/Application/src/Application/Entity/Db/Diffusion.php: 12 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -3,6 +3,7 @@ namespace Application\Entity\Db; use Application\Constants; use Application\Rule\AutorisationDiffusionRule; use UnicaenApp\Entity\HistoriqueAwareInterface; use UnicaenApp\Entity\HistoriqueAwareTrait; use UnicaenApp\Message\Message; Loading Loading @@ -326,6 +327,17 @@ class Diffusion implements HistoriqueAwareInterface return $this; } /** * Teste si l'exemplaire papier de la thèse est requis, d'après la réponse à l'autorisation de diffusion. * * @return bool */ public function isRemiseExemplairePapierRequise() { $rule = new AutorisationDiffusionRule(); $rule->setDiffusion($this); return $rule->computeRemiseExemplairePapierEstRequise(); } } module/Application/src/Application/Entity/Db/RdvBu.php +18 −4 Changes for module/Application/src/Application/Entity/Db/RdvBu.php: 18 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -36,9 +36,9 @@ class RdvBu implements HistoriqueAwareInterface private $versionArchivableFournie = false; /** * @var boolean * @var boolean|null */ private $exemplPapierFourni = false; private $exemplPapierFourni; /** * @var string Loading Loading @@ -100,8 +100,11 @@ class RdvBu implements HistoriqueAwareInterface */ public function isInfosBuSaisies() { $exemplairePapierFourniPertinent = $this->isExemplPapierFourniPertinent(); return $this->getExemplPapierFourni() && $this->getConventionMelSignee() && $this->getMotsClesRameau() && (!$exemplairePapierFourniPertinent || $exemplairePapierFourniPertinent && $this->getExemplPapierFourni()) && $this->getConventionMelSignee() && $this->getMotsClesRameau() && $this->isVersionArchivableFournie(); } Loading Loading @@ -213,13 +216,24 @@ class RdvBu implements HistoriqueAwareInterface /** * Get exemplPapierFourni * * @return boolean * @return boolean|null */ public function getExemplPapierFourni() { return $this->exemplPapierFourni; } /** * Détermine d'après la réponse à l'autorisation de diffusion de la thèse si le flag de remise de * l'exemplaire papier est pertinent ou non. * * @return boolean|null */ public function isExemplPapierFourniPertinent() { return $this->getThese()->getDiffusion()->isRemiseExemplairePapierRequise(); } /** * Set motsClesRameau * Loading module/Application/src/Application/Form/RdvBuTheseForm.php +22 −1 Changes for module/Application/src/Application/Form/RdvBuTheseForm.php: 22 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -5,7 +5,6 @@ namespace Application\Form; use Application\Entity\Db\RdvBu; use Application\Filter\MotsClesFilter; use Zend\Form\Element\Checkbox; use Zend\Form\Element\Radio; use Zend\Form\Element\Submit; use Zend\Form\Element\Textarea; use Zend\Form\Form; Loading @@ -16,6 +15,16 @@ class RdvBuTheseForm extends Form const SEPARATEUR_MOTS_CLES_RAMEAU = RdvBu::SEPARATEUR_MOTS_CLES_RAMEAU; const SEPARATEUR_MOTS_CLES_RAMEAU_LIB = RdvBu::SEPARATEUR_MOTS_CLES_RAMEAU_LIB; private $disableExemplPapierFourni = false; /** * @param bool $disable */ public function disableExemplPapierFourni(bool $disable = true) { $this->disableExemplPapierFourni = $disable; } /** * NB: hydrateur injecté par la factory */ Loading Loading @@ -138,4 +147,16 @@ class RdvBuTheseForm extends Form ], ])); } /** * {@inheritDoc} */ public function prepare() { if ($this->disableExemplPapierFourni) { $this->remove('exemplPapierFourni'); } return parent::prepare(); } } No newline at end of file module/Application/view/application/these/modifier-rdv-bu.phtml +2 −0 Changes for module/Application/view/application/these/modifier-rdv-bu.phtml: 2 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -52,7 +52,9 @@ $fcg = $this->formControlGroup(); <label for="">Version en ligne et papier</label><br/> <?php echo $fcg($form->get('versionArchivableFournie')) ?> <?php echo $fcg($form->get('conventionMelSignee')) ?> <?php if ($form->has('exemplPapierFourni')): ?> <?php echo $fcg($form->get('exemplPapierFourni')) ?> <?php endif ?> </div> <div class="col-md-6"> <?php echo $fcg($form->get('divers')) ?> Loading Loading
module/Application/src/Application/Controller/TheseController.php +5 −5 Changes for module/Application/src/Application/Controller/TheseController.php: 5 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -593,6 +593,10 @@ class TheseController extends AbstractController $form = $this->getServiceLocator()->get('formElementManager')->get($estDoctorant ? 'RdvBuTheseDoctorantForm' : 'RdvBuTheseForm'); $form->bind($rdvBu); if (! $rdvBu->isExemplPapierFourniPertinent()) { $form->disableExemplPapierFourni(); } if ($this->getRequest()->isPost()) { $post = $this->getRequest()->getPost(); $form->setData($post); Loading Loading @@ -1122,11 +1126,7 @@ class TheseController extends AbstractController /** @var AttestationTheseForm $form */ $form = $this->getServiceLocator()->get('formElementManager')->get('AttestationTheseForm'); $rule = new AutorisationDiffusionRule(); $rule->setDiffusion($these->getDiffusion()); $rule->execute(); $exemplairePaiperRequis = $rule->computeRemiseExemplairePapierEstRequise(); if (! $exemplairePaiperRequis) { if (! $these->getDiffusion()->isRemiseExemplairePapierRequise()) { $form->disableExemplaireImprimeConformeAVersionDeposee(); } Loading
module/Application/src/Application/Entity/Db/Diffusion.php +12 −0 Changes for module/Application/src/Application/Entity/Db/Diffusion.php: 12 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -3,6 +3,7 @@ namespace Application\Entity\Db; use Application\Constants; use Application\Rule\AutorisationDiffusionRule; use UnicaenApp\Entity\HistoriqueAwareInterface; use UnicaenApp\Entity\HistoriqueAwareTrait; use UnicaenApp\Message\Message; Loading Loading @@ -326,6 +327,17 @@ class Diffusion implements HistoriqueAwareInterface return $this; } /** * Teste si l'exemplaire papier de la thèse est requis, d'après la réponse à l'autorisation de diffusion. * * @return bool */ public function isRemiseExemplairePapierRequise() { $rule = new AutorisationDiffusionRule(); $rule->setDiffusion($this); return $rule->computeRemiseExemplairePapierEstRequise(); } }
module/Application/src/Application/Entity/Db/RdvBu.php +18 −4 Changes for module/Application/src/Application/Entity/Db/RdvBu.php: 18 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -36,9 +36,9 @@ class RdvBu implements HistoriqueAwareInterface private $versionArchivableFournie = false; /** * @var boolean * @var boolean|null */ private $exemplPapierFourni = false; private $exemplPapierFourni; /** * @var string Loading Loading @@ -100,8 +100,11 @@ class RdvBu implements HistoriqueAwareInterface */ public function isInfosBuSaisies() { $exemplairePapierFourniPertinent = $this->isExemplPapierFourniPertinent(); return $this->getExemplPapierFourni() && $this->getConventionMelSignee() && $this->getMotsClesRameau() && (!$exemplairePapierFourniPertinent || $exemplairePapierFourniPertinent && $this->getExemplPapierFourni()) && $this->getConventionMelSignee() && $this->getMotsClesRameau() && $this->isVersionArchivableFournie(); } Loading Loading @@ -213,13 +216,24 @@ class RdvBu implements HistoriqueAwareInterface /** * Get exemplPapierFourni * * @return boolean * @return boolean|null */ public function getExemplPapierFourni() { return $this->exemplPapierFourni; } /** * Détermine d'après la réponse à l'autorisation de diffusion de la thèse si le flag de remise de * l'exemplaire papier est pertinent ou non. * * @return boolean|null */ public function isExemplPapierFourniPertinent() { return $this->getThese()->getDiffusion()->isRemiseExemplairePapierRequise(); } /** * Set motsClesRameau * Loading
module/Application/src/Application/Form/RdvBuTheseForm.php +22 −1 Changes for module/Application/src/Application/Form/RdvBuTheseForm.php: 22 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -5,7 +5,6 @@ namespace Application\Form; use Application\Entity\Db\RdvBu; use Application\Filter\MotsClesFilter; use Zend\Form\Element\Checkbox; use Zend\Form\Element\Radio; use Zend\Form\Element\Submit; use Zend\Form\Element\Textarea; use Zend\Form\Form; Loading @@ -16,6 +15,16 @@ class RdvBuTheseForm extends Form const SEPARATEUR_MOTS_CLES_RAMEAU = RdvBu::SEPARATEUR_MOTS_CLES_RAMEAU; const SEPARATEUR_MOTS_CLES_RAMEAU_LIB = RdvBu::SEPARATEUR_MOTS_CLES_RAMEAU_LIB; private $disableExemplPapierFourni = false; /** * @param bool $disable */ public function disableExemplPapierFourni(bool $disable = true) { $this->disableExemplPapierFourni = $disable; } /** * NB: hydrateur injecté par la factory */ Loading Loading @@ -138,4 +147,16 @@ class RdvBuTheseForm extends Form ], ])); } /** * {@inheritDoc} */ public function prepare() { if ($this->disableExemplPapierFourni) { $this->remove('exemplPapierFourni'); } return parent::prepare(); } } No newline at end of file
module/Application/view/application/these/modifier-rdv-bu.phtml +2 −0 Changes for module/Application/view/application/these/modifier-rdv-bu.phtml: 2 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -52,7 +52,9 @@ $fcg = $this->formControlGroup(); <label for="">Version en ligne et papier</label><br/> <?php echo $fcg($form->get('versionArchivableFournie')) ?> <?php echo $fcg($form->get('conventionMelSignee')) ?> <?php if ($form->has('exemplPapierFourni')): ?> <?php echo $fcg($form->get('exemplPapierFourni')) ?> <?php endif ?> </div> <div class="col-md-6"> <?php echo $fcg($form->get('divers')) ?> Loading