Loading config/application.config.php +1 −0 Changes for config/application.config.php: 1 added line, 0 removed lines. Original line number Diff line number Diff line Loading @@ -39,6 +39,7 @@ return [ 'UnicaenPdf', 'UnicaenRenderer', 'UnicaenParametre', 'Horodatage', 'Structure', 'These', 'Fichier', Loading module/Horodatage/src/Horodatage/Service/Horodatage/HorodatageService.php +1 −1 Changes for module/Horodatage/src/Horodatage/Service/Horodatage/HorodatageService.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -76,7 +76,7 @@ class HorodatageService { public function createHorodatage(string $type, ?string $complement = null) : Horodatage { $timestamp = new DateTime(); $utilisateur = $this->userContextService->getIdentity(); $utilisateur = $this->userContextService->getIdentityDb(); $horodatage = new Horodatage(); $horodatage->setDate($timestamp); Loading module/Soutenance/config/others/proposition.config.php +3 −0 Changes for module/Soutenance/config/others/proposition.config.php: 3 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -30,6 +30,8 @@ use Soutenance\Form\Membre\MembreHydratorFactory; use Soutenance\Form\Refus\RefusForm; use Soutenance\Form\Refus\RefusFormFactory; use Soutenance\Provider\Privilege\PropositionPrivileges; use Soutenance\Service\Horodatage\HorodatageService; use Soutenance\Service\Horodatage\HorodatageServiceFactory; use Soutenance\Service\Proposition\PropositionSearchService; use Soutenance\Service\Proposition\PropositionSearchServiceFactory; use Soutenance\Service\Proposition\PropositionService; Loading Loading @@ -461,6 +463,7 @@ return [ PropositionService::class => PropositionServiceFactory::class, PropositionSearchService::class => PropositionSearchServiceFactory::class, PropositionAssertion::class => PropositionAssertionFactory::class, HorodatageService::class => HorodatageServiceFactory::class, ], ], 'controllers' => [ Loading module/Soutenance/src/Soutenance/Controller/PropositionController.php +18 −9 Changes for module/Soutenance/src/Soutenance/Controller/PropositionController.php: 18 added lines, 9 removed lines. Original line number Diff line number Diff line Loading @@ -8,7 +8,6 @@ use Application\Entity\Db\Utilisateur; use Application\Service\Role\RoleServiceAwareTrait; use Application\Service\UserContextServiceAwareTrait; use Fichier\Service\Fichier\FichierStorageServiceAwareTrait; use Horodatage\Entity\Db\Horodatage; use Individu\Entity\Db\Individu; use Individu\Entity\Db\IndividuRole; use Information\Service\InformationServiceAwareTrait; Loading Loading @@ -36,6 +35,8 @@ use Soutenance\Provider\Validation\TypeValidation; use Soutenance\Service\Avis\AvisServiceAwareTrait; use Soutenance\Service\Evenement\EvenementServiceAwareTrait; use Soutenance\Service\Exporter\SermentExporter\SermentPdfExporter; use Soutenance\Service\Horodatage\HorodatageService; use Soutenance\Service\Horodatage\HorodatageServiceAwareTrait; use Soutenance\Service\Justificatif\JustificatifServiceAwareTrait; use Soutenance\Service\Membre\MembreServiceAwareTrait; use Soutenance\Service\Notification\SoutenanceNotificationFactoryAwareTrait; Loading @@ -60,6 +61,7 @@ class PropositionController extends AbstractController use EvenementServiceAwareTrait; use EtablissementServiceAwareTrait; use FichierStorageServiceAwareTrait; use HorodatageServiceAwareTrait; use InformationServiceAwareTrait; use JustificatifServiceAwareTrait; use MembreServiceAwareTrait; Loading @@ -82,13 +84,8 @@ class PropositionController extends AbstractController use PropositionAssertionAwareTrait; /** @var PhpRenderer */ private $renderer; /** * @param PhpRenderer $renderer */ public function setRenderer(PhpRenderer $renderer) private PhpRenderer $renderer; public function setRenderer(PhpRenderer $renderer) : void { $this->renderer = $renderer; } Loading Loading @@ -226,6 +223,7 @@ class PropositionController extends AbstractController 'FORMULAIRE_DEMANDE_LABEL' => $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_LABEL_EUROPEEN), 'FORMULAIRE_DEMANDE_ANGLAIS' => $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_REDACTION_ANGLAIS), 'FORMULAIRE_DEMANDE_CONFIDENTIALITE' => $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_CONFIDENTIALITE), ]); } Loading @@ -244,6 +242,7 @@ class PropositionController extends AbstractController $request = $this->getRequest(); if ($request->isPost()) { $this->update($request, $form, $proposition); $this->getHorodatageService()->addHorodatage($proposition, HorodatageService::TYPE_MODIFICATION, "Date et lieu"); $this->getPropositionService()->initialisationDateRetour($proposition); if (!$this->isAllowed($these, PropositionPrivileges::PROPOSITION_MODIFIER_GESTION)) $this->getPropositionService()->annulerValidationsForProposition($proposition); } Loading Loading @@ -287,6 +286,7 @@ class PropositionController extends AbstractController } else { $this->getMembreService()->create($membre); } $this->getHorodatageService()->addHorodatage($proposition, HorodatageService::TYPE_MODIFICATION, "Jury"); if (!$this->isAllowed($these, PropositionPrivileges::PROPOSITION_MODIFIER_GESTION)) $this->getPropositionService()->annulerValidationsForProposition($proposition); } } Loading @@ -312,6 +312,7 @@ class PropositionController extends AbstractController if ($membre) { if (!$this->isAllowed($these, PropositionPrivileges::PROPOSITION_MODIFIER_GESTION)) $this->getPropositionService()->annulerValidationsForProposition($membre->getProposition()); $this->getMembreService()->delete($membre); $this->getHorodatageService()->addHorodatage($proposition, HorodatageService::TYPE_MODIFICATION, "Jury"); } return $this->redirect()->toRoute('soutenance/proposition', ['these' => $these->getId()], [], true); Loading @@ -332,6 +333,7 @@ class PropositionController extends AbstractController $request = $this->getRequest(); if ($request->isPost()) { $this->update($request, $form, $proposition); $this->getHorodatageService()->addHorodatage($proposition, HorodatageService::TYPE_MODIFICATION, "Informations complémentaires"); if (!$this->isAllowed($these, PropositionPrivileges::PROPOSITION_MODIFIER_GESTION)) $this->getPropositionService()->annulerValidationsForProposition($proposition); } Loading Loading @@ -359,6 +361,7 @@ class PropositionController extends AbstractController $request = $this->getRequest(); if ($request->isPost()) { $this->update($request, $form, $proposition); $this->getHorodatageService()->addHorodatage($proposition, HorodatageService::TYPE_MODIFICATION, "Informations complémentaires"); if (!$this->isAllowed($these, PropositionPrivileges::PROPOSITION_MODIFIER_GESTION)) $this->getPropositionService()->annulerValidationsForProposition($proposition); } Loading Loading @@ -386,6 +389,7 @@ class PropositionController extends AbstractController $request = $this->getRequest(); if ($request->isPost()) { $this->update($request, $form, $proposition); $this->getHorodatageService()->addHorodatage($proposition, HorodatageService::TYPE_MODIFICATION, "Informations complémentaires"); if (!$this->isAllowed($these, PropositionPrivileges::PROPOSITION_MODIFIER_GESTION)) $this->getPropositionService()->annulerValidationsForProposition($proposition); } Loading Loading @@ -414,6 +418,7 @@ class PropositionController extends AbstractController $request = $this->getRequest(); if ($request->isPost()) { $this->update($request, $form, $proposition); $this->getHorodatageService()->addHorodatage($proposition, HorodatageService::TYPE_MODIFICATION, "Informations complémentaires"); if (!$this->isAllowed($these, PropositionPrivileges::PROPOSITION_MODIFIER_GESTION)) $this->getPropositionService()->annulerValidationsForProposition($proposition); } Loading @@ -435,6 +440,7 @@ class PropositionController extends AbstractController if ($autorisation !== null) return $autorisation; $validation = $this->getValidationService()->validatePropositionSoutenance($these); $this->getHorodatageService()->addHorodatage($proposition, HorodatageService::TYPE_VALIDATION, "Acteurs directes"); try { $notif = $this->soutenanceNotificationFactory->createNotificationValidationProposition($these, $validation); $this->notifierService->trigger($notif); Loading Loading @@ -487,6 +493,7 @@ class PropositionController extends AbstractController switch ($role->getCode()) { case Role::CODE_RESP_UR : $this->getValidationService()->validateValidationUR($these, $individu); $this->getHorodatageService()->addHorodatage($proposition, HorodatageService::TYPE_VALIDATION, "Structures"); try { $notif = $this->soutenanceNotificationFactory->createNotificationEcoleDoctoraleProposition($these); $this->notifierService->trigger($notif); Loading Loading @@ -547,6 +554,8 @@ class PropositionController extends AbstractController $data = $request->getPost(); if ($data['motif'] !== null) { $this->getPropositionService()->annulerValidationsForProposition($proposition); $this->getHorodatageService()->addHorodatage($proposition, HorodatageService::TYPE_VALIDATION, "Structures"); $currentUser = $this->userContextService->getIdentityIndividu(); /** @var RoleInterface $currentRole */ $currentRole = $this->userContextService->getSelectedIdentityRole(); Loading Loading @@ -580,6 +589,7 @@ class PropositionController extends AbstractController $this->getEvenementService()->ajouterEvenement($proposition, Evenement::EVENEMENT_SIGNATURE); $this->getHorodatageService()->addHorodatage($proposition, HorodatageService::TYPE_EDITION, "Autorisation de soutenance"); $exporter = new SiganturePresidentPdfExporter($this->renderer, 'A4'); $exporter->setVars([ Loading Loading @@ -847,7 +857,6 @@ class PropositionController extends AbstractController $proposition = $this->getPropositionService()->findOneForThese($these); $horodatages = $proposition->getHorodatages(); usort($horodatages, function (Horodatage $a, Horodatage $b) { return $a->getDate() > $b->getDate();}); return new ViewModel([ 'these' => $these, Loading module/Soutenance/src/Soutenance/Controller/PropositionControllerFactory.php +4 −0 Changes for module/Soutenance/src/Soutenance/Controller/PropositionControllerFactory.php: 4 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -7,6 +7,7 @@ use Information\Service\InformationService; use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; use Soutenance\Service\Avis\AvisService; use Soutenance\Service\Horodatage\HorodatageService; use Soutenance\Service\Notification\SoutenanceNotificationFactory; use Structure\Service\Etablissement\EtablissementService; use These\Service\Acteur\ActeurService; Loading Loading @@ -51,6 +52,7 @@ class PropositionControllerFactory * @var InformationService $informationService * @var EvenementService $evenementService * @var FichierStorageService $fichierStorageService * @var HorodatageService $horodatageService * @var MembreService $membreService * @var NotifierService $notifierService * @var PropositionService $propositionService Loading @@ -67,6 +69,7 @@ class PropositionControllerFactory $etablissementService = $container->get(EtablissementService::class); $evenementService = $container->get(EvenementService::class); $fichierStorageService = $container->get(FichierStorageService::class); $horodatageService = $container->get(HorodatageService::class); $informationService = $container->get(InformationService::class); $membreService = $container->get(MembreService::class); $notifierService = $container->get(NotifierService::class); Loading Loading @@ -111,6 +114,7 @@ class PropositionControllerFactory $controller->setEtablissementService($etablissementService); $controller->setEvenementService($evenementService); $controller->setFichierStorageService($fichierStorageService); $controller->setHorodatageService($horodatageService); $controller->setInformationService($informationService); $controller->setMembreService($membreService); $controller->setNotifierService($notifierService); Loading Loading
config/application.config.php +1 −0 Changes for config/application.config.php: 1 added line, 0 removed lines. Original line number Diff line number Diff line Loading @@ -39,6 +39,7 @@ return [ 'UnicaenPdf', 'UnicaenRenderer', 'UnicaenParametre', 'Horodatage', 'Structure', 'These', 'Fichier', Loading
module/Horodatage/src/Horodatage/Service/Horodatage/HorodatageService.php +1 −1 Changes for module/Horodatage/src/Horodatage/Service/Horodatage/HorodatageService.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -76,7 +76,7 @@ class HorodatageService { public function createHorodatage(string $type, ?string $complement = null) : Horodatage { $timestamp = new DateTime(); $utilisateur = $this->userContextService->getIdentity(); $utilisateur = $this->userContextService->getIdentityDb(); $horodatage = new Horodatage(); $horodatage->setDate($timestamp); Loading
module/Soutenance/config/others/proposition.config.php +3 −0 Changes for module/Soutenance/config/others/proposition.config.php: 3 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -30,6 +30,8 @@ use Soutenance\Form\Membre\MembreHydratorFactory; use Soutenance\Form\Refus\RefusForm; use Soutenance\Form\Refus\RefusFormFactory; use Soutenance\Provider\Privilege\PropositionPrivileges; use Soutenance\Service\Horodatage\HorodatageService; use Soutenance\Service\Horodatage\HorodatageServiceFactory; use Soutenance\Service\Proposition\PropositionSearchService; use Soutenance\Service\Proposition\PropositionSearchServiceFactory; use Soutenance\Service\Proposition\PropositionService; Loading Loading @@ -461,6 +463,7 @@ return [ PropositionService::class => PropositionServiceFactory::class, PropositionSearchService::class => PropositionSearchServiceFactory::class, PropositionAssertion::class => PropositionAssertionFactory::class, HorodatageService::class => HorodatageServiceFactory::class, ], ], 'controllers' => [ Loading
module/Soutenance/src/Soutenance/Controller/PropositionController.php +18 −9 Changes for module/Soutenance/src/Soutenance/Controller/PropositionController.php: 18 added lines, 9 removed lines. Original line number Diff line number Diff line Loading @@ -8,7 +8,6 @@ use Application\Entity\Db\Utilisateur; use Application\Service\Role\RoleServiceAwareTrait; use Application\Service\UserContextServiceAwareTrait; use Fichier\Service\Fichier\FichierStorageServiceAwareTrait; use Horodatage\Entity\Db\Horodatage; use Individu\Entity\Db\Individu; use Individu\Entity\Db\IndividuRole; use Information\Service\InformationServiceAwareTrait; Loading Loading @@ -36,6 +35,8 @@ use Soutenance\Provider\Validation\TypeValidation; use Soutenance\Service\Avis\AvisServiceAwareTrait; use Soutenance\Service\Evenement\EvenementServiceAwareTrait; use Soutenance\Service\Exporter\SermentExporter\SermentPdfExporter; use Soutenance\Service\Horodatage\HorodatageService; use Soutenance\Service\Horodatage\HorodatageServiceAwareTrait; use Soutenance\Service\Justificatif\JustificatifServiceAwareTrait; use Soutenance\Service\Membre\MembreServiceAwareTrait; use Soutenance\Service\Notification\SoutenanceNotificationFactoryAwareTrait; Loading @@ -60,6 +61,7 @@ class PropositionController extends AbstractController use EvenementServiceAwareTrait; use EtablissementServiceAwareTrait; use FichierStorageServiceAwareTrait; use HorodatageServiceAwareTrait; use InformationServiceAwareTrait; use JustificatifServiceAwareTrait; use MembreServiceAwareTrait; Loading @@ -82,13 +84,8 @@ class PropositionController extends AbstractController use PropositionAssertionAwareTrait; /** @var PhpRenderer */ private $renderer; /** * @param PhpRenderer $renderer */ public function setRenderer(PhpRenderer $renderer) private PhpRenderer $renderer; public function setRenderer(PhpRenderer $renderer) : void { $this->renderer = $renderer; } Loading Loading @@ -226,6 +223,7 @@ class PropositionController extends AbstractController 'FORMULAIRE_DEMANDE_LABEL' => $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_LABEL_EUROPEEN), 'FORMULAIRE_DEMANDE_ANGLAIS' => $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_REDACTION_ANGLAIS), 'FORMULAIRE_DEMANDE_CONFIDENTIALITE' => $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_CONFIDENTIALITE), ]); } Loading @@ -244,6 +242,7 @@ class PropositionController extends AbstractController $request = $this->getRequest(); if ($request->isPost()) { $this->update($request, $form, $proposition); $this->getHorodatageService()->addHorodatage($proposition, HorodatageService::TYPE_MODIFICATION, "Date et lieu"); $this->getPropositionService()->initialisationDateRetour($proposition); if (!$this->isAllowed($these, PropositionPrivileges::PROPOSITION_MODIFIER_GESTION)) $this->getPropositionService()->annulerValidationsForProposition($proposition); } Loading Loading @@ -287,6 +286,7 @@ class PropositionController extends AbstractController } else { $this->getMembreService()->create($membre); } $this->getHorodatageService()->addHorodatage($proposition, HorodatageService::TYPE_MODIFICATION, "Jury"); if (!$this->isAllowed($these, PropositionPrivileges::PROPOSITION_MODIFIER_GESTION)) $this->getPropositionService()->annulerValidationsForProposition($proposition); } } Loading @@ -312,6 +312,7 @@ class PropositionController extends AbstractController if ($membre) { if (!$this->isAllowed($these, PropositionPrivileges::PROPOSITION_MODIFIER_GESTION)) $this->getPropositionService()->annulerValidationsForProposition($membre->getProposition()); $this->getMembreService()->delete($membre); $this->getHorodatageService()->addHorodatage($proposition, HorodatageService::TYPE_MODIFICATION, "Jury"); } return $this->redirect()->toRoute('soutenance/proposition', ['these' => $these->getId()], [], true); Loading @@ -332,6 +333,7 @@ class PropositionController extends AbstractController $request = $this->getRequest(); if ($request->isPost()) { $this->update($request, $form, $proposition); $this->getHorodatageService()->addHorodatage($proposition, HorodatageService::TYPE_MODIFICATION, "Informations complémentaires"); if (!$this->isAllowed($these, PropositionPrivileges::PROPOSITION_MODIFIER_GESTION)) $this->getPropositionService()->annulerValidationsForProposition($proposition); } Loading Loading @@ -359,6 +361,7 @@ class PropositionController extends AbstractController $request = $this->getRequest(); if ($request->isPost()) { $this->update($request, $form, $proposition); $this->getHorodatageService()->addHorodatage($proposition, HorodatageService::TYPE_MODIFICATION, "Informations complémentaires"); if (!$this->isAllowed($these, PropositionPrivileges::PROPOSITION_MODIFIER_GESTION)) $this->getPropositionService()->annulerValidationsForProposition($proposition); } Loading Loading @@ -386,6 +389,7 @@ class PropositionController extends AbstractController $request = $this->getRequest(); if ($request->isPost()) { $this->update($request, $form, $proposition); $this->getHorodatageService()->addHorodatage($proposition, HorodatageService::TYPE_MODIFICATION, "Informations complémentaires"); if (!$this->isAllowed($these, PropositionPrivileges::PROPOSITION_MODIFIER_GESTION)) $this->getPropositionService()->annulerValidationsForProposition($proposition); } Loading Loading @@ -414,6 +418,7 @@ class PropositionController extends AbstractController $request = $this->getRequest(); if ($request->isPost()) { $this->update($request, $form, $proposition); $this->getHorodatageService()->addHorodatage($proposition, HorodatageService::TYPE_MODIFICATION, "Informations complémentaires"); if (!$this->isAllowed($these, PropositionPrivileges::PROPOSITION_MODIFIER_GESTION)) $this->getPropositionService()->annulerValidationsForProposition($proposition); } Loading @@ -435,6 +440,7 @@ class PropositionController extends AbstractController if ($autorisation !== null) return $autorisation; $validation = $this->getValidationService()->validatePropositionSoutenance($these); $this->getHorodatageService()->addHorodatage($proposition, HorodatageService::TYPE_VALIDATION, "Acteurs directes"); try { $notif = $this->soutenanceNotificationFactory->createNotificationValidationProposition($these, $validation); $this->notifierService->trigger($notif); Loading Loading @@ -487,6 +493,7 @@ class PropositionController extends AbstractController switch ($role->getCode()) { case Role::CODE_RESP_UR : $this->getValidationService()->validateValidationUR($these, $individu); $this->getHorodatageService()->addHorodatage($proposition, HorodatageService::TYPE_VALIDATION, "Structures"); try { $notif = $this->soutenanceNotificationFactory->createNotificationEcoleDoctoraleProposition($these); $this->notifierService->trigger($notif); Loading Loading @@ -547,6 +554,8 @@ class PropositionController extends AbstractController $data = $request->getPost(); if ($data['motif'] !== null) { $this->getPropositionService()->annulerValidationsForProposition($proposition); $this->getHorodatageService()->addHorodatage($proposition, HorodatageService::TYPE_VALIDATION, "Structures"); $currentUser = $this->userContextService->getIdentityIndividu(); /** @var RoleInterface $currentRole */ $currentRole = $this->userContextService->getSelectedIdentityRole(); Loading Loading @@ -580,6 +589,7 @@ class PropositionController extends AbstractController $this->getEvenementService()->ajouterEvenement($proposition, Evenement::EVENEMENT_SIGNATURE); $this->getHorodatageService()->addHorodatage($proposition, HorodatageService::TYPE_EDITION, "Autorisation de soutenance"); $exporter = new SiganturePresidentPdfExporter($this->renderer, 'A4'); $exporter->setVars([ Loading Loading @@ -847,7 +857,6 @@ class PropositionController extends AbstractController $proposition = $this->getPropositionService()->findOneForThese($these); $horodatages = $proposition->getHorodatages(); usort($horodatages, function (Horodatage $a, Horodatage $b) { return $a->getDate() > $b->getDate();}); return new ViewModel([ 'these' => $these, Loading
module/Soutenance/src/Soutenance/Controller/PropositionControllerFactory.php +4 −0 Changes for module/Soutenance/src/Soutenance/Controller/PropositionControllerFactory.php: 4 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -7,6 +7,7 @@ use Information\Service\InformationService; use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; use Soutenance\Service\Avis\AvisService; use Soutenance\Service\Horodatage\HorodatageService; use Soutenance\Service\Notification\SoutenanceNotificationFactory; use Structure\Service\Etablissement\EtablissementService; use These\Service\Acteur\ActeurService; Loading Loading @@ -51,6 +52,7 @@ class PropositionControllerFactory * @var InformationService $informationService * @var EvenementService $evenementService * @var FichierStorageService $fichierStorageService * @var HorodatageService $horodatageService * @var MembreService $membreService * @var NotifierService $notifierService * @var PropositionService $propositionService Loading @@ -67,6 +69,7 @@ class PropositionControllerFactory $etablissementService = $container->get(EtablissementService::class); $evenementService = $container->get(EvenementService::class); $fichierStorageService = $container->get(FichierStorageService::class); $horodatageService = $container->get(HorodatageService::class); $informationService = $container->get(InformationService::class); $membreService = $container->get(MembreService::class); $notifierService = $container->get(NotifierService::class); Loading Loading @@ -111,6 +114,7 @@ class PropositionControllerFactory $controller->setEtablissementService($etablissementService); $controller->setEvenementService($evenementService); $controller->setFichierStorageService($fichierStorageService); $controller->setHorodatageService($horodatageService); $controller->setInformationService($informationService); $controller->setMembreService($membreService); $controller->setNotifierService($notifierService); Loading