Renommage SessionStructureComplementaire en SessionStructureValide (e16780f7) · Commits · open-source / sygal

module/Formation/config/others/session-structure-valide.config.php

+19 −19

Changes for module/Formation/config/others/session-structure-valide.config.php: 19 added lines, 19 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,15 +2,15 @@

		namespace Formation;

		use Formation\Controller\SessionStructureComplementaireController;
		use Formation\Controller\SessionStructureComplementaireControllerFactory;
		use Formation\Form\SessionStructureComplementaire\SessionStructureComplementaireForm;
		use Formation\Form\SessionStructureComplementaire\SessionStructureComplementaireFormFactory;
		use Formation\Form\SessionStructureComplementaire\SessionStructureComplementaireHydrator;
		use Formation\Form\SessionStructureComplementaire\SessionStructureComplementaireHydratorFactory;
		use Formation\Controller\SessionStructureValideController;
		use Formation\Controller\SessionStructureValideControllerFactory;
		use Formation\Form\SessionStructureValide\SessionStructureValideForm;
		use Formation\Form\SessionStructureValide\SessionStructureValideFormFactory;
		use Formation\Form\SessionStructureValide\SessionStructureValideHydrator;
		use Formation\Form\SessionStructureValide\SessionStructureValideHydratorFactory;
		use Formation\Provider\Privilege\SessionPrivileges;
		use Formation\Service\SessionStructureComplementaire\SessionStructureComplementaireService;
		use Formation\Service\SessionStructureComplementaire\SessionStructureComplementaireServiceFactory;
		use Formation\Service\SessionStructureValide\SessionStructureValideService;
		use Formation\Service\SessionStructureValide\SessionStructureValideServiceFactory;
		use Laminas\Router\Http\Segment;
		use UnicaenAuth\Guard\PrivilegeController;

		@@ -19,7 +19,7 @@ return [
		'guards' => [
		PrivilegeController::class => [
		[
		'controller' => SessionStructureComplementaireController::class,
		'controller' => SessionStructureValideController::class,
		'action' => [
		'ajouter-structure-complementaire',
		'modifier-structure-complementaire',
		@@ -31,7 +31,7 @@ return [
		],
		],
		[
		'controller' => SessionStructureComplementaireController::class,
		'controller' => SessionStructureValideController::class,
		'action' => [
		'supprimer-structure-complementaire',
		],
		@@ -55,7 +55,7 @@ return [
		'options' => [
		'route' => '/ajouter-structure-complementaire/:session',
		'defaults' => [
		'controller' => SessionStructureComplementaireController::class,
		'controller' => SessionStructureValideController::class,
		'action' => 'ajouter-structure-complementaire',
		],
		],
		@@ -66,7 +66,7 @@ return [
		'options' => [
		'route' => '/modifier-structure-complementaire/:structure-complementaire',
		'defaults' => [
		'controller' => SessionStructureComplementaireController::class,
		'controller' => SessionStructureValideController::class,
		'action' => 'modifier-structure-complementaire',
		],
		],
		@@ -77,7 +77,7 @@ return [
		'options' => [
		'route' => '/historiser-structure-complementaire/:structure-complementaire',
		'defaults' => [
		'controller' => SessionStructureComplementaireController::class,
		'controller' => SessionStructureValideController::class,
		'action' => 'historiser-structure-complementaire',
		],
		],
		@@ -88,7 +88,7 @@ return [
		'options' => [
		'route' => '/restaurer-structure-complementaire/:structure-complementaire',
		'defaults' => [
		'controller' => SessionStructureComplementaireController::class,
		'controller' => SessionStructureValideController::class,
		'action' => 'restaurer-structure-complementaire',
		],
		],
		@@ -99,7 +99,7 @@ return [
		'options' => [
		'route' => '/supprimer-structure-complementaire/:structure-complementaire',
		'defaults' => [
		'controller' => SessionStructureComplementaireController::class,
		'controller' => SessionStructureValideController::class,
		'action' => 'supprimer-structure-complementaire',
		],
		],
		@@ -113,22 +113,22 @@ return [

		'service_manager' => [
		'factories' => [
		SessionStructureComplementaireService::class => SessionStructureComplementaireServiceFactory::class,
		SessionStructureValideService::class => SessionStructureValideServiceFactory::class,
		],
		],
		'controllers' => [
		'factories' => [
		SessionStructureComplementaireController::class => SessionStructureComplementaireControllerFactory::class,
		SessionStructureValideController::class => SessionStructureValideControllerFactory::class,
		],
		],
		'form_elements' => [
		'factories' => [
		SessionStructureComplementaireForm::class => SessionStructureComplementaireFormFactory::class,
		SessionStructureValideForm::class => SessionStructureValideFormFactory::class,
		],
		],
		'hydrators' => [
		'factories' => [
		SessionStructureComplementaireHydrator::class => SessionStructureComplementaireHydratorFactory::class,
		SessionStructureValideHydrator::class => SessionStructureValideHydratorFactory::class,
		],
		]

module/Formation/src/Formation/Controller/SessionController.php

+5 −5

Changes for module/Formation/src/Formation/Controller/SessionController.php: 5 added lines, 5 removed lines.
Original line number	Diff line number	Diff line
		@@ -5,10 +5,10 @@ namespace Formation\Controller;
		use Application\Controller\AbstractController;
		use Application\Entity\Db\These;
		use Formation\Entity\Db\Formation;
		use Formation\Entity\Db\SessionStructureComplementaire;
		use Formation\Entity\Db\SessionStructureValide;
		use Formation\Service\Formation\FormationServiceAwareTrait;
		use Formation\Service\Presence\PresenceServiceAwareTrait;
		use Formation\Service\SessionStructureComplementaire\SessionStructureComplementaireServiceAwareTrait;
		use Formation\Service\SessionStructureValide\SessionStructureValideServiceAwareTrait;
		use Laminas\Http\Response;
		use Notification\Exception\NotificationException;
		use Structure\Service\Etablissement\EtablissementServiceAwareTrait;
		@@ -38,7 +38,7 @@ class SessionController extends AbstractController
		use NotificationServiceAwareTrait;
		use PresenceServiceAwareTrait;
		use SessionServiceAwareTrait;
		use SessionStructureComplementaireServiceAwareTrait;
		use SessionStructureValideServiceAwareTrait;

		use SessionFormAwareTrait;

		@@ -92,7 +92,7 @@ class SessionController extends AbstractController

		$this->getSessionService()->update($session);

		$ns = new SessionStructureComplementaire();
		$ns = new SessionStructureValide();
		$ns->setSession($session);

		switch ($session->getType()) {
		@@ -102,7 +102,7 @@ class SessionController extends AbstractController
		case Formation::TYPE_CODE_SPECIFIQUE :
		$ns->setStructure($session->getTypeStructure());
		}
		if ($ns->getStructure()) $this->getSessionStructureComplementaireService()->create($ns);
		if ($ns->getStructure()) $this->getSessionStructureValideService()->create($ns);
		}
		}

module/Formation/src/Formation/Controller/SessionControllerFactory.php

+4 −4

Changes for module/Formation/src/Formation/Controller/SessionControllerFactory.php: 4 added lines, 4 removed lines.
Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@ namespace Formation\Controller;

		use Formation\Service\Formation\FormationService;
		use Formation\Service\Presence\PresenceService;
		use Formation\Service\SessionStructureComplementaire\SessionStructureComplementaireService;
		use Formation\Service\SessionStructureValide\SessionStructureValideService;
		use Psr\Container\ContainerExceptionInterface;
		use Psr\Container\NotFoundExceptionInterface;
		use Structure\Service\Etablissement\EtablissementService;
		@@ -36,7 +36,7 @@ class SessionControllerFactory {
		* @var NotificationService $notificationService
		* @var PresenceService $presenceService
		* @var SessionService $sessionService
		* @var SessionStructureComplementaireService $sessionStructureComplementaireService
		* @var SessionStructureValideService $sessionStructureComplementaireService
		*/
		$entityManager = $container->get('doctrine.entitymanager.orm_default');
		$etablissementService = $container->get(EtablissementService::class);
		@@ -46,7 +46,7 @@ class SessionControllerFactory {
		$notificationService = $container->get(NotificationService::class);
		$presenceService = $container->get(PresenceService::class);
		$sessionService = $container->get(SessionService::class);
		$sessionStructureComplementaireService = $container->get(SessionStructureComplementaireService::class);
		$sessionStructureComplementaireService = $container->get(SessionStructureValideService::class);

		/**
		* @var SessionForm $sessionForm
		@@ -66,7 +66,7 @@ class SessionControllerFactory {
		$controller->setNotificationService($notificationService);
		$controller->setPresenceService($presenceService);
		$controller->setSessionService($sessionService);
		$controller->setSessionStructureComplementaireService($sessionStructureComplementaireService);
		$controller->setSessionStructureValideService($sessionStructureComplementaireService);
		/ Form ****************************************************************************************************/
		$controller->setSessionForm($sessionForm);
		/ Autre ***************************************************************************************************/

module/Formation/src/Formation/Controller/SessionStructureComplementaireController.php→module/Formation/src/Formation/Controller/SessionStructureValideController.php

+18 −18

Changes for module/Formation/src/Formation/Controller/SessionStructureValideController.php: 18 added lines, 18 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,28 +2,28 @@

		namespace Formation\Controller;

		use Formation\Entity\Db\SessionStructureComplementaire;
		use Formation\Form\SessionStructureComplementaire\SessionStructureComplementaireFormAwareTrait;
		use Formation\Entity\Db\SessionStructureValide;
		use Formation\Form\SessionStructureValide\SessionStructureValideFormAwareTrait;
		use Formation\Service\Session\SessionServiceAwareTrait;
		use Formation\Service\SessionStructureComplementaire\SessionStructureComplementaireServiceAwareTrait;
		use Formation\Service\SessionStructureValide\SessionStructureValideServiceAwareTrait;
		use Laminas\Http\Response;
		use Laminas\Mvc\Controller\AbstractActionController;
		use Laminas\View\Model\ViewModel;

		class SessionStructureComplementaireController extends AbstractActionController {
		class SessionStructureValideController extends AbstractActionController {
		use SessionServiceAwareTrait;
		use SessionStructureComplementaireServiceAwareTrait;
		use SessionStructureValideServiceAwareTrait;

		use SessionStructureComplementaireFormAwareTrait;
		use SessionStructureValideFormAwareTrait;

		public function ajouterStructureComplementaireAction() : ViewModel
		{
		$session = $this->getSessionService()->getRepository()->getRequestedSession($this);

		$structureComplementaire = new SessionStructureComplementaire();
		$structureComplementaire = new SessionStructureValide();
		$structureComplementaire->setSession($session);

		$form = $this->getSessionStructureComplementaireForm();
		$form = $this->getSessionStructureValideForm();
		$form->setAttribute('action', $this->url()->fromRoute('formation/session/ajouter-structure-complementaire', ['session' => $session->getId()], [], true));
		$form->bind($structureComplementaire);

		@@ -32,7 +32,7 @@ class SessionStructureComplementaireController extends AbstractActionController
		$data = $request->getPost();
		$form->setData($data);
		if ($form->isValid()) {
		$this->getSessionStructureComplementaireService()->create($structureComplementaire);
		$this->getSessionStructureValideService()->create($structureComplementaire);
		}
		}

		@@ -46,9 +46,9 @@ class SessionStructureComplementaireController extends AbstractActionController

		public function modifierStructureComplementaireAction() : ViewModel
		{
		$structureComplementaire = $this->getSessionStructureComplementaireService()->getRepository()->getRequestedSessionStructureComplementaire($this);
		$structureComplementaire = $this->getSessionStructureValideService()->getRepository()->getRequestedSessionStructureValide($this);

		$form = $this->getSessionStructureComplementaireForm();
		$form = $this->getSessionStructureValideForm();
		$form->setAttribute('action', $this->url()->fromRoute('formation/session/modifier-structure-complementaire', ['structure-complementaire' => $structureComplementaire->getId()], [], true));
		$form->bind($structureComplementaire);

		@@ -57,7 +57,7 @@ class SessionStructureComplementaireController extends AbstractActionController
		$data = $request->getPost();
		$form->setData($data);
		if ($form->isValid()) {
		$this->getSessionStructureComplementaireService()->update($structureComplementaire);
		$this->getSessionStructureValideService()->update($structureComplementaire);
		}
		}

		@@ -71,8 +71,8 @@ class SessionStructureComplementaireController extends AbstractActionController

		public function historiserStructureComplementaireAction() : Response
		{
		$structureComplementaire = $this->getSessionStructureComplementaireService()->getRepository()->getRequestedSessionStructureComplementaire($this);
		$this->getSessionStructureComplementaireService()->historise($structureComplementaire);
		$structureComplementaire = $this->getSessionStructureValideService()->getRepository()->getRequestedSessionStructureValide($this);
		$this->getSessionStructureValideService()->historise($structureComplementaire);

		$retour = $this->params()->fromQuery('retour');
		if ($retour) return $this->redirect()->toUrl($retour);
		@@ -81,8 +81,8 @@ class SessionStructureComplementaireController extends AbstractActionController

		public function restaurerStructureComplementaireAction() : Response
		{
		$structureComplementaire = $this->getSessionStructureComplementaireService()->getRepository()->getRequestedSessionStructureComplementaire($this);
		$this->getSessionStructureComplementaireService()->restore($structureComplementaire);
		$structureComplementaire = $this->getSessionStructureValideService()->getRepository()->getRequestedSessionStructureValide($this);
		$this->getSessionStructureValideService()->restore($structureComplementaire);

		$retour = $this->params()->fromQuery('retour');
		if ($retour) return $this->redirect()->toUrl($retour);
		@@ -91,12 +91,12 @@ class SessionStructureComplementaireController extends AbstractActionController

		public function supprimerStructureComplementaireAction() : ViewModel
		{
		$structureComplementaire = $this->getSessionStructureComplementaireService()->getRepository()->getRequestedSessionStructureComplementaire($this);
		$structureComplementaire = $this->getSessionStructureValideService()->getRepository()->getRequestedSessionStructureValide($this);

		$request = $this->getRequest();
		if ($request->isPost()) {
		$data = $request->getPost();
		if ($data["reponse"] === "oui") $this->getSessionStructureComplementaireService()->delete($structureComplementaire);
		if ($data["reponse"] === "oui") $this->getSessionStructureValideService()->delete($structureComplementaire);
		exit();
		}

module/Formation/src/Formation/Controller/SessionStructureComplementaireControllerFactory.php→module/Formation/src/Formation/Controller/SessionStructureValideControllerFactory.php

+15 −15

Changes for module/Formation/src/Formation/Controller/SessionStructureValideControllerFactory.php: 15 added lines, 15 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,45 +2,45 @@

		namespace Formation\Controller;

		use Formation\Entity\Db\SessionStructureComplementaire;
		use Formation\Form\SessionStructureComplementaire\SessionStructureComplementaireForm;
		use Formation\Form\SessionStructureComplementaire\SessionStructureComplementaireFormAwareTrait;
		use Formation\Entity\Db\SessionStructureValide;
		use Formation\Form\SessionStructureValide\SessionStructureValideForm;
		use Formation\Form\SessionStructureValide\SessionStructureValideFormAwareTrait;
		use Formation\Service\Session\SessionService;
		use Formation\Service\Session\SessionServiceAwareTrait;
		use Formation\Service\SessionStructureComplementaire\SessionStructureComplementaireService;
		use Formation\Service\SessionStructureComplementaire\SessionStructureComplementaireServiceAwareTrait;
		use Formation\Service\SessionStructureValide\SessionStructureValideService;
		use Formation\Service\SessionStructureValide\SessionStructureValideServiceAwareTrait;
		use Laminas\Mvc\Controller\AbstractActionController;
		use Laminas\View\Model\ViewModel;
		use Psr\Container\ContainerExceptionInterface;
		use Psr\Container\ContainerInterface;
		use Psr\Container\NotFoundExceptionInterface;

		class SessionStructureComplementaireControllerFactory {
		class SessionStructureValideControllerFactory {

		/**
		* @param ContainerInterface $container
		* @return SessionStructureComplementaireController
		* @return SessionStructureValideController
		* @throws ContainerExceptionInterface
		* @throws NotFoundExceptionInterface
		*/
		public function __invoke(ContainerInterface $container) : SessionStructureComplementaireController
		public function __invoke(ContainerInterface $container) : SessionStructureValideController
		{
		/**
		* @var SessionService $sessionService
		* @var SessionStructureComplementaireService $sessionStructureComplementaireService
		* @var SessionStructureValideService $sessionStructureComplementaireService
		*/
		$sessionService = $container->get(SessionService::class);
		$sessionStructureComplementaireService = $container->get(SessionStructureComplementaireService::class);
		$sessionStructureComplementaireService = $container->get(SessionStructureValideService::class);

		/**
		* @var SessionStructureComplementaireForm $sessionStructureComplementaireForm
		* @var SessionStructureValideForm $sessionStructureComplementaireForm
		*/
		$sessionStructureComplementaireForm = $container->get('FormElementManager')->get(SessionStructureComplementaireForm::class);
		$sessionStructureComplementaireForm = $container->get('FormElementManager')->get(SessionStructureValideForm::class);

		$controller = new SessionStructureComplementaireController();
		$controller = new SessionStructureValideController();
		$controller->setSessionService($sessionService);
		$controller->setSessionStructureComplementaireService($sessionStructureComplementaireService);
		$controller->setSessionStructureComplementaireForm($sessionStructureComplementaireForm);
		$controller->setSessionStructureValideService($sessionStructureComplementaireService);
		$controller->setSessionStructureValideForm($sessionStructureComplementaireForm);
		return $controller;
		}
		}
		No newline at end of file