Changement pour les niveau (a25ea0ad) · Commits · open-source / emc2

module/Application/config/merged/competence.config.php

+31 −31

Original line number	Diff line number	Diff line
		@@ -4,8 +4,8 @@ namespace Application;

		use Application\Controller\CompetenceController;
		use Application\Controller\CompetenceControllerFactory;
		use Application\Controller\CompetenceMaitriseController;
		use Application\Controller\CompetenceMaitriseControllerFactory;
		use Application\Controller\MaitriseNiveauController;
		use Application\Controller\MaitriseNiveauControllerFactory;
		use Application\Form\Competence\CompetenceForm;
		use Application\Form\Competence\CompetenceFormFactory;
		use Application\Form\Competence\CompetenceHydrator;
		@@ -14,10 +14,10 @@ use Application\Form\CompetenceElement\CompetenceElementForm;
		use Application\Form\CompetenceElement\CompetenceElementFormFactory;
		use Application\Form\CompetenceElement\CompetenceElementHydrator;
		use Application\Form\CompetenceElement\CompetenceElementHydratorFactory;
		use Application\Form\CompetenceMaitrise\CompetenceMaitriseForm;
		use Application\Form\CompetenceMaitrise\CompetenceMaitriseFormFactory;
		use Application\Form\CompetenceMaitrise\CompetenceMaitriseHydrator;
		use Application\Form\CompetenceMaitrise\CompetenceMaitriseHydratorFactory;
		use Application\Form\MaitriseNiveau\MaitriseNiveauForm;
		use Application\Form\MaitriseNiveau\MaitriseNiveauFormFactory;
		use Application\Form\MaitriseNiveau\MaitriseNiveauHydrator;
		use Application\Form\MaitriseNiveau\MaitriseNiveauHydratorFactory;
		use Application\Form\CompetenceType\CompetenceTypeForm;
		use Application\Form\CompetenceType\CompetenceTypeFormFactory;
		use Application\Form\CompetenceType\CompetenceTypeHydrator;
		@@ -25,23 +25,23 @@ use Application\Form\CompetenceType\CompetenceTypeHydratorFactory;
		use Application\Form\SelectionCompetence\SelectionCompetenceForm;
		use Application\Form\SelectionCompetence\SelectionCompetenceFormFactory;
		use Application\Form\SelectionCompetence\SelectionCompetenceHydrator;
		use Application\Form\SelectionCompetenceMaitrise\SelectionCompetenceMaitriseForm;
		use Application\Form\SelectionCompetenceMaitrise\SelectionCompetenceMaitriseFormFactory;
		use Application\Form\SelectionCompetenceMaitrise\SelectionCompetenceMaitriseHydrator;
		use Application\Form\SelectionCompetenceMaitrise\SelectionCompetenceMaitriseHydratorFactory;
		use Application\Form\SelectionMaitriseNiveau\SelectionMaitriseNiveauForm;
		use Application\Form\SelectionMaitriseNiveau\SelectionMaitriseNiveauFormFactory;
		use Application\Form\SelectionMaitriseNiveau\SelectionMaitriseNiveauHydrator;
		use Application\Form\SelectionMaitriseNiveau\SelectionMaitriseNiveauHydratorFactory;
		use Application\Provider\Privilege\CompetencePrivileges;
		use Application\Service\Competence\CompetenceService;
		use Application\Service\Competence\CompetenceServiceFactory;
		use Application\Service\CompetenceElement\CompetenceElementService;
		use Application\Service\CompetenceElement\CompetenceElementServiceFactory;
		use Application\Service\CompetenceMaitrise\CompetenceMaitriseService;
		use Application\Service\CompetenceMaitrise\CompetenceMaitriseServiceFactory;
		use Application\Service\CompetenceTheme\CompetenceThemeService;
		use Application\Service\CompetenceTheme\CompetenceThemeServiceFactory;
		use Application\Service\CompetenceType\CompetenceTypeService;
		use Application\Service\CompetenceType\CompetenceTypeServiceFactory;
		use Application\Service\HasCompetenceCollection\HasCompetenceCollectionService;
		use Application\Service\HasCompetenceCollection\HasCompetenceCollectionServiceFactory;
		use Application\Service\MaitriseNiveau\MaitriseNiveauService;
		use Application\Service\MaitriseNiveau\MaitriseNiveauServiceFactory;
		use Application\View\Helper\CompetenceBlocViewHelper;
		use Application\View\Helper\CompetenceBlocViewHelperFactory;
		use UnicaenPrivilege\Guard\PrivilegeController;
		@@ -115,7 +115,7 @@ return [
		],
		],
		[
		'controller' => CompetenceMaitriseController::class,
		'controller' => MaitriseNiveauController::class,
		'action' => [
		'afficher',
		],
		@@ -124,7 +124,7 @@ return [
		],
		],
		[
		'controller' => CompetenceMaitriseController::class,
		'controller' => MaitriseNiveauController::class,
		'action' => [
		'ajouter',
		],
		@@ -133,7 +133,7 @@ return [
		],
		],
		[
		'controller' => CompetenceMaitriseController::class,
		'controller' => MaitriseNiveauController::class,
		'action' => [
		'modifier',
		'historiser',
		@@ -144,7 +144,7 @@ return [
		],
		],
		[
		'controller' => CompetenceMaitriseController::class,
		'controller' => MaitriseNiveauController::class,
		'action' => [
		'supprimer',
		],
		@@ -275,17 +275,17 @@ return [
		'options' => [
		'route' => '/competence-maitrise',
		'defaults' => [
		'controller' => CompetenceMaitriseController::class,
		'controller' => MaitriseNiveauController::class,
		],
		],
		'may_terminate' => false,
		'child_routes' => [
		'ajouter' => [
		'type' => Literal::class,
		'type' => Segment::class,
		'options' => [
		'route' => '/ajouter',
		'route' => '/ajouter/:type',
		'defaults' => [
		'controller' => CompetenceMaitriseController::class,
		'controller' => MaitriseNiveauController::class,
		'action' => 'ajouter',
		],
		],
		@@ -296,7 +296,7 @@ return [
		'options' => [
		'route' => '/afficher/:maitrise',
		'defaults' => [
		'controller' => CompetenceMaitriseController::class,
		'controller' => MaitriseNiveauController::class,
		'action' => 'afficher',
		],
		],
		@@ -307,7 +307,7 @@ return [
		'options' => [
		'route' => '/modifier/:maitrise',
		'defaults' => [
		'controller' => CompetenceMaitriseController::class,
		'controller' => MaitriseNiveauController::class,
		'action' => 'modifier',
		],
		],
		@@ -318,7 +318,7 @@ return [
		'options' => [
		'route' => '/historiser/:maitrise',
		'defaults' => [
		'controller' => CompetenceMaitriseController::class,
		'controller' => MaitriseNiveauController::class,
		'action' => 'historiser',
		],
		],
		@@ -329,7 +329,7 @@ return [
		'options' => [
		'route' => '/restaurer/:maitrise',
		'defaults' => [
		'controller' => CompetenceMaitriseController::class,
		'controller' => MaitriseNiveauController::class,
		'action' => 'restaurer',
		],
		],
		@@ -340,7 +340,7 @@ return [
		'options' => [
		'route' => '/supprimer/:maitrise',
		'defaults' => [
		'controller' => CompetenceMaitriseController::class,
		'controller' => MaitriseNiveauController::class,
		'action' => 'supprimer',
		],
		],
		@@ -531,7 +531,7 @@ return [
		CompetenceService::class => CompetenceServiceFactory::class,
		CompetenceElementService::class => CompetenceElementServiceFactory::class,
		HasCompetenceCollectionService::class => HasCompetenceCollectionServiceFactory::class,
		CompetenceMaitriseService::class => CompetenceMaitriseServiceFactory::class,
		MaitriseNiveauService::class => MaitriseNiveauServiceFactory::class,
		CompetenceThemeService::class => CompetenceThemeServiceFactory::class,
		CompetenceTypeService::class => CompetenceTypeServiceFactory::class,
		],
		@@ -539,17 +539,17 @@ return [
		'controllers' => [
		'factories' => [
		CompetenceController::class => CompetenceControllerFactory::class,
		CompetenceMaitriseController::class => CompetenceMaitriseControllerFactory::class,
		MaitriseNiveauController::class => MaitriseNiveauControllerFactory::class,
		],
		],
		'form_elements' => [
		'factories' => [
		CompetenceForm::class => CompetenceFormFactory::class,
		CompetenceMaitriseForm::class => CompetenceMaitriseFormFactory::class,
		MaitriseNiveauForm::class => MaitriseNiveauFormFactory::class,
		CompetenceTypeForm::class => CompetenceTypeFormFactory::class,
		CompetenceElementForm::class => CompetenceElementFormFactory::class,
		SelectionCompetenceForm::class => SelectionCompetenceFormFactory::class,
		SelectionCompetenceMaitriseForm::class => SelectionCompetenceMaitriseFormFactory::class,
		SelectionMaitriseNiveauForm::class => SelectionMaitriseNiveauFormFactory::class,
		],
		],
		'hydrators' => [
		@@ -558,10 +558,10 @@ return [
		],
		'factories' => [
		CompetenceHydrator::class => CompetenceHydratorFactory::class,
		CompetenceMaitriseHydrator::class => CompetenceMaitriseHydratorFactory::class,
		MaitriseNiveauHydrator::class => MaitriseNiveauHydratorFactory::class,
		CompetenceTypeHydrator::class => CompetenceTypeHydratorFactory::class,
		CompetenceElementHydrator::class => CompetenceElementHydratorFactory::class,
		SelectionCompetenceMaitriseHydrator::class => SelectionCompetenceMaitriseHydratorFactory::class,
		SelectionMaitriseNiveauHydrator::class => SelectionMaitriseNiveauHydratorFactory::class,
		],
		],
		'view_helpers' => [

module/Application/src/Application/Controller/AgentController.php

+9 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,6 @@ namespace Application\Controller;

		use Application\Constant\RoleConstant;
		use Application\Entity\Db\ApplicationElement;
		use Application\Form\ApplicationElement\ApplicationElementForm;
		use Application\Form\ApplicationElement\ApplicationElementFormAwareTrait;
		use Application\Form\CompetenceElement\CompetenceElementFormAwareTrait;
		use Application\Form\SelectionApplication\SelectionApplicationFormAwareTrait;
		@@ -13,6 +12,7 @@ use Application\Service\Application\ApplicationServiceAwareTrait;
		use Application\Service\ApplicationElement\ApplicationElementServiceAwareTrait;
		use Application\Service\Categorie\CategorieServiceAwareTrait;
		use Application\Service\CompetenceElement\CompetenceElementServiceAwareTrait;
		use Application\Service\FichePoste\FichePosteServiceAwareTrait;
		use Application\Service\HasApplicationCollection\HasApplicationCollectionServiceAwareTrait;
		use Application\Service\HasCompetenceCollection\HasCompetenceCollectionServiceAwareTrait;
		use Application\Service\ParcoursDeFormation\ParcoursDeFormationServiceAwareTrait;
		@@ -68,6 +68,8 @@ class AgentController extends AbstractActionController
		use SelectionApplicationFormAwareTrait;
		use UploadFormAwareTrait;

		use FichePosteServiceAwareTrait;

		public function indexAction()
		{
		$fromQueries = $this->params()->fromQuery();
		@@ -97,12 +99,18 @@ class AgentController extends AbstractActionController
		$responsables = $this->getAgentService()->getResponsablesHierarchiques($agent);
		$parcoursArray = $this->getParcoursDeFormationService()->generateParcoursArrayFromFichePoste($agent->getFichePosteActif());

		$fichespostes = $this->getFichePosteService()->getFichesPostesByAgent($agent);
		$missions = $agent->getMissionsSpecifiques();

		return new ViewModel([
		'title' => 'Afficher l\'agent',
		'agent' => $agent,
		'entretiens' => $entretiens,
		'responsables' => $responsables,
		'parcoursArray' => $parcoursArray,

		'fichespostes' => $fichespostes,
		'missions' => $missions,
		]);
		}

module/Application/src/Application/Controller/AgentControllerFactory.php

+5 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ use Application\Service\Application\ApplicationService;
		use Application\Service\ApplicationElement\ApplicationElementService;
		use Application\Service\Categorie\CategorieService;
		use Application\Service\CompetenceElement\CompetenceElementService;
		use Application\Service\FichePoste\FichePosteService;
		use Application\Service\HasApplicationCollection\HasApplicationCollectionService;
		use Application\Service\HasCompetenceCollection\HasCompetenceCollectionService;
		use Application\Service\ParcoursDeFormation\ParcoursDeFormationService;
		@@ -50,6 +51,8 @@ class AgentControllerFactory {
		* @var FormationService $formationService
		* @var StructureService $structureService
		* @var UserService $userService
		*
		* @var FichePosteService $fichePosteService
		*/
		$agentService = $container->get(AgentService::class);
		$applicationElementService = $container->get(ApplicationElementService::class);
		@@ -69,6 +72,7 @@ class AgentControllerFactory {
		$formationService = $container->get(FormationService::class);
		$userService = $container->get(UserService::class);
		$structureService = $container->get(StructureService::class);
		$fichePosteService = $container->get(FichePosteService::class);

		/**
		* @var ApplicationElementForm $applicationElementForm
		@@ -104,6 +108,7 @@ class AgentControllerFactory {
		$controller->setApplicationService($applicationService);
		$controller->setUserService($userService);
		$controller->setStructureService($structureService);
		$controller->setFichePosteService($fichePosteService);

		$controller->setApplicationElementForm($applicationElementForm);
		$controller->setCompetenceElementForm($competenceElementForm);

module/Application/src/Application/Controller/CompetenceController.php

+3 −2

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ use Application\Service\CompetenceMaitrise\CompetenceMaitriseServiceAwareTrait;
		use Application\Service\CompetenceTheme\CompetenceThemeServiceAwareTrait;
		use Application\Service\CompetenceType\CompetenceTypeServiceAwareTrait;
		use Application\Service\FicheMetier\FicheMetierServiceAwareTrait;
		use Application\Service\MaitriseNiveau\MaitriseNiveauServiceAwareTrait;
		use Zend\Http\Request;
		use Zend\Mvc\Controller\AbstractActionController;
		use Zend\View\Model\ViewModel;
		@@ -30,7 +31,7 @@ class CompetenceController extends AbstractActionController
		use ActiviteServiceAwareTrait;
		use AgentServiceAwareTrait;
		use CompetenceServiceAwareTrait;
		use CompetenceMaitriseServiceAwareTrait;
		use MaitriseNiveauServiceAwareTrait;
		use CompetenceThemeServiceAwareTrait;
		use CompetenceTypeServiceAwareTrait;
		use CompetenceElementServiceAwareTrait;
		@@ -48,7 +49,7 @@ class CompetenceController extends AbstractActionController
		{
		$types = $this->getCompetenceTypeService()->getCompetencesTypes('ordre');
		$themes = $this->getCompetenceThemeService()->getCompetencesThemes();
		$niveaux = $this->getCompetenceMaitriseService()->getCompetencesMaitrises('niveau', 'ASC', true);
		$niveaux = $this->getMaitriseNiveauService()->getMaitrisesNiveaux('Compétence', 'niveau', 'ASC', true);
		$array = $this->getCompetenceService()->getCompetencesByTypes();

		return new ViewModel([

module/Application/src/Application/Controller/CompetenceControllerFactory.php

+4 −4

Original line number	Diff line number	Diff line
		@@ -11,10 +11,10 @@ use Application\Service\Activite\ActiviteService;
		use Application\Service\Agent\AgentService;
		use Application\Service\Competence\CompetenceService;
		use Application\Service\CompetenceElement\CompetenceElementService;
		use Application\Service\CompetenceMaitrise\CompetenceMaitriseService;
		use Application\Service\CompetenceTheme\CompetenceThemeService;
		use Application\Service\CompetenceType\CompetenceTypeService;
		use Application\Service\FicheMetier\FicheMetierService;
		use Application\Service\MaitriseNiveau\MaitriseNiveauService;
		use Interop\Container\ContainerInterface;

		class CompetenceControllerFactory
		@@ -26,7 +26,7 @@ class CompetenceControllerFactory
		* @var ActiviteService $activiteService
		* @var AgentService $agentService
		* @var CompetenceService $competenceService
		* @var CompetenceMaitriseService $competenceMaitriseService
		* @var MaitriseNiveauService $maitriseNiveauService
		* @var CompetenceThemeService $competenceThemeService
		* @var CompetenceTypeService $competenceTypeService
		* @var CompetenceElementService $competenceElementService
		@@ -35,7 +35,7 @@ class CompetenceControllerFactory
		$activiteService = $container->get(ActiviteService::class);
		$agentService = $container->get(AgentService::class);
		$competenceService = $container->get(CompetenceService::class);
		$competenceMaitriseService = $container->get(CompetenceMaitriseService::class);
		$maitriseNiveauService = $container->get(MaitriseNiveauService::class);
		$competenceThemeService = $container->get(CompetenceThemeService::class);
		$competenceTypeService = $container->get(CompetenceTypeService::class);
		$competenceElementService = $container->get(CompetenceElementService::class);
		@@ -59,7 +59,7 @@ class CompetenceControllerFactory
		$controller->setActiviteService($activiteService);
		$controller->setAgentService($agentService);
		$controller->setCompetenceService($competenceService);
		$controller->setCompetenceMaitriseService($competenceMaitriseService);
		$controller->setMaitriseNiveauService($maitriseNiveauService);
		$controller->setCompetenceThemeService($competenceThemeService);
		$controller->setCompetenceTypeService($competenceTypeService);
		$controller->setCompetenceElementService($competenceElementService);