Loading module/Soutenance/src/Soutenance/Form/DateLieu/DateLieuForm.php +2 −5 Changes for module/Soutenance/src/Soutenance/Form/DateLieu/DateLieuForm.php: 2 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -2,10 +2,8 @@ namespace Soutenance\Form\DateLieu; use DateTime; use Soutenance\Validator\DateGreaterThan; use Zend\Form\Element\Button; use Zend\Form\Element\Date; use Zend\Form\Element\DateTime; use Zend\Form\Element\Time; use Zend\Form\Element\Radio; use Zend\Form\Element\Text; Loading @@ -16,11 +14,10 @@ class DateLieuForm extends Form { public function init() { $twomonth = new DateTime("+2 months"); $this->add([ 'name' => 'date', 'type' => Date::class, 'type' => DateTime::class, 'options' => [ 'label' => 'Date de la soutenance : ', 'label_attributes' => [ Loading module/Soutenance/src/Soutenance/Service/Qualite/QualiteServiceFactory.php +4 Changes for module/Soutenance/src/Soutenance/Service/Qualite/QualiteServiceFactory.php: 4 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -2,6 +2,7 @@ namespace Soutenance\Service\Qualite; use Application\Service\UserContextService; use Doctrine\ORM\EntityManager; use Psr\Container\ContainerInterface; Loading @@ -16,12 +17,15 @@ class QualiteServiceFactory { /** * @var EntityManager $entityManager * @var UserContextService $userContextService */ $entityManager = $container->get('doctrine.entitymanager.orm_default'); $userContextService = $container->get('UnicaenAuth\Service\UserContext'); /** @var QualiteService $service */ $service = new QualiteService(); $service->setEntityManager($entityManager); $service->setUserContextService($userContextService); return $service; } } No newline at end of file module/Soutenance/src/Soutenance/Service/SignaturePresident/signature-president.phtml +22 −6 Changes for module/Soutenance/src/Soutenance/Service/SignaturePresident/signature-president.phtml: 22 added lines, 6 removed lines. Original line number Diff line number Diff line Loading @@ -15,6 +15,10 @@ use Soutenance\Entity\Proposition; * @var int $nbCodirecteur * @see */ $these = $proposition->getThese(); $unite = ($these->getUniteRecherche())?$these->getUniteRecherche()->getLibelle():$these->getLibelleUniteRecherche(); $ecole = ($these->getEcoleDoctorale())?$these->getEcoleDoctorale()->getLibelle():"Information manquante"; ?> <style> Loading @@ -35,6 +39,7 @@ use Soutenance\Entity\Proposition; font-size: x-large; } h2 { margin-top: 0.5cm; font-size: large; } table { Loading Loading @@ -64,6 +69,7 @@ use Soutenance\Entity\Proposition; border-bottom:solid 1px gray; /*margin-right: 0.5rem;*/ padding-right: 0.5rem; font-size: 8pt; } table.composition tbody tr { Loading Loading @@ -94,8 +100,12 @@ use Soutenance\Entity\Proposition; table.validation td{ border-bottom:solid 1px gray; margin: 1rem; font-size: 8pt; } table.validation td.validation { text-align: right; } </style> <!-- SECTION DU LOGO DE LA COMUE --------------------------------------------------------------------------------------> Loading Loading @@ -252,6 +262,7 @@ use Soutenance\Entity\Proposition; <thead> <tr> <th> Rôle </th> <th> Complément </th> <th> Dénomination </th> <th> Avis </th> <th> Date de validation </th> Loading @@ -261,11 +272,12 @@ use Soutenance\Entity\Proposition; <!-- Doctorant --> <?php if (!empty($validations[Role::CODE_DOCTORANT])): ?> <?php foreach($validations[Role::CODE_DOCTORANT] as $validation) : ?> <tr> <tr style="font-size:6pt;"> <td > Doctorant </td> <td></td> <td> <?php echo $validation->getIndividu()->getNomComplet(); ?> </td> <td> Favorable </td> <td> <?php echo $validation->getHistoCreation()->format('d/m/Y'); ?> </td> <td class="validation"> <?php echo $validation->getHistoCreation()->format('d/m/Y'); ?> </td> </tr> <?php endforeach; ?> <?php else : ?> Loading @@ -277,9 +289,10 @@ use Soutenance\Entity\Proposition; <?php foreach($validations[Role::CODE_DIRECTEUR_THESE] as $validation) : ?> <tr> <td> Directeur de thèse </td> <td></td> <td> <?php echo $validation->getIndividu()->getNomComplet(); ?> </td> <td> Favorable </td> <td> <?php echo $validation->getHistoCreation()->format('d/m/Y'); ?> </td> <td class="validation"> <?php echo $validation->getHistoCreation()->format('d/m/Y'); ?> </td> </tr> <?php endforeach; ?> <?php else : ?> Loading @@ -291,9 +304,10 @@ use Soutenance\Entity\Proposition; <?php foreach($validations[Role::CODE_CODIRECTEUR_THESE] as $validation) : ?> <tr> <td> Co-directeur de thèse </td> <td></td> <td> <?php echo $validation->getIndividu()->getNomComplet(); ?> </td> <td> Favorable </td> <td> <?php echo $validation->getHistoCreation()->format('d/m/Y'); ?> </td> <td class="validation"> <?php echo $validation->getHistoCreation()->format('d/m/Y'); ?> </td> </tr> <?php endforeach; ?> <?php else :?> Loading @@ -309,9 +323,10 @@ use Soutenance\Entity\Proposition; <?php foreach($validations[Role::CODE_UR] as $validation) : ?> <tr> <td> Directeur de l'unité de recherche </td> <td><?php echo $unite; ?></td> <td> <?php echo $validation->getIndividu()->getNomComplet(); ?> </td> <td> Favorable </td> <td> <?php echo $validation->getHistoCreation()->format('d/m/Y'); ?> </td> <td class="validation"> <?php echo $validation->getHistoCreation()->format('d/m/Y'); ?> </td> </tr> <?php endforeach; ?> <?php else: ?> Loading @@ -324,9 +339,10 @@ use Soutenance\Entity\Proposition; <?php foreach($validations[Role::CODE_ED] as $validation) : ?> <tr> <td> Directeur de l'école doctorale </td> <td><?php echo $ecole; ?></td> <td> <?php echo $validation->getIndividu()->getNomComplet(); ?> </td> <td> Favorable </td> <td> <?php echo $validation->getHistoCreation()->format('d/m/Y'); ?> </td> <td class="validation"> <?php echo $validation->getHistoCreation()->format('d/m/Y'); ?> </td> </tr> <?php endforeach; ?> <?php else: ?> Loading Loading
module/Soutenance/src/Soutenance/Form/DateLieu/DateLieuForm.php +2 −5 Changes for module/Soutenance/src/Soutenance/Form/DateLieu/DateLieuForm.php: 2 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -2,10 +2,8 @@ namespace Soutenance\Form\DateLieu; use DateTime; use Soutenance\Validator\DateGreaterThan; use Zend\Form\Element\Button; use Zend\Form\Element\Date; use Zend\Form\Element\DateTime; use Zend\Form\Element\Time; use Zend\Form\Element\Radio; use Zend\Form\Element\Text; Loading @@ -16,11 +14,10 @@ class DateLieuForm extends Form { public function init() { $twomonth = new DateTime("+2 months"); $this->add([ 'name' => 'date', 'type' => Date::class, 'type' => DateTime::class, 'options' => [ 'label' => 'Date de la soutenance : ', 'label_attributes' => [ Loading
module/Soutenance/src/Soutenance/Service/Qualite/QualiteServiceFactory.php +4 Changes for module/Soutenance/src/Soutenance/Service/Qualite/QualiteServiceFactory.php: 4 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -2,6 +2,7 @@ namespace Soutenance\Service\Qualite; use Application\Service\UserContextService; use Doctrine\ORM\EntityManager; use Psr\Container\ContainerInterface; Loading @@ -16,12 +17,15 @@ class QualiteServiceFactory { /** * @var EntityManager $entityManager * @var UserContextService $userContextService */ $entityManager = $container->get('doctrine.entitymanager.orm_default'); $userContextService = $container->get('UnicaenAuth\Service\UserContext'); /** @var QualiteService $service */ $service = new QualiteService(); $service->setEntityManager($entityManager); $service->setUserContextService($userContextService); return $service; } } No newline at end of file
module/Soutenance/src/Soutenance/Service/SignaturePresident/signature-president.phtml +22 −6 Changes for module/Soutenance/src/Soutenance/Service/SignaturePresident/signature-president.phtml: 22 added lines, 6 removed lines. Original line number Diff line number Diff line Loading @@ -15,6 +15,10 @@ use Soutenance\Entity\Proposition; * @var int $nbCodirecteur * @see */ $these = $proposition->getThese(); $unite = ($these->getUniteRecherche())?$these->getUniteRecherche()->getLibelle():$these->getLibelleUniteRecherche(); $ecole = ($these->getEcoleDoctorale())?$these->getEcoleDoctorale()->getLibelle():"Information manquante"; ?> <style> Loading @@ -35,6 +39,7 @@ use Soutenance\Entity\Proposition; font-size: x-large; } h2 { margin-top: 0.5cm; font-size: large; } table { Loading Loading @@ -64,6 +69,7 @@ use Soutenance\Entity\Proposition; border-bottom:solid 1px gray; /*margin-right: 0.5rem;*/ padding-right: 0.5rem; font-size: 8pt; } table.composition tbody tr { Loading Loading @@ -94,8 +100,12 @@ use Soutenance\Entity\Proposition; table.validation td{ border-bottom:solid 1px gray; margin: 1rem; font-size: 8pt; } table.validation td.validation { text-align: right; } </style> <!-- SECTION DU LOGO DE LA COMUE --------------------------------------------------------------------------------------> Loading Loading @@ -252,6 +262,7 @@ use Soutenance\Entity\Proposition; <thead> <tr> <th> Rôle </th> <th> Complément </th> <th> Dénomination </th> <th> Avis </th> <th> Date de validation </th> Loading @@ -261,11 +272,12 @@ use Soutenance\Entity\Proposition; <!-- Doctorant --> <?php if (!empty($validations[Role::CODE_DOCTORANT])): ?> <?php foreach($validations[Role::CODE_DOCTORANT] as $validation) : ?> <tr> <tr style="font-size:6pt;"> <td > Doctorant </td> <td></td> <td> <?php echo $validation->getIndividu()->getNomComplet(); ?> </td> <td> Favorable </td> <td> <?php echo $validation->getHistoCreation()->format('d/m/Y'); ?> </td> <td class="validation"> <?php echo $validation->getHistoCreation()->format('d/m/Y'); ?> </td> </tr> <?php endforeach; ?> <?php else : ?> Loading @@ -277,9 +289,10 @@ use Soutenance\Entity\Proposition; <?php foreach($validations[Role::CODE_DIRECTEUR_THESE] as $validation) : ?> <tr> <td> Directeur de thèse </td> <td></td> <td> <?php echo $validation->getIndividu()->getNomComplet(); ?> </td> <td> Favorable </td> <td> <?php echo $validation->getHistoCreation()->format('d/m/Y'); ?> </td> <td class="validation"> <?php echo $validation->getHistoCreation()->format('d/m/Y'); ?> </td> </tr> <?php endforeach; ?> <?php else : ?> Loading @@ -291,9 +304,10 @@ use Soutenance\Entity\Proposition; <?php foreach($validations[Role::CODE_CODIRECTEUR_THESE] as $validation) : ?> <tr> <td> Co-directeur de thèse </td> <td></td> <td> <?php echo $validation->getIndividu()->getNomComplet(); ?> </td> <td> Favorable </td> <td> <?php echo $validation->getHistoCreation()->format('d/m/Y'); ?> </td> <td class="validation"> <?php echo $validation->getHistoCreation()->format('d/m/Y'); ?> </td> </tr> <?php endforeach; ?> <?php else :?> Loading @@ -309,9 +323,10 @@ use Soutenance\Entity\Proposition; <?php foreach($validations[Role::CODE_UR] as $validation) : ?> <tr> <td> Directeur de l'unité de recherche </td> <td><?php echo $unite; ?></td> <td> <?php echo $validation->getIndividu()->getNomComplet(); ?> </td> <td> Favorable </td> <td> <?php echo $validation->getHistoCreation()->format('d/m/Y'); ?> </td> <td class="validation"> <?php echo $validation->getHistoCreation()->format('d/m/Y'); ?> </td> </tr> <?php endforeach; ?> <?php else: ?> Loading @@ -324,9 +339,10 @@ use Soutenance\Entity\Proposition; <?php foreach($validations[Role::CODE_ED] as $validation) : ?> <tr> <td> Directeur de l'école doctorale </td> <td><?php echo $ecole; ?></td> <td> <?php echo $validation->getIndividu()->getNomComplet(); ?> </td> <td> Favorable </td> <td> <?php echo $validation->getHistoCreation()->format('d/m/Y'); ?> </td> <td class="validation"> <?php echo $validation->getHistoCreation()->format('d/m/Y'); ?> </td> </tr> <?php endforeach; ?> <?php else: ?> Loading