Ajout des parcours en affichage (612fc54c) · Commits · open-source / emc2

module/Application/config/merged/parcours-de-formation.config.php

+8 −1

Changes for module/Application/config/merged/parcours-de-formation.config.php: 8 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -11,6 +11,8 @@ use Application\Form\ParcoursDeFormation\ParcoursDeFormationHydratorFactory;
		use Application\Provider\Privilege\FormationPrivileges;
		use Application\Service\ParcoursDeFormation\ParcoursDeFormationService;
		use Application\Service\ParcoursDeFormation\ParcoursDeFormationServiceFactory;
		use Application\View\Helper\ActiviteViewHelper;
		use Application\View\Helper\ParcoursDeFormationViewHelper;
		use UnicaenPrivilege\Guard\PrivilegeController;
		use Zend\Router\Http\Literal;
		use Zend\Router\Http\Segment;
		@@ -160,6 +162,11 @@ return [
		'factories' => [
		ParcoursDeFormationHydrator::class => ParcoursDeFormationHydratorFactory::class,
		],
		]
		],
		'view_helpers' => [
		'invokables' => [
		'parcoursDeFormation' => ParcoursDeFormationViewHelper::class,
		],
		],

		];
		No newline at end of file

module/Application/src/Application/Controller/FicheMetierController.php

+5 −0

Changes for module/Application/src/Application/Controller/FicheMetierController.php: 5 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@ namespace Application\Controller;
		use Application\Entity\Db\Activite;
		use Application\Entity\Db\FicheMetier;
		use Application\Entity\Db\FicheMetierEtat;
		use Application\Entity\Db\ParcoursDeFormation;
		use Application\Form\Activite\ActiviteForm;
		use Application\Form\Activite\ActiviteFormAwareTrait;
		use Application\Form\FicheMetier\ActiviteExistanteForm;
		@@ -25,6 +26,7 @@ use Application\Service\Domaine\DomaineServiceAwareTrait;
		use Application\Service\Export\FicheMetier\FicheMetierPdfExporter;
		use Application\Service\FicheMetier\FicheMetierServiceAwareTrait;
		use Application\Service\FicheMetierEtat\FicheMetierEtatServiceAwareTrait;
		use Application\Service\ParcoursDeFormation\ParcoursDeFormationServiceAwareTrait;
		use Mpdf\MpdfException;
		use UnicaenApp\Exception\RuntimeException;
		use UnicaenUtilisateur\Entity\DateTimeAwareTrait;
		@@ -41,6 +43,7 @@ class FicheMetierController extends AbstractActionController{
		use DomaineServiceAwareTrait;
		use FicheMetierServiceAwareTrait;
		use FicheMetierEtatServiceAwareTrait;
		use ParcoursDeFormationServiceAwareTrait;
		/** Traits associé aux formulaires */
		use ActiviteFormAwareTrait;
		use ActiviteExistanteFormAwareTrait;
		@@ -86,10 +89,12 @@ class FicheMetierController extends AbstractActionController{
		public function afficherAction()
		{
		$fiche = $this->getFicheMetierService()->getRequestedFicheMetier($this, 'id', true);
		$parcours = $this->getParcoursDeFormationService()->generateParcoursArrayFromFicheMetier($fiche);

		return new ViewModel([
		'title' => 'Visualisation d\'une fiche métier',
		'fiche' => $fiche,
		'parcours' => $parcours,
		]);
		}

module/Application/src/Application/Controller/FicheMetierControllerFactory.php

+4 −1

Changes for module/Application/src/Application/Controller/FicheMetierControllerFactory.php: 4 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@ use Application\Service\Configuration\ConfigurationService;
		use Application\Service\Domaine\DomaineService;
		use Application\Service\FicheMetier\FicheMetierService;
		use Application\Service\FicheMetierEtat\FicheMetierEtatService;
		use Application\Service\ParcoursDeFormation\ParcoursDeFormationService;
		use Interop\Container\ContainerInterface;
		use Zend\View\Renderer\PhpRenderer;

		@@ -28,13 +29,14 @@ class FicheMetierControllerFactory {
		* @var FicheMetierService $ficheMetierService
		* @var FicheMetierEtatService $ficheMetierEtatService
		* @var ConfigurationService $configurationService
		* @var ParcoursDeFormationService $parcoursService
		*/
		$activiteService = $container->get(ActiviteService::class);
		$domaineService = $container->get(DomaineService::class);
		$ficheMetierService = $container->get(FicheMetierService::class);
		$ficheMetierEtatService = $container->get(FicheMetierEtatService::class);
		$configurationService = $container->get(ConfigurationService::class);

		$parcoursService = $container->get(ParcoursDeFormationService::class);

		/**
		* @var LibelleForm $libelleForm
		@@ -67,6 +69,7 @@ class FicheMetierControllerFactory {
		$controller->setFicheMetierService($ficheMetierService);
		$controller->setFicheMetierEtatService($ficheMetierEtatService);
		$controller->setConfigurationService($configurationService);
		$controller->setParcoursDeFormationService($parcoursService);

		$controller->setLibelleForm($libelleForm);
		$controller->setActiviteForm($activiteForm);

module/Application/src/Application/Controller/FichePosteController.php

+7 −0

Changes for module/Application/src/Application/Controller/FichePosteController.php: 7 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@ use Application\Entity\Db\FicheMetier;
		use Application\Entity\Db\FichePoste;
		use Application\Entity\Db\FicheposteActiviteDescriptionRetiree;
		use Application\Entity\Db\FicheTypeExterne;
		use Application\Entity\Db\ParcoursDeFormation;
		use Application\Entity\Db\SpecificitePoste;
		use Application\Form\AjouterFicheMetier\AjouterFicheMetierFormAwareTrait;
		use Application\Form\AssocierAgent\AssocierAgentForm;
		@@ -28,6 +29,7 @@ use Application\Service\Export\FichePoste\FichePostePdfExporter;
		use Application\Service\FicheMetier\FicheMetierServiceAwareTrait;
		use Application\Service\FichePoste\FichePosteServiceAwareTrait;
		use Application\Service\FormationsRetirees\FormationsRetireesServiceAwareTrait;
		use Application\Service\ParcoursDeFormation\ParcoursDeFormationServiceAwareTrait;
		use Application\Service\SpecificitePoste\SpecificitePosteServiceAwareTrait;
		use Application\Service\Structure\StructureServiceAwareTrait;
		use DateTime;
		@@ -55,6 +57,7 @@ class FichePosteController extends AbstractActionController {
		use FormationsRetireesServiceAwareTrait;
		use ExpertiseServiceAwareTrait;
		use SpecificitePosteServiceAwareTrait;
		use ParcoursDeFormationServiceAwareTrait;

		/ Form /
		use AjouterFicheMetierFormAwareTrait;
		@@ -192,6 +195,9 @@ class FichePosteController extends AbstractActionController {
		$formations = $this->getFichePosteService()->getFormationsDictionnaires($fiche, $date);
		$activites = $this->getFichePosteService()->getActivitesDictionnaires($fiche, $date);

		//parcours de formation
		$parcours = $this->getParcoursDeFormationService()->generateParcoursArrayFromFichePoste($fiche);

		return new ViewModel([
		'title' => $titre,
		'fiche' => $fiche,
		@@ -199,6 +205,7 @@ class FichePosteController extends AbstractActionController {
		'competences' => $competences,
		'formations' => $formations,
		'activites' => $activites,
		'parcours' => $parcours,
		]);
		}

module/Application/src/Application/Controller/FichePosteControllerFactory.php

+4 −0

Changes for module/Application/src/Application/Controller/FichePosteControllerFactory.php: 4 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ use Application\Service\Expertise\ExpertiseService;
		use Application\Service\FicheMetier\FicheMetierService;
		use Application\Service\FichePoste\FichePosteService;
		use Application\Service\FormationsRetirees\FormationsRetireesService;
		use Application\Service\ParcoursDeFormation\ParcoursDeFormationService;
		use Application\Service\SpecificitePoste\SpecificitePosteService;
		use Application\Service\Structure\StructureService;
		use Interop\Container\ContainerInterface;
		@@ -37,6 +38,7 @@ class FichePosteControllerFactory {
		* @var FormationsRetireesService $formationsConserseesService
		* @var ExpertiseService $expertiseService
		* @var SpecificitePosteService $specificitePosteService
		* @var ParcoursDeFormationService $parcoursService
		*/
		$agentService = $container->get(AgentService::class);
		$ficheMetierService = $container->get(FicheMetierService::class);
		@@ -49,6 +51,7 @@ class FichePosteControllerFactory {
		$formationsConserseesService = $container->get(FormationsRetireesService::class);
		$expertiseService = $container->get(ExpertiseService::class);
		$specificitePosteService = $container->get(SpecificitePosteService::class);
		$parcoursService = $container->get(ParcoursDeFormationService::class);

		/**
		* @var AjouterFicheMetierForm $ajouterFicheMetierForm
		@@ -83,6 +86,7 @@ class FichePosteControllerFactory {
		$controller->setFormationsRetireesService($formationsConserseesService);
		$controller->setExpertiseService($expertiseService);
		$controller->setSpecificitePosteService($specificitePosteService);
		$controller->setParcoursDeFormationService($parcoursService);

		$controller->setAjouterFicheTypeForm($ajouterFicheMetierForm);
		$controller->setAssocierAgentForm($associerAgentForm);