Merge branch 'release-1.1.2' (61ec4774) · Commits · open-source / emc2

CHANGELOG.md

+15 −0

Original line number	Diff line number	Diff line
		Version 1.1.3
		-------------
		+ [Planifier] Repenser les niveaux de maitrise (ajouter un type)

		Version 1.1.2
		-------------
		+ Ajout de niveau de maîtrise pour les compétences et de compétences clefs + gestion de leur affection au niveau des ``CompetenceElement``.
		+ Premier rendu visuel des graphiques en radar des applications liées aux fiches métiers et des couples (fiche métier, agent).
		+ Premier rendu visuel des graphiques en radar des compétences liées aux fiches métiers et des couples (fiche métier, agent).
		+ [Interface] changement de l'intitulé 'applicatif' en 'logiciels métiers'
		+ Refonte des ElementBlocs : applicationBloc, CompetenceBloc, formationBloc remplacent les agentApplication, agentCompetence, agentFormation
		+ Possibilité de liés des compétences et des applications dans une formation qui sont transmises sur la fiche de l'agent si la formation a été suivie.
		+ Ajout d'un attachement au mail pour pouvoir lister ceux-ci en fonction d'un élément (un entretien, une action de formation, ...)
		+ Attachement des mails aux entretiens professionnels et aux campagnes d'entretien professionnel

		Version 1.1.1
		-------------
		+ Affichage des structures de l'agent dans l'entête des entretiens professionnels (lien vers la structure si l'utilisateur a les droits de visualiser la structure).

config/autoload/unicaen-app.global.php

+2 −2

Original line number	Diff line number	Diff line
		@@ -26,8 +26,8 @@ return [
		'app_infos' => [
		'nom' => "EMC2",
		'desc' => "Emploi Mobilité Carrière Compétences",
		'version' => "1.1.1",
		'date' => "16/03/2021",
		'version' => "1.1.2",
		'date' => "19/03/2021",
		'contact' => ['mail' => "dsi.applications@unicaen.fr", /'tel' => "01 02 03 04 05"/],
		'mentionsLegales' => "http://www.unicaen.fr/acces-direct/mentions-legales/",
		'informatiqueEtLibertes' => "http://www.unicaen.fr/acces-direct/informatique-et-libertes/",

module/Application/config/merged/agent.config.php

+9 −215

Original line number	Diff line number	Diff line
		@@ -14,9 +14,6 @@ use Application\Provider\Privilege\AgentPrivileges;
		use Application\Service\Agent\AgentService;
		use Application\Service\Agent\AgentServiceFactory;
		use Application\View\Helper\AgentAffectationViewHelper;
		use Application\View\Helper\AgentApplicationViewHelper;
		use Application\View\Helper\AgentCompetenceViewHelper;
		use Application\View\Helper\AgentFormationViewHelper;
		use Application\View\Helper\AgentGradeViewHelper;
		use Application\View\Helper\AgentStatutViewHelper;
		use Application\View\Helper\AgentViewHelper;
		@@ -43,6 +40,8 @@ return [
		AgentPrivileges::AGENT_ELEMENT_HISTORISER,
		AgentPrivileges::AGENT_ELEMENT_DETRUIRE,
		AgentPrivileges::AGENT_ELEMENT_VALIDER,
		AgentPrivileges::AGENT_ACQUIS_AFFICHER,
		AgentPrivileges::AGENT_ACQUIS_MODIFIER,
		],
		'resources' => ['Agent'],
		'assertion' => AgentAssertion::class
		@@ -79,9 +78,6 @@ return [
		'controller' => AgentController::class,
		'action' => [
		'afficher-statuts-grades',
		'afficher-application',
		'afficher-competence',
		'afficher-formation',
		],
		'privileges' => [
		AgentPrivileges::AGENT_ELEMENT_VOIR,
		@@ -92,61 +88,13 @@ return [
		'controller' => AgentController::class,
		'action' => [
		'upload-fichier',
		],
		'privileges' => [
		AgentPrivileges::AGENT_EDITER,
		],
		],
		[
		'controller' => AgentController::class,
		'action' => [
		'ajouter-application',
		'ajouter-competence',
		'ajouter-formation',
		],
		'privileges' => [
		AgentPrivileges::AGENT_ELEMENT_AJOUTER,
		],
		'assertion' => AgentAssertion::class,
		],
		[
		'controller' => AgentController::class,
		'action' => [
		'modifier-application',
		'modifier-competence',
		'ajouter-application',
		'modifier-formation',
		],
		'privileges' => [
		AgentPrivileges::AGENT_ELEMENT_MODIFIER,
		],
		'assertion' => AgentAssertion::class,
		],
		[
		'controller' => AgentController::class,
		'action' => [
		'historiser-application',
		'restaurer-application',
		'historiser-competence',
		'restaurer-competence',
		'historiser-formation',
		'restaurer-formation',
		],
		'privileges' => [
		AgentPrivileges::AGENT_ELEMENT_MODIFIER,
		],
		'assertion' => AgentAssertion::class,
		],
		[
		'controller' => AgentController::class,
		'action' => [
		'detruire-formation',
		'detruire-competence',
		'detruire-application',
		],
		'privileges' => [
		AgentPrivileges::AGENT_ELEMENT_DETRUIRE,
		AgentPrivileges::AGENT_EDITER,
		],
		'assertion' => AgentAssertion::class,
		],
		[
		'controller' => AgentController::class,
		@@ -220,6 +168,7 @@ return [

		/ Routes de gestion des applications***********************************************************/

		//TODO changer dans parcours-applicatifs
		'ajouter-application' => [
		'type' => Segment::class,
		'options' => [
		@@ -230,121 +179,8 @@ return [
		],
		],
		],
		'afficher-application' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/afficher-application/:agent/:application-element',
		'defaults' => [
		'controller' => AgentController::class,
		'action' => 'afficher-application',
		],
		],
		],
		'modifier-application' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/modifier-application/:agent/:application-element',
		'defaults' => [
		'controller' => AgentController::class,
		'action' => 'modifier-application',
		],
		],
		],
		'historiser-application' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/historiser-application/:agent/:application-element',
		'defaults' => [
		'controller' => AgentController::class,
		'action' => 'historiser-application',
		],
		],
		],
		'restaurer-application' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/restaurer-application/:agent/:application-element',
		'defaults' => [
		'controller' => AgentController::class,
		'action' => 'restaurer-application',
		],
		],
		],
		'detruire-application' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/detruire-application/:agent/:application-element',
		'defaults' => [
		'controller' => AgentController::class,
		'action' => 'detruire-application',
		],
		],
		],

		/ Route des AgentCompetence *******************************************************************/

		'ajouter-competence' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/ajouter-competence/:agent',
		'defaults' => [
		'controller' => AgentController::class,
		'action' => 'ajouter-competence',
		],
		],
		],
		'afficher-competence' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/afficher-competence/:agent/:competence-element',
		'defaults' => [
		'controller' => AgentController::class,
		'action' => 'afficher-competence',
		],
		],
		],
		'modifier-competence' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/modifier-competence/:agent/:competence-element',
		'defaults' => [
		'controller' => AgentController::class,
		'action' => 'modifier-competence',
		],
		],
		],
		'historiser-competence' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/historiser-competence/:agent/:competence-element',
		'defaults' => [
		'controller' => AgentController::class,
		'action' => 'historiser-competence',
		],
		],
		],
		'restaurer-competence' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/restaurer-competence/:agent/:competence-element',
		'defaults' => [
		'controller' => AgentController::class,
		'action' => 'restaurer-competence',
		],
		],
		],
		'detruire-competence' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/detruire-competence/:agent/:competence-element',
		'defaults' => [
		'controller' => AgentController::class,
		'action' => 'detruire-competence',
		],
		],
		],

		/ Route des AgentFormation ********************************************************************/
		//TODO changer dans parcours-de-formation
		//TODO changer dans formation-bloc

		'ajouter-formation' => [
		'type' => Segment::class,
		@@ -356,16 +192,7 @@ return [
		],
		],
		],
		'afficher-formation' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/afficher-formation/:agent/:formation-element',
		'defaults' => [
		'controller' => AgentController::class,
		'action' => 'afficher-formation',
		],
		],
		],
		//TODO changer dans formation-bloc
		'modifier-formation' => [
		'type' => Segment::class,
		'options' => [
		@@ -376,36 +203,6 @@ return [
		],
		],
		],
		'historiser-formation' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/historiser-formation/:agent/:formation-element',
		'defaults' => [
		'controller' => AgentController::class,
		'action' => 'historiser-formation',
		],
		],
		],
		'restaurer-formation' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/restaurer-formation/:agent/:formation-element',
		'defaults' => [
		'controller' => AgentController::class,
		'action' => 'restaurer-formation',
		],
		],
		],
		'detruire-formation' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/detruire-formation/:agent/:formation-element',
		'defaults' => [
		'controller' => AgentController::class,
		'action' => 'detruire-formation',
		],
		],
		],

		/ VALIDATION D'ELEMENT ************************************************************************/

		@@ -477,7 +274,7 @@ return [
		'agent' => [
		'label' => 'Agents',
		'route' => 'agent',
		'resource' => AgentPrivileges::getResourceId(AgentPrivileges::AGENT_AFFICHER),
		'resource' => PrivilegeController::getResourceId(AgentController::class, 'index') ,
		'order' => 100,
		],
		],
		@@ -519,9 +316,6 @@ return [
		'invokables' => [
		'agent' => AgentViewHelper::class,
		'agentAffectation' => AgentAffectationViewHelper::class,
		'agentApplication' => AgentApplicationViewHelper::class,
		'agentCompetence' => AgentCompetenceViewHelper::class,
		'agentFormation' => AgentFormationViewHelper::class,
		'agentStatut' => AgentStatutViewHelper::class,
		'agentGrade' => AgentGradeViewHelper::class,
		],

module/Application/config/merged/application.config.php

+13 −1

Original line number	Diff line number	Diff line
		@@ -21,9 +21,9 @@ use Application\Form\SelectionApplication\SelectionApplicationFormFactory;
		use Application\Form\SelectionApplication\SelectionApplicationHydrator;
		use Application\Provider\Privilege\ApplicationPrivileges;
		use Application\Service\Application\ApplicationGroupeService;
		use Application\Service\Application\ApplicationGroupeServiceFactory;
		use Application\Service\Application\ApplicationService;
		use Application\Service\Application\ApplicationServiceFactory;
		use Application\Service\Application\ApplicationGroupeServiceFactory;
		use Application\Service\ApplicationElement\ApplicationElementService;
		use Application\Service\ApplicationElement\ApplicationElementServiceFactory;
		use Application\Service\HasApplicationCollection\HasApplicationCollectionService;
		@@ -74,6 +74,7 @@ return [
		'action' => [
		'creer',
		'ajouter-groupe',
		'ajouter-application-element',
		],
		'privileges' => [
		ApplicationPrivileges::APPLICATION_AJOUTER,
		@@ -207,6 +208,17 @@ return [
		],
		],
		],
		'ajouter-application-element' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/ajouter-application-element/:type/:id[/:clef]',
		'defaults' => [
		'controller' => ApplicationController::class,
		'action' => 'ajouter-application-element',
		],
		],
		'may_terminate' => true,
		],
		'changer-status' => [
		'type' => Segment::class,
		'options' => [

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

+146 −0

File changed.

Preview size limit exceeded, changes collapsed.