FIJ => Seance (d3b098a1) · Commits · open-source / emc2

module/Formation/config/merged/formation-instance-journee.config.php→module/Formation/config/merged/seance.config.php

+19 −19

Changes for module/Formation/config/merged/seance.config.php: 19 added lines, 19 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,24 +2,24 @@

		namespace Formation;

		use Formation\Controller\FormationInstanceJourneeController;
		use Formation\Controller\FormationInstanceJourneeControllerFactory;
		use Formation\Form\FormationJournee\FormationJourneeForm;
		use Formation\Form\FormationJournee\FormationJourneeFormFactory;
		use Formation\Form\FormationJournee\FormationJourneeHydrator;
		use Formation\Form\FormationJournee\FormationJourneeHydratorFactory;
		use Formation\Controller\SeanceController;
		use Formation\Controller\SeanceControllerFactory;
		use Formation\Form\Seance\SeanceForm;
		use Formation\Form\Seance\SeanceFormFactory;
		use Formation\Form\Seance\SeanceHydrator;
		use Formation\Form\Seance\SeanceHydratorFactory;
		use Formation\Provider\Privilege\FormationinstancePrivileges;
		use Formation\Service\FormationInstanceJournee\FormationInstanceJourneeService;
		use Formation\Service\FormationInstanceJournee\FormationInstanceJourneeServiceFactory;
		use UnicaenPrivilege\Guard\PrivilegeController;
		use Formation\Service\Seance\SeanceService;
		use Formation\Service\Seance\SeanceServiceFactory;
		use Laminas\Router\Http\Segment;
		use UnicaenPrivilege\Guard\PrivilegeController;

		return [
		'bjyauthorize' => [
		'guards' => [
		PrivilegeController::class => [
		[
		'controller' => FormationInstanceJourneeController::class,
		'controller' => SeanceController::class,
		'action' => [
		'ajouter-journee',
		'modifier-journee',
		@@ -44,7 +44,7 @@ return [
		'options' => [
		'route' => '/ajouter-journee/:formation-instance',
		'defaults' => [
		'controller' => FormationInstanceJourneeController::class,
		'controller' => SeanceController::class,
		'action' => 'ajouter-journee',
		],
		],
		@@ -54,7 +54,7 @@ return [
		'options' => [
		'route' => '/modifier-journee/:journee',
		'defaults' => [
		'controller' => FormationInstanceJourneeController::class,
		'controller' => SeanceController::class,
		'action' => 'modifier-journee',
		],
		],
		@@ -64,7 +64,7 @@ return [
		'options' => [
		'route' => '/historiser-journee/:journee',
		'defaults' => [
		'controller' => FormationInstanceJourneeController::class,
		'controller' => SeanceController::class,
		'action' => 'historiser-journee',
		],
		],
		@@ -74,7 +74,7 @@ return [
		'options' => [
		'route' => '/restaurer-journee/:journee',
		'defaults' => [
		'controller' => FormationInstanceJourneeController::class,
		'controller' => SeanceController::class,
		'action' => 'restaurer-journee',
		],
		],
		@@ -84,7 +84,7 @@ return [
		'options' => [
		'route' => '/supprimer-journee/:journee',
		'defaults' => [
		'controller' => FormationInstanceJourneeController::class,
		'controller' => SeanceController::class,
		'action' => 'supprimer-journee',
		],
		],
		@@ -96,22 +96,22 @@ return [

		'service_manager' => [
		'factories' => [
		FormationInstanceJourneeService::class => FormationInstanceJourneeServiceFactory::class,
		SeanceService::class => SeanceServiceFactory::class,
		],
		],
		'controllers' => [
		'factories' => [
		FormationInstanceJourneeController::class => FormationInstanceJourneeControllerFactory::class,
		SeanceController::class => SeanceControllerFactory::class,
		],
		],
		'form_elements' => [
		'factories' => [
		FormationJourneeForm::class => FormationJourneeFormFactory::class,
		SeanceForm::class => SeanceFormFactory::class,
		],
		],
		'hydrators' => [
		'factories' => [
		FormationJourneeHydrator::class => FormationJourneeHydratorFactory::class,
		SeanceHydrator::class => SeanceHydratorFactory::class,
		],
		]

module/Formation/src/Formation/Controller/FormationInstanceController.php

+10 −0

Changes for module/Formation/src/Formation/Controller/FormationInstanceController.php: 10 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@
		namespace Formation\Controller;

		use Formation\Service\Notification\NotificationServiceAwareTrait;
		use Formation\Service\Presence\PresenceAwareTrait;
		use UnicaenAutoform\Service\Formulaire\FormulaireInstanceServiceAwareTrait;
		use DateInterval;
		use DateTime;
		@@ -32,6 +33,7 @@ class FormationInstanceController extends AbstractActionController
		use MailServiceAwareTrait;
		use NotificationServiceAwareTrait;
		use ParametreServiceAwareTrait;
		use PresenceAwareTrait;
		use FormationInstanceFormAwareTrait;
		use RappelAgentAvantFormationServiceAwareTrait;

		@@ -81,9 +83,17 @@ class FormationInstanceController extends AbstractActionController
		$instance = $this->getFormationInstanceService()->getRequestedFormationInstance($this);
		$mails = $this->getMailService()->getMailsByMotClef($instance->generateTag());

		$presences = $this->getPresenceService()->getPresenceByInstance($instance);

		$dictionnaire = [];
		foreach ($presences as $presence) {
		$dictionnaire[$presence->getJournee()->getId()][$presence->getInscrit()->getId()] = $presence;
		}

		return new ViewModel([
		'instance' => $instance,
		'mode' => "affichage",
		'presences' => $dictionnaire,
		'mails' => $mails,
		]);
		}

module/Formation/src/Formation/Controller/FormationInstanceControllerFactory.php

+4 −0

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

		use Formation\Service\Notification\NotificationService;
		use Formation\Service\Presence\PresenceService;
		use Psr\Container\ContainerExceptionInterface;
		use Psr\Container\NotFoundExceptionInterface;
		use UnicaenAutoform\Service\Formulaire\FormulaireInstanceService;
		@@ -36,6 +37,7 @@ class FormationInstanceControllerFactory
		* @var MailService $mailService
		* @var NotificationService $notificationService
		* @var ParametreService $parametreService
		* @var PresenceService $presenceService
		* @var RappelAgentAvantFormationService $rappelAgentAvantFormationService
		*/
		$etatService = $container->get(EtatService::class);
		@@ -46,6 +48,7 @@ class FormationInstanceControllerFactory
		$mailService = $container->get(MailService::class);
		$notificationService = $container->get(NotificationService::class);
		$parametreService = $container->get(ParametreService::class);
		$presenceService = $container->get(PresenceService::class);
		$rappelAgentAvantFormationService = $container->get(RappelAgentAvantFormationService::class);

		/**
		@@ -64,6 +67,7 @@ class FormationInstanceControllerFactory
		$controller->setMailService($mailService);
		$controller->setNotificationService($notificationService);
		$controller->setParametreService($parametreService);
		$controller->setPresenceService($presenceService);
		$controller->setRappelAgentAvantFormationService($rappelAgentAvantFormationService);
		return $controller;
		}

module/Formation/src/Formation/Controller/FormationInstanceDocumentController.php

+6 −6

Changes for module/Formation/src/Formation/Controller/FormationInstanceDocumentController.php: 6 added lines, 6 removed lines.
Original line number	Diff line number	Diff line
		@@ -3,26 +3,26 @@
		namespace Formation\Controller;

		use Application\Service\Macro\MacroServiceAwareTrait;
		use Formation\Entity\Db\FormationInstanceJournee;
		use Formation\Entity\Db\Seance;
		use Formation\Provider\Template\PdfTemplates;
		use Formation\Service\Emargement\EmargementPdfExporter;
		use Formation\Service\FormationInstance\FormationInstanceServiceAwareTrait;
		use Formation\Service\FormationInstanceInscrit\FormationInstanceInscritServiceAwareTrait;
		use Formation\Service\FormationInstanceJournee\FormationInstanceJourneeServiceAwareTrait;
		use Formation\Service\Seance\SeanceServiceAwareTrait;
		use Laminas\Mvc\Controller\AbstractActionController;
		use Mpdf\MpdfException;
		use UnicaenApp\Exception\RuntimeException;
		use UnicaenPdf\Exporter\PdfExporter;
		use UnicaenRenderer\Service\Rendu\RenduServiceAwareTrait;
		use UnicaenRenderer\Service\Template\TemplateServiceAwareTrait;
		use Laminas\Mvc\Controller\AbstractActionController;

		class FormationInstanceDocumentController extends AbstractActionController
		{
		use FormationInstanceServiceAwareTrait;
		use FormationInstanceInscritServiceAwareTrait;
		use FormationInstanceJourneeServiceAwareTrait;
		use MacroServiceAwareTrait;
		use RenduServiceAwareTrait;
		use SeanceServiceAwareTrait;
		use TemplateServiceAwareTrait;

		private $renderer;
		@@ -34,7 +34,7 @@ class FormationInstanceDocumentController extends AbstractActionController

		public function exportEmargementAction()
		{
		$journee = $this->getFormationInstanceJourneeService()->getRequestedFormationInstanceJournee($this);
		$journee = $this->getSeanceService()->getRequestedSeance($this);

		$exporter = new EmargementPdfExporter($this->renderer, 'A4');
		$exporter->setVars([
		@@ -56,7 +56,7 @@ class FormationInstanceDocumentController extends AbstractActionController
		{
		$instance = $this->getFormationInstanceService()->getRequestedFormationInstance($this);
		$journees = $instance->getJournees();
		$journees = array_filter($journees, function (FormationInstanceJournee $a) {
		$journees = array_filter($journees, function (Seance $a) {
		return $a->estNonHistorise();
		});

module/Formation/src/Formation/Controller/FormationInstanceDocumentControllerFactory.php

+4 −3

Changes for module/Formation/src/Formation/Controller/FormationInstanceDocumentControllerFactory.php: 4 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ use Application\Service\Macro\MacroService;
		use Formation\Service\FormationInstance\FormationInstanceService;
		use Formation\Service\FormationInstanceInscrit\FormationInstanceInscritService;
		use Formation\Service\FormationInstanceJournee\FormationInstanceJourneeService;
		use Formation\Service\Seance\SeanceService;
		use Interop\Container\ContainerInterface;
		use Psr\Container\ContainerExceptionInterface;
		use Psr\Container\NotFoundExceptionInterface;
		@@ -26,15 +27,15 @@ class FormationInstanceDocumentControllerFactory
		/**
		* @var FormationInstanceService $formationInstanceService
		* @var FormationInstanceInscritService $formationInstanceInscritService
		* @var FormationInstanceJourneeService $formationInstanceJourneeService
		* @var MacroService $macroService
		* @var RenduService $renduService
		* @var SeanceService $seanceService
		*/
		$formationInstanceService = $container->get(FormationInstanceService::class);
		$formationInstanceInscritService = $container->get(FormationInstanceInscritService::class);
		$formationInstanceJourneeService = $container->get(FormationInstanceJourneeService::class);
		$macroService = $container->get(MacroService::class);
		$renduService = $container->get(RenduService::class);
		$seanceService = $container->get(SeanceService::class);

		/* @var PhpRenderer $renderer */
		$renderer = $container->get('ViewRenderer');
		@@ -43,9 +44,9 @@ class FormationInstanceDocumentControllerFactory
		$controller = new FormationInstanceDocumentController();
		$controller->setFormationInstanceService($formationInstanceService);
		$controller->setFormationInstanceInscritService($formationInstanceInscritService);
		$controller->setFormationInstanceJourneeService($formationInstanceJourneeService);
		$controller->setMacroService($macroService);
		$controller->setRenduService($renduService);
		$controller->setSeanceService($seanceService);
		$controller->setRenderer($renderer);

		return $controller;