Parametre pour les date du protail agent (cdeaa1bd) · Commits · open-source / emc2

documentation/002_DB_EMC2_CARRIERE.sql

+2 −1

Changes for documentation/002_DB_EMC2_CARRIERE.sql: 2 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -122,7 +122,8 @@ WITH d(CODE, LIBELLE, DESCRIPTION, VALEURS_POSSIBLES, VALEUR, ORDRE) AS (
		SELECT 'CorpsAvecAgent', 'Affichage seulement des corps avec agent', null, 'Boolean', 'true', 100 UNION
		SELECT 'GradeAvecAgent', 'Affichage seulement des grades avec agent', null, 'Boolean', 'true', 200 UNION
		SELECT 'CorrespondanceAvecAgent', 'Affichage seulement des correspondance ayant un agent', null, 'Boolean', 'true', 300 UNION
		SELECT 'ACTIF_ONLY','Ne considérer que les Corps/Correspondances/Grades actifs',null,'Boolean',true, 1000
		SELECT 'ACTIF_ONLY','Ne considérer que les Corps/Correspondances/Grades actifs',null,'Boolean',true, 1000 UNION
		SELECT 'DATE_PORTAIL_AGENT', 'Affichage des dates sur le portail Agent', null, 'Boolean', 'false', 1100
		)
		SELECT cp.id, d.CODE, d.LIBELLE, d.DESCRIPTION, d.VALEURS_POSSIBLES, d.VALEUR, d.ORDRE
		FROM d

+10 −0

Changes for documentation/release/3.1.5.md: 10 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -10,9 +10,19 @@
		Modifications de la base de donnée

		```sql
		-- Nouvelles colonnes pour les affectations
		alter table agent_carriere_affectation add t_hierarchique varchar(1) default 'N';
		alter table agent_carriere_affectation add t_fonctionnelle varchar(1) default 'N';
		alter table agent_carriere_affectation add quotite integer;

		-- Nouveau parametre pour le contrôle de l'affichage des dates sur le portail agent
		INSERT INTO unicaen_parametre_parametre(CATEGORIE_ID, CODE, LIBELLE, DESCRIPTION, VALEURS_POSSIBLES, VALEUR, ORDRE)
		WITH d(CODE, LIBELLE, DESCRIPTION, VALEURS_POSSIBLES, VALEUR, ORDRE) AS (
		SELECT 'DATE_PORTAIL_AGENT', 'Affichage des dates sur le portail Agent', null, 'Boolean', 'true', 1100
		)
		SELECT cp.id, d.CODE, d.LIBELLE, d.DESCRIPTION, d.VALEURS_POSSIBLES, d.VALEUR, d.ORDRE
		FROM d
		JOIN unicaen_parametre_categorie cp ON cp.CODE = 'CARRIERE';
		```

		Évolution des bibliothèques

+3 −0

Changes for module/Application/src/Application/Controller/AgentController.php: 3 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@ use Application\Service\AgentStatut\AgentStatutServiceAwareTrait;
		use Application\Service\AgentTutorat\AgentTutoratServiceAwareTrait;
		use Application\Service\FichePoste\FichePosteServiceAwareTrait;
		use Application\Service\ParcoursDeFormation\ParcoursDeFormationServiceAwareTrait;
		use Carriere\Provider\Parametre\CarriereParametres;
		use Carriere\Service\Categorie\CategorieServiceAwareTrait;
		use Doctrine\ORM\ORMException;
		use Element\Entity\Db\ApplicationElement;
		@@ -140,11 +141,13 @@ class AgentController extends AbstractActionController

		$parametreIntranet = $this->getParametreService()->getParametreByCode('ENTRETIEN_PROFESSIONNEL','INTRANET_DOCUMENT');
		$lienIntranet = ($parametreIntranet)?$parametreIntranet->getValeur():"Aucun lien vers l'intranet";
		$canAffichageDate = ($this->getParametreService()->getParametreByCode(CarriereParametres::TYPE,CarriereParametres::DATE_PORTAIL_AGENT)->getValeur() === "true");

		return new ViewModel([
		'title' => 'Afficher l\'agent',
		'agent' => $agent,
		'affectations' => $agentAffectations,
		'canAffichageDate' => $canAffichageDate,
		'statuts' => $agentStatuts,
		'grades' => $agentGrades,
		'echelon' => $agent->getEchelonActif(),

+4 −1

Changes for module/Application/view/application/agent/afficher.phtml: 4 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -38,6 +38,8 @@ use EntretienProfessionnel\Entity\Db\EntretienProfessionnel;
		* @var AgentStageObservation[] $stages
		* @var AgentTutorat[] $tutorats
		* @var AgentAccompagnement[] $accompagnements
		*
		* @var bool $canAffichageDate
		*/

		$displayParcours = false;
		@@ -141,7 +143,8 @@ if ($agent !== null) {
		'affectations' => $affectations,
		'superieures' => $superieures, 'autorites' => $autorites,
		'statuts' => $statuts, 'echelon' => $echelon, 'grades' => $grades, 'quotite' => $quotite,
		'canInfoSource' => $canInfoSource]); ?>
		'canInfoSource' => $canInfoSource,
		'canAffichageDate' => $canAffichageDate]); ?>
		</div>
		<div id="fiches" class="tab-pane " role="tabpanel">
		<?php echo $this->partial('partial/fiche-poste',

+4 −3

Changes for module/Application/view/application/agent/partial/informations-generales.phtml: 4 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@
		* @var Agent[] $autorites
		* @var AgentQuotite $quotite
		* @var bool $canInfoSource
		* @var bool $canAffichageDate
		*/

		use Application\Entity\Db\Agent;
		@@ -145,19 +146,19 @@ use Application\Entity\Db\AgentStatut;
		<div class="col-md-3">
		<h3>Affectation</h3>
		<?php foreach ($affectations as $affectation) : ?>
		<?php echo $this->agentAffectation($affectation, ['structure' => true, 'periode' => false, 'temoin' => true]); ?>
		<?php echo $this->agentAffectation($affectation, ['structure' => true, 'periode' => $canAffichageDate, 'temoin' => true]); ?>
		<?php endforeach; ?>
		</div>
		<div class="col-md-3">
		<h3>Statut</h3>
		<?php foreach ($statuts as $statut) : ?>
		<?php echo $this->agentStatut($statut, ['structure' => true, 'periode' => false, 'temoin' => true]); ?>
		<?php echo $this->agentStatut($statut, ['structure' => true, 'periode' => $canAffichageDate, 'temoin' => true]); ?>
		<?php endforeach; ?>
		</div>
		<div class="col-md-6">
		<h3>Grade</h3>
		<?php foreach ($grades as $grade) : ?>
		<?php echo $this->agentGrade($grade, ['echelon' => $echelon, 'structure' => true, 'periode' => false, 'temoin' => true]); ?>
		<?php echo $this->agentGrade($grade, ['echelon' => $echelon, 'structure' => true, 'periode' => $canAffichageDate, 'temoin' => true]); ?>
		<?php endforeach; ?>
		</div>
		</div>