Loading module/Formation/src/Formation/Controller/InscriptionController.php +43 −47 Changes for module/Formation/src/Formation/Controller/InscriptionController.php: 43 added lines, 47 removed lines. Original line number Diff line number Diff line Loading @@ -3,6 +3,8 @@ namespace Formation\Controller; use Application\Controller\AbstractController; use Application\Service\Fichier\Exception\FichierServiceException; use Formation\Service\Session\SessionServiceAwareTrait; use Individu\Entity\Db\Individu; use Structure\Service\Etablissement\EtablissementServiceAwareTrait; use Application\Service\File\FileServiceAwareTrait; Loading @@ -11,13 +13,13 @@ use Structure\Service\StructureDocument\StructureDocumentServiceAwareTrait; use Doctorant\Entity\Db\Doctorant; use Doctorant\Service\DoctorantServiceAwareTrait; use Formation\Entity\Db\Inscription; use Formation\Entity\Db\Session; use Formation\Provider\NatureFichier\NatureFichier; use Formation\Service\Exporter\Attestation\AttestationExporter; use Formation\Service\Exporter\Convocation\ConvocationExporter; use Formation\Service\Inscription\InscriptionServiceAwareTrait; use Formation\Service\Notification\NotificationServiceAwareTrait; use Formation\Service\Presence\PresenceServiceAwareTrait; use UnicaenApp\Exception\RuntimeException; use UnicaenApp\Service\EntityManagerAwareTrait; use Laminas\Http\Response; use Laminas\View\Model\ViewModel; Loading @@ -33,18 +35,13 @@ class InscriptionController extends AbstractController use InscriptionServiceAwareTrait; use NotificationServiceAwareTrait; use PresenceServiceAwareTrait; use SessionServiceAwareTrait; use StructureDocumentServiceAwareTrait; /** @var PhpRenderer */ private $renderer; private ?PhpRenderer $renderer = null; public function setRenderer(?PhpRenderer $renderer) { $this->renderer = $renderer; } /** * @param PhpRenderer $renderer */ public function setRenderer($renderer) { $this->renderer = $renderer; } /** CRUD **********************************************************************************************************/ public function indexAction() : ViewModel { Loading @@ -56,7 +53,7 @@ class InscriptionController extends AbstractController $listings = [ ]; /** @var Inscription[] $inscriptions */ $inscriptions = $this->getEntityManager()->getRepository(Inscription::class)->fetchInscriptionsWithFiltres($filtres); $inscriptions = $this->getInscriptionService()->getRepository()->fetchInscriptionsWithFiltres($filtres); return new ViewModel([ 'inscriptions' => $inscriptions, Loading @@ -67,8 +64,7 @@ class InscriptionController extends AbstractController public function ajouterAction() { /** @var Session $session */ $session = $this->getEntityManager()->getRepository(Session::class)->getRequestedSession($this); $session = $this->getSessionService()->getRepository()->getRequestedSession($this); /** @var Doctorant|null $doctorant */ $doctorantId = $this->params()->fromRoute('doctorant'); if ($doctorantId !== null) { Loading Loading @@ -116,32 +112,27 @@ class InscriptionController extends AbstractController public function historiserAction() : Response { /** @var Inscription $inscription */ $inscription = $this->getEntityManager()->getRepository(Inscription::class)->getRequestedInscription($this); $retour = $this->params()->fromQuery('retour'); $inscription = $this->getInscriptionService()->getRepository()->getRequestedInscription($this); $this->getInscriptionService()->historise($inscription); $retour = $this->params()->fromQuery('retour'); if ($retour) return $this->redirect()->toUrl($retour); return $this->redirect()->toRoute('formation/inscription',[],[], true); } public function restaurerAction() : Response { /** @var Inscription $inscription */ $inscription = $this->getEntityManager()->getRepository(Inscription::class)->getRequestedInscription($this); $retour = $this->params()->fromQuery('retour'); $inscription = $this->getInscriptionService()->getRepository()->getRequestedInscription($this); $this->getInscriptionService()->restore($inscription); $retour = $this->params()->fromQuery('retour'); if ($retour) return $this->redirect()->toUrl($retour); return $this->redirect()->toRoute('formation/inscription',[],[], true); } public function supprimerAction() : ViewModel { /** @var Inscription|null $inscription */ $inscription = $this->getEntityManager()->getRepository(Inscription::class)->getRequestedInscription($this); $inscription = $this->getInscriptionService()->getRepository()->getRequestedInscription($this); $request = $this->getRequest(); if ($request->isPost()) { Loading @@ -162,14 +153,13 @@ class InscriptionController extends AbstractController return $vm; } public function passerListePrincipaleAction() /** GESTION DES LISTES ********************************************************************************************/ public function passerListePrincipaleAction() : Response { /** @var Inscription|null $inscription */ $inscription = $this->getEntityManager()->getRepository(Inscription::class)->getRequestedInscription($this); $retour = $this->params()->fromQuery('retour'); $inscription = $this->getInscriptionService()->getRepository()->getRequestedInscription($this); $session = $inscription->getSession(); $listePrincipale = $session->getListePrincipale(); if (count($listePrincipale) < $session->getTailleListePrincipale()) { $inscription->setListe(Inscription::LISTE_PRINCIPALE); Loading @@ -179,18 +169,16 @@ class InscriptionController extends AbstractController $this->flashMessenger()->addErrorMessage('La liste principale est déjà complète.'); } $retour = $this->params()->fromQuery('retour'); if ($retour) return $this->redirect()->toUrl($retour); return $this->redirect()->toRoute('formation/inscription',[],[], true); } public function passerListeComplementaireAction() public function passerListeComplementaireAction() : Response { /** @var Inscription|null $inscription */ $inscription = $this->getEntityManager()->getRepository(Inscription::class)->getRequestedInscription($this); $retour = $this->params()->fromQuery('retour'); $inscription = $this->getInscriptionService()->getRepository()->getRequestedInscription($this); $session = $inscription->getSession(); $listePrincipale = $session->getListeComplementaire(); if (count($listePrincipale) < $session->getTailleListeComplementaire()) { $inscription->setListe(Inscription::LISTE_COMPLEMENTAIRE); Loading @@ -200,27 +188,27 @@ class InscriptionController extends AbstractController $this->flashMessenger()->addErrorMessage('La liste complémentaire est déjà complète.'); } $retour = $this->params()->fromQuery('retour'); if ($retour) return $this->redirect()->toUrl($retour); return $this->redirect()->toRoute('formation/inscription',[],[], true); } public function retirerListeAction() : Response { /** @var Inscription|null $inscription */ $inscription = $this->getEntityManager()->getRepository(Inscription::class)->getRequestedInscription($this); $retour = $this->params()->fromQuery('retour'); $inscription = $this->getInscriptionService()->getRepository()->getRequestedInscription($this); $inscription->setListe(null); $this->getInscriptionService()->update($inscription); $retour = $this->params()->fromQuery('retour'); if ($retour) return $this->redirect()->toUrl($retour); return $this->redirect()->toRoute('formation/inscription',[],[], true); } /** DOCUMENTS LIES AUX INSCRIPTIONS *******************************************************************************/ public function genererConvocationAction() { /** @var Inscription|null $inscription */ $inscription = $this->getEntityManager()->getRepository(Inscription::class)->getRequestedInscription($this); $inscription = $this->getInscriptionService()->getRepository()->getRequestedInscription($this); $session = $inscription->getSession(); $logos = []; Loading @@ -229,7 +217,12 @@ class InscriptionController extends AbstractController $logos['comue'] = $this->fileService->computeLogoFilePathForStructure($comue); } $signature = $this->getStructureDocumentService()->getContenuFichier($inscription->getDoctorant()->getEtablissement()->getStructure(), NatureFichier::CODE_SIGNATURE_FORMATION); $etablissementDoctorant = $inscription->getDoctorant()->getEtablissement(); try { $signature = $this->getStructureDocumentService()->getContenuFichier($etablissementDoctorant->getStructure(), NatureFichier::CODE_SIGNATURE_FORMATION, $etablissementDoctorant); } catch (FichierServiceException $e) { throw new RuntimeException("Un problème est survenu lors de la récupération de la signature !",0,$e); } //exporter $export = new ConvocationExporter($this->renderer, 'A4'); Loading @@ -243,8 +236,7 @@ class InscriptionController extends AbstractController public function genererAttestationAction() { /** @var Inscription|null $inscription */ $inscription = $this->getEntityManager()->getRepository(Inscription::class)->getRequestedInscription($this); $inscription = $this->getInscriptionService()->getRepository()->getRequestedInscription($this); $session = $inscription->getSession(); $presences = $this->getPresenceService()->calculerDureePresence($inscription); Loading @@ -255,7 +247,12 @@ class InscriptionController extends AbstractController $logos['comue'] = $this->fileService->computeLogoFilePathForStructure($comue); } $signature = $this->getStructureDocumentService()->getContenuFichier($inscription->getDoctorant()->getEtablissement()->getStructure(), NatureFichier::CODE_SIGNATURE_FORMATION); $etablissementDoctorant = $inscription->getDoctorant()->getEtablissement(); try { $signature = $this->getStructureDocumentService()->getContenuFichier($etablissementDoctorant->getStructure(), NatureFichier::CODE_SIGNATURE_FORMATION, $etablissementDoctorant); } catch (FichierServiceException $e) { throw new RuntimeException("Un problème est survenu lors de la récupération de la signature !",0,$e); } //exporter $export = new AttestationExporter($this->renderer, 'A4'); Loading @@ -268,19 +265,18 @@ class InscriptionController extends AbstractController $export->export('SYGAL_attestation_' . $session->getId() . "_" . $inscription->getId() . ".pdf"); } /** INSCRIPTION ET DESINSCRIPTION POUR LE DOCTORANT */ /** INSCRIPTION ET DESINSCRIPTION POUR LE DOCTORANT ***************************************************************/ public function desinscriptionAction() : ViewModel { /** @var Inscription|null $inscription */ $inscription = $this->getEntityManager()->getRepository(Inscription::class)->getRequestedInscription($this); $inscription = $this->getInscriptionService()->getRepository()->getRequestedInscription($this); $request = $this->getRequest(); if ($request->isPost()) { $data = $request->getPost(); $raison = ($data['justification-oui'] AND trim($data['justification-oui']) !== '')? trim($data['justification-oui']) : null; $inscription->setListe(null); $inscription->setDescription($inscription->getDescription() . " <br/> ". (($raison)?$raison:"Aucune justification")); $inscription->setDescription($inscription->getDescription() . " <br/> ". (($raison)?:"Aucune justification")); $this->getInscriptionService()->historise($inscription); } Loading module/Formation/src/Formation/Controller/InscriptionControllerFactory.php +8 −0 Changes for module/Formation/src/Formation/Controller/InscriptionControllerFactory.php: 8 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -2,6 +2,9 @@ namespace Formation\Controller; use Formation\Service\Session\SessionService; use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; use Structure\Service\Etablissement\EtablissementService; use Application\Service\File\FileService; use Individu\Service\IndividuService; Loading @@ -19,6 +22,8 @@ class InscriptionControllerFactory { /** * @param ContainerInterface $container * @return InscriptionController * @throws ContainerExceptionInterface * @throws NotFoundExceptionInterface */ public function __invoke(ContainerInterface $container) : InscriptionController { Loading @@ -31,6 +36,7 @@ class InscriptionControllerFactory { * @var IndividuService $individuService * @var NotificationService $notificationService * @var PresenceService $presenceService * @var SessionService $sessionService * @var StructureDocumentService $structureDocumentService */ $entityManager = $container->get('doctrine.entitymanager.orm_default'); Loading @@ -41,6 +47,7 @@ class InscriptionControllerFactory { $inscriptionService = $container->get(InscriptionService::class); $notificationService = $container->get(NotificationService::class); $presenceService = $container->get(PresenceService::class); $sessionService = $container->get(SessionService::class); $structureDocumentService = $container->get(StructureDocumentService::class); /* @var $renderer PhpRenderer */ Loading @@ -56,6 +63,7 @@ class InscriptionControllerFactory { $controller->setInscriptionService($inscriptionService); $controller->setNotificationService($notificationService); $controller->setPresenceService($presenceService); $controller->setSessionService($sessionService); $controller->setStructureDocumentService($structureDocumentService); /** forms *****************************************************************************************************/ /** autres*****************************************************************************************************/ Loading module/Formation/src/Formation/Provider/Template/MailTemplates.php 0 → 100644 +9 −0 Changes for module/Formation/src/Formation/Provider/Template/MailTemplates.php: 9 added lines, 0 removed lines. Original line number Diff line number Diff line <?php namespace Formation\Provider\Template; class MailTemplates { const INSCRIPTION_ENREGISTREE = "FORMATION_INSCRIPTION_ENREGISTREE"; } No newline at end of file module/Formation/src/Formation/Provider/Template/PdfTemplates.php 0 → 100644 +9 −0 Changes for module/Formation/src/Formation/Provider/Template/PdfTemplates.php: 9 added lines, 0 removed lines. Original line number Diff line number Diff line <?php namespace Formation\Provider\Template; class PdfTemplates { const CONVOCATION_TEMPLATE = "FORMATION_CONVATION"; } No newline at end of file module/Formation/src/Formation/Service/Inscription/InscriptionService.php +14 −5 Changes for module/Formation/src/Formation/Service/Inscription/InscriptionService.php: 14 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -2,15 +2,25 @@ namespace Formation\Service\Inscription; use DateTime; use Doctrine\ORM\ORMException; use Formation\Entity\Db\Inscription; use Formation\Entity\Db\Repository\InscriptionRepository; use UnicaenApp\Exception\RuntimeException; use UnicaenApp\Service\EntityManagerAwareTrait; class InscriptionService { use EntityManagerAwareTrait; /** * @return InscriptionRepository */ public function getRepository() : InscriptionRepository { /** @var InscriptionRepository $repo */ $repo = $this->entityManager->getRepository(Inscription::class); return $repo; } /** GESTION DES ENTITES *******************************************************************************************/ /** Loading Loading @@ -42,14 +52,14 @@ class InscriptionService { return $seance; } /** (todo ...) /** * @param Inscription $seance * @return Inscription */ public function historise(Inscription $seance) : Inscription { try { $seance->setHistoDestruction(new DateTime()); $seance->historiser(); $this->getEntityManager()->flush($seance); } catch (ORMException $e) { throw new RuntimeException("Un problème est survnue en base pour une entité [Inscription]",0, $e); Loading @@ -64,8 +74,7 @@ class InscriptionService { public function restore(Inscription $seance) : Inscription { try { $seance->setHistoDestructeur(null); $seance->setHistoDestruction(null); $seance->dehistoriser(); $this->getEntityManager()->flush($seance); } catch (ORMException $e) { throw new RuntimeException("Un problème est survnue en base pour une entité [Inscription]",0, $e); Loading Loading
module/Formation/src/Formation/Controller/InscriptionController.php +43 −47 Changes for module/Formation/src/Formation/Controller/InscriptionController.php: 43 added lines, 47 removed lines. Original line number Diff line number Diff line Loading @@ -3,6 +3,8 @@ namespace Formation\Controller; use Application\Controller\AbstractController; use Application\Service\Fichier\Exception\FichierServiceException; use Formation\Service\Session\SessionServiceAwareTrait; use Individu\Entity\Db\Individu; use Structure\Service\Etablissement\EtablissementServiceAwareTrait; use Application\Service\File\FileServiceAwareTrait; Loading @@ -11,13 +13,13 @@ use Structure\Service\StructureDocument\StructureDocumentServiceAwareTrait; use Doctorant\Entity\Db\Doctorant; use Doctorant\Service\DoctorantServiceAwareTrait; use Formation\Entity\Db\Inscription; use Formation\Entity\Db\Session; use Formation\Provider\NatureFichier\NatureFichier; use Formation\Service\Exporter\Attestation\AttestationExporter; use Formation\Service\Exporter\Convocation\ConvocationExporter; use Formation\Service\Inscription\InscriptionServiceAwareTrait; use Formation\Service\Notification\NotificationServiceAwareTrait; use Formation\Service\Presence\PresenceServiceAwareTrait; use UnicaenApp\Exception\RuntimeException; use UnicaenApp\Service\EntityManagerAwareTrait; use Laminas\Http\Response; use Laminas\View\Model\ViewModel; Loading @@ -33,18 +35,13 @@ class InscriptionController extends AbstractController use InscriptionServiceAwareTrait; use NotificationServiceAwareTrait; use PresenceServiceAwareTrait; use SessionServiceAwareTrait; use StructureDocumentServiceAwareTrait; /** @var PhpRenderer */ private $renderer; private ?PhpRenderer $renderer = null; public function setRenderer(?PhpRenderer $renderer) { $this->renderer = $renderer; } /** * @param PhpRenderer $renderer */ public function setRenderer($renderer) { $this->renderer = $renderer; } /** CRUD **********************************************************************************************************/ public function indexAction() : ViewModel { Loading @@ -56,7 +53,7 @@ class InscriptionController extends AbstractController $listings = [ ]; /** @var Inscription[] $inscriptions */ $inscriptions = $this->getEntityManager()->getRepository(Inscription::class)->fetchInscriptionsWithFiltres($filtres); $inscriptions = $this->getInscriptionService()->getRepository()->fetchInscriptionsWithFiltres($filtres); return new ViewModel([ 'inscriptions' => $inscriptions, Loading @@ -67,8 +64,7 @@ class InscriptionController extends AbstractController public function ajouterAction() { /** @var Session $session */ $session = $this->getEntityManager()->getRepository(Session::class)->getRequestedSession($this); $session = $this->getSessionService()->getRepository()->getRequestedSession($this); /** @var Doctorant|null $doctorant */ $doctorantId = $this->params()->fromRoute('doctorant'); if ($doctorantId !== null) { Loading Loading @@ -116,32 +112,27 @@ class InscriptionController extends AbstractController public function historiserAction() : Response { /** @var Inscription $inscription */ $inscription = $this->getEntityManager()->getRepository(Inscription::class)->getRequestedInscription($this); $retour = $this->params()->fromQuery('retour'); $inscription = $this->getInscriptionService()->getRepository()->getRequestedInscription($this); $this->getInscriptionService()->historise($inscription); $retour = $this->params()->fromQuery('retour'); if ($retour) return $this->redirect()->toUrl($retour); return $this->redirect()->toRoute('formation/inscription',[],[], true); } public function restaurerAction() : Response { /** @var Inscription $inscription */ $inscription = $this->getEntityManager()->getRepository(Inscription::class)->getRequestedInscription($this); $retour = $this->params()->fromQuery('retour'); $inscription = $this->getInscriptionService()->getRepository()->getRequestedInscription($this); $this->getInscriptionService()->restore($inscription); $retour = $this->params()->fromQuery('retour'); if ($retour) return $this->redirect()->toUrl($retour); return $this->redirect()->toRoute('formation/inscription',[],[], true); } public function supprimerAction() : ViewModel { /** @var Inscription|null $inscription */ $inscription = $this->getEntityManager()->getRepository(Inscription::class)->getRequestedInscription($this); $inscription = $this->getInscriptionService()->getRepository()->getRequestedInscription($this); $request = $this->getRequest(); if ($request->isPost()) { Loading @@ -162,14 +153,13 @@ class InscriptionController extends AbstractController return $vm; } public function passerListePrincipaleAction() /** GESTION DES LISTES ********************************************************************************************/ public function passerListePrincipaleAction() : Response { /** @var Inscription|null $inscription */ $inscription = $this->getEntityManager()->getRepository(Inscription::class)->getRequestedInscription($this); $retour = $this->params()->fromQuery('retour'); $inscription = $this->getInscriptionService()->getRepository()->getRequestedInscription($this); $session = $inscription->getSession(); $listePrincipale = $session->getListePrincipale(); if (count($listePrincipale) < $session->getTailleListePrincipale()) { $inscription->setListe(Inscription::LISTE_PRINCIPALE); Loading @@ -179,18 +169,16 @@ class InscriptionController extends AbstractController $this->flashMessenger()->addErrorMessage('La liste principale est déjà complète.'); } $retour = $this->params()->fromQuery('retour'); if ($retour) return $this->redirect()->toUrl($retour); return $this->redirect()->toRoute('formation/inscription',[],[], true); } public function passerListeComplementaireAction() public function passerListeComplementaireAction() : Response { /** @var Inscription|null $inscription */ $inscription = $this->getEntityManager()->getRepository(Inscription::class)->getRequestedInscription($this); $retour = $this->params()->fromQuery('retour'); $inscription = $this->getInscriptionService()->getRepository()->getRequestedInscription($this); $session = $inscription->getSession(); $listePrincipale = $session->getListeComplementaire(); if (count($listePrincipale) < $session->getTailleListeComplementaire()) { $inscription->setListe(Inscription::LISTE_COMPLEMENTAIRE); Loading @@ -200,27 +188,27 @@ class InscriptionController extends AbstractController $this->flashMessenger()->addErrorMessage('La liste complémentaire est déjà complète.'); } $retour = $this->params()->fromQuery('retour'); if ($retour) return $this->redirect()->toUrl($retour); return $this->redirect()->toRoute('formation/inscription',[],[], true); } public function retirerListeAction() : Response { /** @var Inscription|null $inscription */ $inscription = $this->getEntityManager()->getRepository(Inscription::class)->getRequestedInscription($this); $retour = $this->params()->fromQuery('retour'); $inscription = $this->getInscriptionService()->getRepository()->getRequestedInscription($this); $inscription->setListe(null); $this->getInscriptionService()->update($inscription); $retour = $this->params()->fromQuery('retour'); if ($retour) return $this->redirect()->toUrl($retour); return $this->redirect()->toRoute('formation/inscription',[],[], true); } /** DOCUMENTS LIES AUX INSCRIPTIONS *******************************************************************************/ public function genererConvocationAction() { /** @var Inscription|null $inscription */ $inscription = $this->getEntityManager()->getRepository(Inscription::class)->getRequestedInscription($this); $inscription = $this->getInscriptionService()->getRepository()->getRequestedInscription($this); $session = $inscription->getSession(); $logos = []; Loading @@ -229,7 +217,12 @@ class InscriptionController extends AbstractController $logos['comue'] = $this->fileService->computeLogoFilePathForStructure($comue); } $signature = $this->getStructureDocumentService()->getContenuFichier($inscription->getDoctorant()->getEtablissement()->getStructure(), NatureFichier::CODE_SIGNATURE_FORMATION); $etablissementDoctorant = $inscription->getDoctorant()->getEtablissement(); try { $signature = $this->getStructureDocumentService()->getContenuFichier($etablissementDoctorant->getStructure(), NatureFichier::CODE_SIGNATURE_FORMATION, $etablissementDoctorant); } catch (FichierServiceException $e) { throw new RuntimeException("Un problème est survenu lors de la récupération de la signature !",0,$e); } //exporter $export = new ConvocationExporter($this->renderer, 'A4'); Loading @@ -243,8 +236,7 @@ class InscriptionController extends AbstractController public function genererAttestationAction() { /** @var Inscription|null $inscription */ $inscription = $this->getEntityManager()->getRepository(Inscription::class)->getRequestedInscription($this); $inscription = $this->getInscriptionService()->getRepository()->getRequestedInscription($this); $session = $inscription->getSession(); $presences = $this->getPresenceService()->calculerDureePresence($inscription); Loading @@ -255,7 +247,12 @@ class InscriptionController extends AbstractController $logos['comue'] = $this->fileService->computeLogoFilePathForStructure($comue); } $signature = $this->getStructureDocumentService()->getContenuFichier($inscription->getDoctorant()->getEtablissement()->getStructure(), NatureFichier::CODE_SIGNATURE_FORMATION); $etablissementDoctorant = $inscription->getDoctorant()->getEtablissement(); try { $signature = $this->getStructureDocumentService()->getContenuFichier($etablissementDoctorant->getStructure(), NatureFichier::CODE_SIGNATURE_FORMATION, $etablissementDoctorant); } catch (FichierServiceException $e) { throw new RuntimeException("Un problème est survenu lors de la récupération de la signature !",0,$e); } //exporter $export = new AttestationExporter($this->renderer, 'A4'); Loading @@ -268,19 +265,18 @@ class InscriptionController extends AbstractController $export->export('SYGAL_attestation_' . $session->getId() . "_" . $inscription->getId() . ".pdf"); } /** INSCRIPTION ET DESINSCRIPTION POUR LE DOCTORANT */ /** INSCRIPTION ET DESINSCRIPTION POUR LE DOCTORANT ***************************************************************/ public function desinscriptionAction() : ViewModel { /** @var Inscription|null $inscription */ $inscription = $this->getEntityManager()->getRepository(Inscription::class)->getRequestedInscription($this); $inscription = $this->getInscriptionService()->getRepository()->getRequestedInscription($this); $request = $this->getRequest(); if ($request->isPost()) { $data = $request->getPost(); $raison = ($data['justification-oui'] AND trim($data['justification-oui']) !== '')? trim($data['justification-oui']) : null; $inscription->setListe(null); $inscription->setDescription($inscription->getDescription() . " <br/> ". (($raison)?$raison:"Aucune justification")); $inscription->setDescription($inscription->getDescription() . " <br/> ". (($raison)?:"Aucune justification")); $this->getInscriptionService()->historise($inscription); } Loading
module/Formation/src/Formation/Controller/InscriptionControllerFactory.php +8 −0 Changes for module/Formation/src/Formation/Controller/InscriptionControllerFactory.php: 8 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -2,6 +2,9 @@ namespace Formation\Controller; use Formation\Service\Session\SessionService; use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; use Structure\Service\Etablissement\EtablissementService; use Application\Service\File\FileService; use Individu\Service\IndividuService; Loading @@ -19,6 +22,8 @@ class InscriptionControllerFactory { /** * @param ContainerInterface $container * @return InscriptionController * @throws ContainerExceptionInterface * @throws NotFoundExceptionInterface */ public function __invoke(ContainerInterface $container) : InscriptionController { Loading @@ -31,6 +36,7 @@ class InscriptionControllerFactory { * @var IndividuService $individuService * @var NotificationService $notificationService * @var PresenceService $presenceService * @var SessionService $sessionService * @var StructureDocumentService $structureDocumentService */ $entityManager = $container->get('doctrine.entitymanager.orm_default'); Loading @@ -41,6 +47,7 @@ class InscriptionControllerFactory { $inscriptionService = $container->get(InscriptionService::class); $notificationService = $container->get(NotificationService::class); $presenceService = $container->get(PresenceService::class); $sessionService = $container->get(SessionService::class); $structureDocumentService = $container->get(StructureDocumentService::class); /* @var $renderer PhpRenderer */ Loading @@ -56,6 +63,7 @@ class InscriptionControllerFactory { $controller->setInscriptionService($inscriptionService); $controller->setNotificationService($notificationService); $controller->setPresenceService($presenceService); $controller->setSessionService($sessionService); $controller->setStructureDocumentService($structureDocumentService); /** forms *****************************************************************************************************/ /** autres*****************************************************************************************************/ Loading
module/Formation/src/Formation/Provider/Template/MailTemplates.php 0 → 100644 +9 −0 Changes for module/Formation/src/Formation/Provider/Template/MailTemplates.php: 9 added lines, 0 removed lines. Original line number Diff line number Diff line <?php namespace Formation\Provider\Template; class MailTemplates { const INSCRIPTION_ENREGISTREE = "FORMATION_INSCRIPTION_ENREGISTREE"; } No newline at end of file
module/Formation/src/Formation/Provider/Template/PdfTemplates.php 0 → 100644 +9 −0 Changes for module/Formation/src/Formation/Provider/Template/PdfTemplates.php: 9 added lines, 0 removed lines. Original line number Diff line number Diff line <?php namespace Formation\Provider\Template; class PdfTemplates { const CONVOCATION_TEMPLATE = "FORMATION_CONVATION"; } No newline at end of file
module/Formation/src/Formation/Service/Inscription/InscriptionService.php +14 −5 Changes for module/Formation/src/Formation/Service/Inscription/InscriptionService.php: 14 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -2,15 +2,25 @@ namespace Formation\Service\Inscription; use DateTime; use Doctrine\ORM\ORMException; use Formation\Entity\Db\Inscription; use Formation\Entity\Db\Repository\InscriptionRepository; use UnicaenApp\Exception\RuntimeException; use UnicaenApp\Service\EntityManagerAwareTrait; class InscriptionService { use EntityManagerAwareTrait; /** * @return InscriptionRepository */ public function getRepository() : InscriptionRepository { /** @var InscriptionRepository $repo */ $repo = $this->entityManager->getRepository(Inscription::class); return $repo; } /** GESTION DES ENTITES *******************************************************************************************/ /** Loading Loading @@ -42,14 +52,14 @@ class InscriptionService { return $seance; } /** (todo ...) /** * @param Inscription $seance * @return Inscription */ public function historise(Inscription $seance) : Inscription { try { $seance->setHistoDestruction(new DateTime()); $seance->historiser(); $this->getEntityManager()->flush($seance); } catch (ORMException $e) { throw new RuntimeException("Un problème est survnue en base pour une entité [Inscription]",0, $e); Loading @@ -64,8 +74,7 @@ class InscriptionService { public function restore(Inscription $seance) : Inscription { try { $seance->setHistoDestructeur(null); $seance->setHistoDestruction(null); $seance->dehistoriser(); $this->getEntityManager()->flush($seance); } catch (ORMException $e) { throw new RuntimeException("Un problème est survnue en base pour une entité [Inscription]",0, $e); Loading