Loading module/Individu/src/Individu/Controller/IndividuController.php +5 −1 Changes for module/Individu/src/Individu/Controller/IndividuController.php: 5 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -18,6 +18,7 @@ use Individu\Entity\Db\Individu; use Individu\Entity\Db\IndividuRole; use Individu\Form\IndividuForm; use Individu\Service\IndividuServiceAwareTrait; use Laminas\Diactoros\Response\JsonResponse; use Laminas\Http\Request; use Laminas\Http\Response; use Laminas\Mvc\Controller\AbstractActionController; Loading Loading @@ -181,6 +182,7 @@ class IndividuController extends AbstractActionController implements SearchContr { /** @var Request $request */ $request = $this->getRequest(); $redirectUrl = $this->params()->fromQuery('redirect'); if ($request->isPost()) { $data = $request->getPost(); $this->individuForm->setData($data); Loading @@ -190,6 +192,8 @@ class IndividuController extends AbstractActionController implements SearchContr $this->flashMessenger()->addSuccessMessage("L'individu « $individu » a été créé avec succès."); if ($redirectUrl !== null) return $this->redirect()->toUrl($redirectUrl. '&individu=' . $individu->getId()); // On positionne dans le Header un champ 'individu' pour le cas où l'action est appelée par un autre contrôleur // ayant besoin de connaître l'individu créé : $response = $this->redirect()->toRoute('individu/voir', ['individu' => $individu->getId()]); Loading @@ -203,8 +207,8 @@ class IndividuController extends AbstractActionController implements SearchContr $individu = $this->individuService->newIndividuFromUtilisateur($utilisateur); $this->individuForm->bind($individu); } if ($redirectUrl !== null) $this->individuForm->setAttribute('action', $this->url()->fromRoute('individu/ajouter',[],["query" => ["redirect" => $redirectUrl]])); } return new ViewModel([ 'form' => $this->individuForm, ]); Loading module/Soutenance/config/others/presoutenance.config.php +13 −0 Changes for module/Soutenance/config/others/presoutenance.config.php: 13 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -94,6 +94,7 @@ return [ 'action' => [ 'associer-jury', 'deassocier-jury', 'associer-jury-these-sygal' ], 'privileges' => PresoutenancePrivileges::PRESOUTENANCE_ASSOCIATION_MEMBRE_INDIVIDU, ], Loading Loading @@ -134,6 +135,7 @@ return [ 'route' => '/notifier-retard-rapport-presoutenance', 'defaults' => [ 'controller' => PresoutenanceController::class, /** @see PresoutenanceController::notifierRetardRapportPresoutenanceAction() */ 'action' => 'notifier-retard-rapport-presoutenance', ], ], Loading Loading @@ -314,6 +316,17 @@ return [ ], ], ], 'associer-jury-these-sygal' => [ 'type' => Segment::class, 'may_terminate' => true, 'options' => [ 'route' => '/associer-jury-these-sygal/:membre', 'defaults' => [ 'controller' => PresoutenanceController::class, 'action' => 'associer-jury-these-sygal', ], ], ], 'notifier-demande-avis-soutenance' => [ 'type' => Segment::class, 'may_terminate' => true, Loading module/Soutenance/src/Soutenance/Controller/PresoutenanceController.php +226 −147 File changed.Preview size limit exceeded, changes collapsed. Show changes module/Soutenance/src/Soutenance/Controller/PresoutenanceControllerFactory.php +3 −0 Changes for module/Soutenance/src/Soutenance/Controller/PresoutenanceControllerFactory.php: 3 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -24,6 +24,7 @@ use Soutenance\Service\Notification\SoutenanceNotificationFactory; use Soutenance\Service\Proposition\PropositionService; use Soutenance\Service\Validation\ValidationService; use Structure\Service\StructureDocument\StructureDocumentService; use These\Form\Acteur\ActeurForm; use These\Service\Acteur\ActeurService; use These\Service\These\TheseService; use UnicaenAuth\Service\User as UserService; Loading Loading @@ -82,6 +83,7 @@ class PresoutenanceControllerFactory $justificatifService = $container->get(JustificatifService::class); $fichierStorageService = $container->get(FichierStorageService::class); $parametreService = $container->get(ParametreService::class); $acteurForm = $container->get('FormElementManager')->get(ActeurForm::class); /** * @var DateRenduRapportForm $dateRenduRapportForm Loading Loading @@ -116,6 +118,7 @@ class PresoutenanceControllerFactory $controller->setParametreService($parametreService); $controller->setDateRenduRapportForm($dateRenduRapportForm); $controller->setAdresseSoutenanceForm($adresseSoutenanceForm); $controller->setActeurForm($acteurForm); $controller->setRenderer($renderer); Loading module/Soutenance/view/soutenance/presoutenance/partial/association-jury.phtml +20 −5 Changes for module/Soutenance/view/soutenance/presoutenance/partial/association-jury.phtml: 20 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -12,13 +12,18 @@ use Soutenance\Entity\Proposition; use Soutenance\Provider\Privilege\PresoutenancePrivileges; $canAssocierMembreIndividu = $this->isAllowed($these, PresoutenancePrivileges::PRESOUTENANCE_ASSOCIATION_MEMBRE_INDIVIDU); $theseImportee = $these->getSource()->getImportable() ?> <div class="box card"> <div class="card-header bg-dark text-white"> <div class="row"> <div class="col-md-8"> <?php if($theseImportee): ?> <h2> Association d'acteur SYGAL aux membres de jury </h2> <?php else: ?> <h2> Association d'individu SYGAL aux membres de jury </h2> <?php endif; ?> </div> <div class="col-md-4"> <p> Loading @@ -42,7 +47,11 @@ $canAssocierMembreIndividu = $this->isAllowed($these, Presoutenance <div class="card-body"> <p class="lead"> <?php if($theseImportee) : ?> Tous les membres du jury doivent être associés à des acteurs enregistrés dans SyGAL. <?php else: ?> Tous les membres (déclarés dans la composition du jury de la proposition de soutenance) doivent être associés à des individus enregistrés dans SyGAL. <?php endif; ?> </p> <table class="table table-extra-condensed"> Loading @@ -69,16 +78,22 @@ $canAssocierMembreIndividu = $this->isAllowed($these, Presoutenance <?php if($canAssocierMembreIndividu): ?> <!-- --><?php //if ($membre->estRapporteur()) : ?> <?php if (! $membre->getActeur()): ?> <a <?php /** @see \Soutenance\Controller\PresoutenanceController::associerJuryAction() */ ?> href="<?php echo $this->url('soutenance/presoutenance/associer-jury', ['these' => $these->getId(), 'membre' => $membre->getId()], [], true); ?>" class="ajax-modal" data-event="modification-date-rendu-rapport" <?php if ($theseImportee): /** @see \Soutenance\Controller\PresoutenanceController::associerJuryAction() **/ $lienAssociationJury = $this->url('soutenance/presoutenance/associer-jury', ['these' => $these->getId(), 'membre' => $membre->getId()], [], true); ?> <?php else: /** @see \Soutenance\Controller\PresoutenanceController::associerJuryTheseSygalAction() **/ $lienAssociationJury = $this->url('soutenance/presoutenance/associer-jury-these-sygal', ['these' => $these->getId(), 'membre' => $membre->getId()], [], true); ?> <?php endif; ?> <a href="<?php echo $lienAssociationJury ?>" class="action ajax-modal" data-event="modification-association-jury" > <span class="fas fa-link" title="Associer un individu à un membre de jury"></span> </a> <?php else: ?> <a <?php /** @see \Soutenance\Controller\PresoutenanceController::deassocierJuryAction() */ ?> href="<?php echo $this->url('soutenance/presoutenance/deassocier-jury', ['these' => $these->getId(), 'membre' => $membre->getId()], [], true); ?>" href="<?php echo $this->url('soutenance/presoutenance/deassocier-jury', ['these' => $these->getId(), 'membre' => $membre->getId()], [], true);; ?>" > <span class="icon icon-delete iconly" title="Casser l'association d'un individu à un membre de jury"></span> </a> Loading Loading
module/Individu/src/Individu/Controller/IndividuController.php +5 −1 Changes for module/Individu/src/Individu/Controller/IndividuController.php: 5 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -18,6 +18,7 @@ use Individu\Entity\Db\Individu; use Individu\Entity\Db\IndividuRole; use Individu\Form\IndividuForm; use Individu\Service\IndividuServiceAwareTrait; use Laminas\Diactoros\Response\JsonResponse; use Laminas\Http\Request; use Laminas\Http\Response; use Laminas\Mvc\Controller\AbstractActionController; Loading Loading @@ -181,6 +182,7 @@ class IndividuController extends AbstractActionController implements SearchContr { /** @var Request $request */ $request = $this->getRequest(); $redirectUrl = $this->params()->fromQuery('redirect'); if ($request->isPost()) { $data = $request->getPost(); $this->individuForm->setData($data); Loading @@ -190,6 +192,8 @@ class IndividuController extends AbstractActionController implements SearchContr $this->flashMessenger()->addSuccessMessage("L'individu « $individu » a été créé avec succès."); if ($redirectUrl !== null) return $this->redirect()->toUrl($redirectUrl. '&individu=' . $individu->getId()); // On positionne dans le Header un champ 'individu' pour le cas où l'action est appelée par un autre contrôleur // ayant besoin de connaître l'individu créé : $response = $this->redirect()->toRoute('individu/voir', ['individu' => $individu->getId()]); Loading @@ -203,8 +207,8 @@ class IndividuController extends AbstractActionController implements SearchContr $individu = $this->individuService->newIndividuFromUtilisateur($utilisateur); $this->individuForm->bind($individu); } if ($redirectUrl !== null) $this->individuForm->setAttribute('action', $this->url()->fromRoute('individu/ajouter',[],["query" => ["redirect" => $redirectUrl]])); } return new ViewModel([ 'form' => $this->individuForm, ]); Loading
module/Soutenance/config/others/presoutenance.config.php +13 −0 Changes for module/Soutenance/config/others/presoutenance.config.php: 13 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -94,6 +94,7 @@ return [ 'action' => [ 'associer-jury', 'deassocier-jury', 'associer-jury-these-sygal' ], 'privileges' => PresoutenancePrivileges::PRESOUTENANCE_ASSOCIATION_MEMBRE_INDIVIDU, ], Loading Loading @@ -134,6 +135,7 @@ return [ 'route' => '/notifier-retard-rapport-presoutenance', 'defaults' => [ 'controller' => PresoutenanceController::class, /** @see PresoutenanceController::notifierRetardRapportPresoutenanceAction() */ 'action' => 'notifier-retard-rapport-presoutenance', ], ], Loading Loading @@ -314,6 +316,17 @@ return [ ], ], ], 'associer-jury-these-sygal' => [ 'type' => Segment::class, 'may_terminate' => true, 'options' => [ 'route' => '/associer-jury-these-sygal/:membre', 'defaults' => [ 'controller' => PresoutenanceController::class, 'action' => 'associer-jury-these-sygal', ], ], ], 'notifier-demande-avis-soutenance' => [ 'type' => Segment::class, 'may_terminate' => true, Loading
module/Soutenance/src/Soutenance/Controller/PresoutenanceController.php +226 −147 File changed.Preview size limit exceeded, changes collapsed. Show changes
module/Soutenance/src/Soutenance/Controller/PresoutenanceControllerFactory.php +3 −0 Changes for module/Soutenance/src/Soutenance/Controller/PresoutenanceControllerFactory.php: 3 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -24,6 +24,7 @@ use Soutenance\Service\Notification\SoutenanceNotificationFactory; use Soutenance\Service\Proposition\PropositionService; use Soutenance\Service\Validation\ValidationService; use Structure\Service\StructureDocument\StructureDocumentService; use These\Form\Acteur\ActeurForm; use These\Service\Acteur\ActeurService; use These\Service\These\TheseService; use UnicaenAuth\Service\User as UserService; Loading Loading @@ -82,6 +83,7 @@ class PresoutenanceControllerFactory $justificatifService = $container->get(JustificatifService::class); $fichierStorageService = $container->get(FichierStorageService::class); $parametreService = $container->get(ParametreService::class); $acteurForm = $container->get('FormElementManager')->get(ActeurForm::class); /** * @var DateRenduRapportForm $dateRenduRapportForm Loading Loading @@ -116,6 +118,7 @@ class PresoutenanceControllerFactory $controller->setParametreService($parametreService); $controller->setDateRenduRapportForm($dateRenduRapportForm); $controller->setAdresseSoutenanceForm($adresseSoutenanceForm); $controller->setActeurForm($acteurForm); $controller->setRenderer($renderer); Loading
module/Soutenance/view/soutenance/presoutenance/partial/association-jury.phtml +20 −5 Changes for module/Soutenance/view/soutenance/presoutenance/partial/association-jury.phtml: 20 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -12,13 +12,18 @@ use Soutenance\Entity\Proposition; use Soutenance\Provider\Privilege\PresoutenancePrivileges; $canAssocierMembreIndividu = $this->isAllowed($these, PresoutenancePrivileges::PRESOUTENANCE_ASSOCIATION_MEMBRE_INDIVIDU); $theseImportee = $these->getSource()->getImportable() ?> <div class="box card"> <div class="card-header bg-dark text-white"> <div class="row"> <div class="col-md-8"> <?php if($theseImportee): ?> <h2> Association d'acteur SYGAL aux membres de jury </h2> <?php else: ?> <h2> Association d'individu SYGAL aux membres de jury </h2> <?php endif; ?> </div> <div class="col-md-4"> <p> Loading @@ -42,7 +47,11 @@ $canAssocierMembreIndividu = $this->isAllowed($these, Presoutenance <div class="card-body"> <p class="lead"> <?php if($theseImportee) : ?> Tous les membres du jury doivent être associés à des acteurs enregistrés dans SyGAL. <?php else: ?> Tous les membres (déclarés dans la composition du jury de la proposition de soutenance) doivent être associés à des individus enregistrés dans SyGAL. <?php endif; ?> </p> <table class="table table-extra-condensed"> Loading @@ -69,16 +78,22 @@ $canAssocierMembreIndividu = $this->isAllowed($these, Presoutenance <?php if($canAssocierMembreIndividu): ?> <!-- --><?php //if ($membre->estRapporteur()) : ?> <?php if (! $membre->getActeur()): ?> <a <?php /** @see \Soutenance\Controller\PresoutenanceController::associerJuryAction() */ ?> href="<?php echo $this->url('soutenance/presoutenance/associer-jury', ['these' => $these->getId(), 'membre' => $membre->getId()], [], true); ?>" class="ajax-modal" data-event="modification-date-rendu-rapport" <?php if ($theseImportee): /** @see \Soutenance\Controller\PresoutenanceController::associerJuryAction() **/ $lienAssociationJury = $this->url('soutenance/presoutenance/associer-jury', ['these' => $these->getId(), 'membre' => $membre->getId()], [], true); ?> <?php else: /** @see \Soutenance\Controller\PresoutenanceController::associerJuryTheseSygalAction() **/ $lienAssociationJury = $this->url('soutenance/presoutenance/associer-jury-these-sygal', ['these' => $these->getId(), 'membre' => $membre->getId()], [], true); ?> <?php endif; ?> <a href="<?php echo $lienAssociationJury ?>" class="action ajax-modal" data-event="modification-association-jury" > <span class="fas fa-link" title="Associer un individu à un membre de jury"></span> </a> <?php else: ?> <a <?php /** @see \Soutenance\Controller\PresoutenanceController::deassocierJuryAction() */ ?> href="<?php echo $this->url('soutenance/presoutenance/deassocier-jury', ['these' => $these->getId(), 'membre' => $membre->getId()], [], true); ?>" href="<?php echo $this->url('soutenance/presoutenance/deassocier-jury', ['these' => $these->getId(), 'membre' => $membre->getId()], [], true);; ?>" > <span class="icon icon-delete iconly" title="Casser l'association d'un individu à un membre de jury"></span> </a> Loading