Loading module/Soutenance/SQL/CREATION.sql +1 −1 Changes for module/Soutenance/SQL/CREATION.sql: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -102,7 +102,7 @@ create table SOUTENANCE_MEMBRE ETABLISSEMENT VARCHAR2(128) not null, ROLE_ID VARCHAR2(64) not null, EXTERIEUR VARCHAR2(3), EMAIL VARCHAR2(256) default NULL not null, EMAIL VARCHAR2(256) default NULL, ACTEUR_ID NUMBER constraint SOUTEMEMBRE_ACTEUR_FK references ACTEUR on delete cascade, VISIO NUMBER default 0 not null, NOM VARCHAR2(256), Loading module/Soutenance/src/Soutenance/Service/Membre/MembreService.php +63 −41 Changes for module/Soutenance/src/Soutenance/Service/Membre/MembreService.php: 63 added lines, 41 removed lines. Original line number Diff line number Diff line Loading @@ -25,47 +25,7 @@ class MembreService { use QualiteServiceAwareTrait; use UserContextServiceAwareTrait; /** * @return QueryBuilder */ public function createQueryBuilder() { $qb = $this->getEntityManager()->getRepository(Membre::class)->createQueryBuilder("membre") ->addSelect('proposition')->join('membre.proposition', 'proposition') ->addSelect('qualite')->join('membre.qualite', 'qualite') ->addSelect('acteur')->leftJoin('membre.acteur', 'acteur') ; return $qb; } /** * @param int $id * @return Membre */ public function find($id) { $qb = $this->createQueryBuilder() ->andWhere("membre.id = :id") ->setParameter("id", $id) ; try { $result = $qb->getQuery()->getOneOrNullResult(); } catch (NonUniqueResultException $e) { throw new RuntimeException("De multiples propositions identifiées [".$id."] ont été trouvées !"); } return $result; } /** * @param AbstractActionController $controller * @param string $paramName * @return Membre */ public function getRequestedMembre($controller, $paramName = 'membre') { $id = $controller->params()->fromRoute($paramName); $membre = $this->find($id); return $membre; } /** GESTION DES ENTITES *******************************************************************************************/ /** * @param Membre $membre Loading Loading @@ -180,6 +140,50 @@ class MembreService { } } /** REQUETES ******************************************************************************************************/ /** * @return QueryBuilder */ public function createQueryBuilder() { $qb = $this->getEntityManager()->getRepository(Membre::class)->createQueryBuilder("membre") ->addSelect('proposition')->join('membre.proposition', 'proposition') ->addSelect('qualite')->join('membre.qualite', 'qualite') ->addSelect('acteur')->leftJoin('membre.acteur', 'acteur') ; return $qb; } /** * @param int $id * @return Membre */ public function find($id) { $qb = $this->createQueryBuilder() ->andWhere("membre.id = :id") ->setParameter("id", $id) ; try { $result = $qb->getQuery()->getOneOrNullResult(); } catch (NonUniqueResultException $e) { throw new RuntimeException("De multiples propositions identifiées [".$id."] ont été trouvées !"); } return $result; } /** * @param AbstractActionController $controller * @param string $paramName * @return Membre */ public function getRequestedMembre($controller, $paramName = 'membre') { $id = $controller->params()->fromRoute($paramName); $membre = $this->find($id); return $membre; } /** * @param Proposition $proposition * @param Acteur $acteur Loading Loading @@ -256,4 +260,22 @@ class MembreService { $result = $qb->getQuery()->getResult(); return $result; } /** * @param Acteur $acteur * @return Membre */ public function getMembreByActeur(Acteur $acteur) { $qb = $this->createQueryBuilder() ->andWhere('membre.acteur = :acteur') ->setParameter('acteur', $acteur) ; try { $result = $qb->getQuery()->getOneOrNullResult(); } catch (NonUniqueResultException $e) { throw new RuntimeException("Plusieurs Membre partagent le même Acteur [".$acteur->getId()."]", 0, $e); } return $result; } } module/Soutenance/src/Soutenance/Service/Notifier/NotifierSoutenanceService.php +25 −6 Changes for module/Soutenance/src/Soutenance/Service/Notifier/NotifierSoutenanceService.php: 25 added lines, 6 removed lines. Original line number Diff line number Diff line Loading @@ -16,6 +16,7 @@ use Notification\Service\NotifierService; use Soutenance\Entity\Avis; use Soutenance\Entity\Membre; use Soutenance\Entity\Proposition; use Soutenance\Service\Membre\MembreServiceAwareTrait; use UnicaenApp\Exception\LogicException; use UnicaenApp\Exception\RuntimeException; use UnicaenAuth\Entity\Db\RoleInterface; Loading @@ -23,6 +24,7 @@ use Zend\View\Helper\Url as UrlHelper; class NotifierSoutenanceService extends NotifierService { use ActeurServiceAwareTrait; use MembreServiceAwareTrait; use RoleServiceAwareTrait; use VariableServiceAwareTrait; Loading Loading @@ -81,6 +83,24 @@ class NotifierSoutenanceService extends NotifierService { return $emails; } /** * @param These $these * @return string[] */ protected function fetchEmailEncadrants(These $these) { $emails = []; $encadrants = $this->getActeurService()->getRepository()->findEncadrementThese($these); foreach ($encadrants as $encadrant) { $email = $encadrant->getIndividu()->getEmail(); if ($email === null) { $membre = $this->getMembreService()->getMembreByActeur($encadrant); if ($membre) $email = $membre->getEmail(); } $emails[] = $email; } return $emails; } /** * @param These $these * @return array Loading @@ -90,9 +110,9 @@ class NotifierSoutenanceService extends NotifierService { $emails = []; $emails[] = $these->getDoctorant()->getIndividu()->getEmail(); $encadrants = $this->getActeurService()->getRepository()->findEncadrementThese($these); $encadrants = $this->fetchEmailEncadrants($these); foreach ($encadrants as $encadrant) { $emails[] = $encadrant->getIndividu()->getEmail(); $emails[] = $encadrant; } return $emails; } Loading Loading @@ -126,8 +146,7 @@ class NotifierSoutenanceService extends NotifierService { */ public function triggerValidationProposition($these, $validation) { $emails = $these->getDirecteursTheseEmails(); $emails[] = $these->getDoctorant()->getIndividu()->getEmail(); $emails = $this->fetchEmailActeursDirects($these); $emails = array_filter($emails, function ($s) { return $s !== null; Loading Loading @@ -439,7 +458,7 @@ class NotifierSoutenanceService extends NotifierService { public function triggerAvisFavorable($these, $avis, $url) { $emailBDD = [ $this->fetchEmailBdd($these) ]; $emailsDirecteurs = $these->getDirecteursTheseEmails(); $emailsDirecteurs = $this->fetchEmailEncadrants($these); $emailsED = $this->fetchEmailEcoleDoctorale($these); $emailsUR = $this->fetchEmailUniteRecherche($these); $emails = array_merge($emailBDD, $emailsDirecteurs, $emailsED, $emailsUR); Loading Loading @@ -469,7 +488,7 @@ class NotifierSoutenanceService extends NotifierService { */ public function triggerAvisDefavorable($these, $avis, $url) { $emailsDirecteurs = $these->getDirecteursTheseEmails(); $emailsDirecteurs = $this->fetchEmailEncadrants($these); $emailsED = $this->fetchEmailEcoleDoctorale($these); $emailsUR = $this->fetchEmailUniteRecherche($these); $emails = array_merge($emailsDirecteurs, $emailsED, $emailsUR); Loading module/Soutenance/src/Soutenance/Service/Notifier/NotifierSoutenanceServiceFactory.php +4 Changes for module/Soutenance/src/Soutenance/Service/Notifier/NotifierSoutenanceServiceFactory.php: 4 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -7,6 +7,7 @@ use Application\Service\Role\RoleService; use Application\Service\Variable\VariableService; use Application\Service\Notification\NotificationFactory; use Notification\Service\NotifierServiceFactory; use Soutenance\Service\Membre\MembreService; use Zend\Mvc\View\Console\ViewManager as ConsoleViewManager; use Zend\Mvc\View\Http\ViewManager as HttpViewManager; use Zend\ServiceManager\ServiceLocatorInterface; Loading @@ -27,10 +28,12 @@ class NotifierSoutenanceServiceFactory extends NotifierServiceFactory { /** * @var ActeurService $acteurService * @var MembreService $membreService * @var RoleService $roleService * @var VariableService $variableService */ $acteurService = $serviceLocator->get(ActeurService::class); $membreService = $serviceLocator->get(MembreService::class); $roleService = $serviceLocator->get('RoleService'); $variableService = $serviceLocator->get('VariableService'); Loading @@ -45,6 +48,7 @@ class NotifierSoutenanceServiceFactory extends NotifierServiceFactory { $service->setNotificationFactory($notificationFactory); $service->setUrlHelper($urlHelper); $service->setActeurService($acteurService); $service->setMembreService($membreService); $service->setRoleService($roleService); $service->setVariableService($variableService); Loading module/Soutenance/view/soutenance/proposition/partial/composition-jury.phtml +1 −1 Changes for module/Soutenance/view/soutenance/proposition/partial/composition-jury.phtml: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -131,7 +131,7 @@ $these = $proposition->getThese(); <td> <?php echo ($membre->getGenre()==='F')?"Madame":"Monsieur"; ?> </td> <td> <?php echo $membre->getPrenom(); ?> </td> <td> <?php echo $membre->getNom(); ?> </td> <td> <?php echo $membre->getEmail(); ?> </td> <td> <?php echo ($membre->getEmail() !== null)?$membre->getEmail():"<strong><span class='text-danger'><span class='glyphicon glyphicon-warning-sign'></span> AUCUN MAIL</span></strong>"; ?> </td> <td> <?php echo ($membre->getQualite())?$membre->getQualite()->getLibelle():"Non définie"; ?> </td> <td> <?php echo $membre->getRang(); ?> </td> <td> Loading Loading
module/Soutenance/SQL/CREATION.sql +1 −1 Changes for module/Soutenance/SQL/CREATION.sql: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -102,7 +102,7 @@ create table SOUTENANCE_MEMBRE ETABLISSEMENT VARCHAR2(128) not null, ROLE_ID VARCHAR2(64) not null, EXTERIEUR VARCHAR2(3), EMAIL VARCHAR2(256) default NULL not null, EMAIL VARCHAR2(256) default NULL, ACTEUR_ID NUMBER constraint SOUTEMEMBRE_ACTEUR_FK references ACTEUR on delete cascade, VISIO NUMBER default 0 not null, NOM VARCHAR2(256), Loading
module/Soutenance/src/Soutenance/Service/Membre/MembreService.php +63 −41 Changes for module/Soutenance/src/Soutenance/Service/Membre/MembreService.php: 63 added lines, 41 removed lines. Original line number Diff line number Diff line Loading @@ -25,47 +25,7 @@ class MembreService { use QualiteServiceAwareTrait; use UserContextServiceAwareTrait; /** * @return QueryBuilder */ public function createQueryBuilder() { $qb = $this->getEntityManager()->getRepository(Membre::class)->createQueryBuilder("membre") ->addSelect('proposition')->join('membre.proposition', 'proposition') ->addSelect('qualite')->join('membre.qualite', 'qualite') ->addSelect('acteur')->leftJoin('membre.acteur', 'acteur') ; return $qb; } /** * @param int $id * @return Membre */ public function find($id) { $qb = $this->createQueryBuilder() ->andWhere("membre.id = :id") ->setParameter("id", $id) ; try { $result = $qb->getQuery()->getOneOrNullResult(); } catch (NonUniqueResultException $e) { throw new RuntimeException("De multiples propositions identifiées [".$id."] ont été trouvées !"); } return $result; } /** * @param AbstractActionController $controller * @param string $paramName * @return Membre */ public function getRequestedMembre($controller, $paramName = 'membre') { $id = $controller->params()->fromRoute($paramName); $membre = $this->find($id); return $membre; } /** GESTION DES ENTITES *******************************************************************************************/ /** * @param Membre $membre Loading Loading @@ -180,6 +140,50 @@ class MembreService { } } /** REQUETES ******************************************************************************************************/ /** * @return QueryBuilder */ public function createQueryBuilder() { $qb = $this->getEntityManager()->getRepository(Membre::class)->createQueryBuilder("membre") ->addSelect('proposition')->join('membre.proposition', 'proposition') ->addSelect('qualite')->join('membre.qualite', 'qualite') ->addSelect('acteur')->leftJoin('membre.acteur', 'acteur') ; return $qb; } /** * @param int $id * @return Membre */ public function find($id) { $qb = $this->createQueryBuilder() ->andWhere("membre.id = :id") ->setParameter("id", $id) ; try { $result = $qb->getQuery()->getOneOrNullResult(); } catch (NonUniqueResultException $e) { throw new RuntimeException("De multiples propositions identifiées [".$id."] ont été trouvées !"); } return $result; } /** * @param AbstractActionController $controller * @param string $paramName * @return Membre */ public function getRequestedMembre($controller, $paramName = 'membre') { $id = $controller->params()->fromRoute($paramName); $membre = $this->find($id); return $membre; } /** * @param Proposition $proposition * @param Acteur $acteur Loading Loading @@ -256,4 +260,22 @@ class MembreService { $result = $qb->getQuery()->getResult(); return $result; } /** * @param Acteur $acteur * @return Membre */ public function getMembreByActeur(Acteur $acteur) { $qb = $this->createQueryBuilder() ->andWhere('membre.acteur = :acteur') ->setParameter('acteur', $acteur) ; try { $result = $qb->getQuery()->getOneOrNullResult(); } catch (NonUniqueResultException $e) { throw new RuntimeException("Plusieurs Membre partagent le même Acteur [".$acteur->getId()."]", 0, $e); } return $result; } }
module/Soutenance/src/Soutenance/Service/Notifier/NotifierSoutenanceService.php +25 −6 Changes for module/Soutenance/src/Soutenance/Service/Notifier/NotifierSoutenanceService.php: 25 added lines, 6 removed lines. Original line number Diff line number Diff line Loading @@ -16,6 +16,7 @@ use Notification\Service\NotifierService; use Soutenance\Entity\Avis; use Soutenance\Entity\Membre; use Soutenance\Entity\Proposition; use Soutenance\Service\Membre\MembreServiceAwareTrait; use UnicaenApp\Exception\LogicException; use UnicaenApp\Exception\RuntimeException; use UnicaenAuth\Entity\Db\RoleInterface; Loading @@ -23,6 +24,7 @@ use Zend\View\Helper\Url as UrlHelper; class NotifierSoutenanceService extends NotifierService { use ActeurServiceAwareTrait; use MembreServiceAwareTrait; use RoleServiceAwareTrait; use VariableServiceAwareTrait; Loading Loading @@ -81,6 +83,24 @@ class NotifierSoutenanceService extends NotifierService { return $emails; } /** * @param These $these * @return string[] */ protected function fetchEmailEncadrants(These $these) { $emails = []; $encadrants = $this->getActeurService()->getRepository()->findEncadrementThese($these); foreach ($encadrants as $encadrant) { $email = $encadrant->getIndividu()->getEmail(); if ($email === null) { $membre = $this->getMembreService()->getMembreByActeur($encadrant); if ($membre) $email = $membre->getEmail(); } $emails[] = $email; } return $emails; } /** * @param These $these * @return array Loading @@ -90,9 +110,9 @@ class NotifierSoutenanceService extends NotifierService { $emails = []; $emails[] = $these->getDoctorant()->getIndividu()->getEmail(); $encadrants = $this->getActeurService()->getRepository()->findEncadrementThese($these); $encadrants = $this->fetchEmailEncadrants($these); foreach ($encadrants as $encadrant) { $emails[] = $encadrant->getIndividu()->getEmail(); $emails[] = $encadrant; } return $emails; } Loading Loading @@ -126,8 +146,7 @@ class NotifierSoutenanceService extends NotifierService { */ public function triggerValidationProposition($these, $validation) { $emails = $these->getDirecteursTheseEmails(); $emails[] = $these->getDoctorant()->getIndividu()->getEmail(); $emails = $this->fetchEmailActeursDirects($these); $emails = array_filter($emails, function ($s) { return $s !== null; Loading Loading @@ -439,7 +458,7 @@ class NotifierSoutenanceService extends NotifierService { public function triggerAvisFavorable($these, $avis, $url) { $emailBDD = [ $this->fetchEmailBdd($these) ]; $emailsDirecteurs = $these->getDirecteursTheseEmails(); $emailsDirecteurs = $this->fetchEmailEncadrants($these); $emailsED = $this->fetchEmailEcoleDoctorale($these); $emailsUR = $this->fetchEmailUniteRecherche($these); $emails = array_merge($emailBDD, $emailsDirecteurs, $emailsED, $emailsUR); Loading Loading @@ -469,7 +488,7 @@ class NotifierSoutenanceService extends NotifierService { */ public function triggerAvisDefavorable($these, $avis, $url) { $emailsDirecteurs = $these->getDirecteursTheseEmails(); $emailsDirecteurs = $this->fetchEmailEncadrants($these); $emailsED = $this->fetchEmailEcoleDoctorale($these); $emailsUR = $this->fetchEmailUniteRecherche($these); $emails = array_merge($emailsDirecteurs, $emailsED, $emailsUR); Loading
module/Soutenance/src/Soutenance/Service/Notifier/NotifierSoutenanceServiceFactory.php +4 Changes for module/Soutenance/src/Soutenance/Service/Notifier/NotifierSoutenanceServiceFactory.php: 4 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -7,6 +7,7 @@ use Application\Service\Role\RoleService; use Application\Service\Variable\VariableService; use Application\Service\Notification\NotificationFactory; use Notification\Service\NotifierServiceFactory; use Soutenance\Service\Membre\MembreService; use Zend\Mvc\View\Console\ViewManager as ConsoleViewManager; use Zend\Mvc\View\Http\ViewManager as HttpViewManager; use Zend\ServiceManager\ServiceLocatorInterface; Loading @@ -27,10 +28,12 @@ class NotifierSoutenanceServiceFactory extends NotifierServiceFactory { /** * @var ActeurService $acteurService * @var MembreService $membreService * @var RoleService $roleService * @var VariableService $variableService */ $acteurService = $serviceLocator->get(ActeurService::class); $membreService = $serviceLocator->get(MembreService::class); $roleService = $serviceLocator->get('RoleService'); $variableService = $serviceLocator->get('VariableService'); Loading @@ -45,6 +48,7 @@ class NotifierSoutenanceServiceFactory extends NotifierServiceFactory { $service->setNotificationFactory($notificationFactory); $service->setUrlHelper($urlHelper); $service->setActeurService($acteurService); $service->setMembreService($membreService); $service->setRoleService($roleService); $service->setVariableService($variableService); Loading
module/Soutenance/view/soutenance/proposition/partial/composition-jury.phtml +1 −1 Changes for module/Soutenance/view/soutenance/proposition/partial/composition-jury.phtml: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -131,7 +131,7 @@ $these = $proposition->getThese(); <td> <?php echo ($membre->getGenre()==='F')?"Madame":"Monsieur"; ?> </td> <td> <?php echo $membre->getPrenom(); ?> </td> <td> <?php echo $membre->getNom(); ?> </td> <td> <?php echo $membre->getEmail(); ?> </td> <td> <?php echo ($membre->getEmail() !== null)?$membre->getEmail():"<strong><span class='text-danger'><span class='glyphicon glyphicon-warning-sign'></span> AUCUN MAIL</span></strong>"; ?> </td> <td> <?php echo ($membre->getQualite())?$membre->getQualite()->getLibelle():"Non définie"; ?> </td> <td> <?php echo $membre->getRang(); ?> </td> <td> Loading