Merge branch 'release_1.1.5' (5bc5d29f) · Commits · open-source / emc2

CHANGELOG.md

+9 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,15 @@ Version 1.3.0 Module de bourse emploi
		Version 1.2.0 Module de formation
		-------------

		Version 1.1.5
		-------------
		+ [Correction bug] l'encart Mes données ne marchait plus faute d'agent fourni
		+ [Qualité de vie] Ajout d'un onglet agent sur les structures pour clarifier
		+ Parametrage et ajout d'une adresse par défaut pour les profils de recrutement
		+ Refonte macro pour le profil
		+ Fiche de poste pour recrutement + modification de l'association d'agent


		Version 1.1.4
		-------------
		+ [Base de données] Reprise des données de LAGAF (1er batch)

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.4",
		'date' => "28/05/2021",
		'version' => "1.1.5",
		'date' => "08/06/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/competence.config.php

+2 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ use Application\Form\SelectionMaitriseNiveau\SelectionMaitriseNiveauHydrator;
		use Application\Form\SelectionMaitriseNiveau\SelectionMaitriseNiveauHydratorFactory;
		use Application\Provider\Privilege\AgentPrivileges;
		use Application\Provider\Privilege\CompetencePrivileges;
		use Application\Provider\Privilege\FicheMetierPrivileges;
		use Application\Service\Competence\CompetenceService;
		use Application\Service\Competence\CompetenceServiceFactory;
		use Application\Service\CompetenceElement\CompetenceElementService;
		@@ -159,6 +160,7 @@ return [
		],
		'privileges' => [
		AgentPrivileges::AGENT_ACQUIS_MODIFIER,
		FicheMetierPrivileges::FICHEMETIER_MODIFIER,
		],
		],
		],

module/Application/config/merged/structure.config.php

+30 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,14 @@ return [
		],
		'privileges' => StructurePrivileges::STRUCTURE_AFFICHER,
		],
		[
		'controller' => StructureController::class,
		'action' => [
		'ajouter-fiche-poste-recrutement',
		'dupliquer-fiche-poste-recrutement',
		],
		'privileges' => StructurePrivileges::STRUCTURE_DESCRIPTION,
		],
		[
		'controller' => StructureController::class,
		'action' => [
		@@ -152,6 +160,28 @@ return [
		'may_terminate' => true,
		'child_routes' => [],
		],
		'ajouter-fiche-poste-recrutement' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/ajouter-fiche-poste-recrutement/:structure',
		'defaults' => [
		'controller' => StructureController::class,
		'action' => 'ajouter-fiche-poste-recrutement',
		],
		],
		'may_terminate' => true,
		],
		'dupliquer-fiche-poste-recrutement' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/dupliquer-fiche-poste-recrutement/:structure',
		'defaults' => [
		'controller' => StructureController::class,
		'action' => 'dupliquer-fiche-poste-recrutement',
		],
		],
		'may_terminate' => true,
		],
		'graphe' => [
		'type' => Segment::class,
		'options' => [

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

+13 −3

Original line number	Diff line number	Diff line
		@@ -89,13 +89,23 @@ class AgentController extends AbstractActionController
		public function afficherAction()
		{
		$agent = $this->getAgentService()->getRequestedAgent($this);
		$utilisateur = $this->getUserService()->getConnectedUser();

		/** si pas d'agent de specifier récupérer l'agent lié au compte de la personne connectée */
		if ($agent === null) {
		if ($utilisateur !== null) $agent = $this->getAgentService()->getAgentByUser($utilisateur);
		}

		/** si pas d'agent throw exception */
		if ($agent === null) throw new RuntimeException("Aucun agent n'a pu être trouvé.");

		$agentStatuts = $this->getAgentService()->getAgentStatutsByAgent($agent, true);
		$agentAffectations = $this->getAgentService()->getAgentAffectationsByAgent($agent, true);
		$agentGrades = $this->getAgentService()->getAgentGradesByAgent($agent, true);
		$connectedUser = $this->getUserService()->getConnectedUser();
		$connectedAgent = $this->getAgentService()->getAgentByUser($connectedUser);

		$connectedAgent = $this->getAgentService()->getAgentByUser($utilisateur);
		$connectedRole = $this->getUserService()->getConnectedRole();
		if ($agent !== $connectedAgent AND ($connectedRole->getRoleId() === RoleConstant::PERSONNEL OR $agent === null)) {
		if ($connectedAgent !== $agent AND ($connectedRole->getRoleId() === RoleConstant::PERSONNEL OR $agent === null)) {
		return $this->redirect()->toRoute('agent/afficher', ['agent' => $connectedAgent->getId()], [] , true);
		}
		$entretiens = $this->getEntretienProfessionnelService()->getEntretiensProfessionnelsParAgent($agent);