Fixing droit de modification des acquis des agents (f49a0a93) · Commits · open-source / emc2

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

+1 −0

Changes for module/Application/config/merged/agent.config.php: 1 added line, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -94,6 +94,7 @@ return [
		],
		'privileges' => [
		AgentPrivileges::AGENT_EDITER,
		AgentPrivileges::AGENT_ACQUIS_MODIFIER,
		],
		],
		[

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

+11 −1

Changes for module/Application/config/merged/application.config.php: 11 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ use Application\Form\ApplicationGroupe\ApplicationGroupeHydratorFactory;
		use Application\Form\SelectionApplication\SelectionApplicationForm;
		use Application\Form\SelectionApplication\SelectionApplicationFormFactory;
		use Application\Form\SelectionApplication\SelectionApplicationHydrator;
		use Application\Provider\Privilege\AgentPrivileges;
		use Application\Provider\Privilege\ApplicationPrivileges;
		use Application\Service\Application\ApplicationGroupeService;
		use Application\Service\Application\ApplicationGroupeServiceFactory;
		@@ -74,7 +75,6 @@ return [
		'action' => [
		'creer',
		'ajouter-groupe',
		'ajouter-application-element',
		],
		'privileges' => [
		ApplicationPrivileges::APPLICATION_AJOUTER,
		@@ -90,8 +90,18 @@ return [
		ApplicationPrivileges::APPLICATION_EFFACER,
		],
		],
		[
		'controller' => ApplicationController::class,
		'action' => [
		'ajouter-application-element',
		],
		'privileges' => [
		AgentPrivileges::AGENT_ACQUIS_MODIFIER,
		],
		],
		],

		],
		],

		'navigation' => [

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

+10 −1

Changes for module/Application/config/merged/competence.config.php: 10 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ use Application\Form\SelectionMaitriseNiveau\SelectionMaitriseNiveauForm;
		use Application\Form\SelectionMaitriseNiveau\SelectionMaitriseNiveauFormFactory;
		use Application\Form\SelectionMaitriseNiveau\SelectionMaitriseNiveauHydrator;
		use Application\Form\SelectionMaitriseNiveau\SelectionMaitriseNiveauHydratorFactory;
		use Application\Provider\Privilege\AgentPrivileges;
		use Application\Provider\Privilege\CompetencePrivileges;
		use Application\Service\Competence\CompetenceService;
		use Application\Service\Competence\CompetenceServiceFactory;
		@@ -78,7 +79,6 @@ return [
		'ajouter',
		'ajouter-competence-type',
		'ajouter-competence-theme',
		'ajouter-competence-element',
		],
		'privileges' => [
		CompetencePrivileges::COMPETENCE_AJOUTER,
		@@ -152,6 +152,15 @@ return [
		CompetencePrivileges::COMPETENCE_EFFACER,
		],
		],
		[
		'controller' => CompetenceController::class,
		'action' => [
		'ajouter-competence-element',
		],
		'privileges' => [
		AgentPrivileges::AGENT_ACQUIS_MODIFIER,
		],
		],
		],
		],
		],

module/Application/src/Application/View/Helper/partial/application-bloc.phtml

+9 −5

Changes for module/Application/src/Application/View/Helper/partial/application-bloc.phtml: 9 added lines, 5 removed lines.
Original line number	Diff line number	Diff line
		@@ -6,10 +6,12 @@ use Application\Entity\Db\Application;
		use Application\Entity\Db\ApplicationElement;
		use Application\Entity\Db\FicheMetier;
		use Application\Entity\Db\Interfaces\HasCompetenceCollectionInterface;
		use Application\Provider\Privilege\AgentPrivileges;
		use Application\View\Helper\CompetenceBlocViewHelper;
		use Formation\Entity\Db\Formation;

		/**
		* @see \Application\View\Helper\ApplicationBlocViewHelper
		* @var array $applications
		* @var HasCompetenceCollectionInterface\|null $objet
		* @var array $options
		@@ -31,12 +33,14 @@ use Formation\Entity\Db\Formation;
		*/

		//var_dump($options);
		$canAcquisAfficher = $this->isAllowed($objet, AgentPrivileges::AGENT_ACQUIS_AFFICHER);
		$canAcquisModifier = $this->isAllowed($objet, AgentPrivileges::AGENT_ACQUIS_MODIFIER);

		$canAfficher = (CompetenceBlocViewHelper::isActionActivee($options, 'afficher') AND true);
		$canAjouter = (CompetenceBlocViewHelper::isActionActivee($options, 'ajouter') AND true);
		$canModifier = (CompetenceBlocViewHelper::isActionActivee($options, 'modifier') AND true);
		$canSupprimer = (CompetenceBlocViewHelper::isActionActivee($options, 'supprimer') AND true);
		$canValider = (CompetenceBlocViewHelper::isActionActivee($options, 'valider') AND true);
		$canAfficher = (CompetenceBlocViewHelper::isActionActivee($options, 'afficher') AND $canAcquisAfficher);
		$canAjouter = (CompetenceBlocViewHelper::isActionActivee($options, 'ajouter') AND $canAcquisModifier);
		$canModifier = (CompetenceBlocViewHelper::isActionActivee($options, 'modifier') AND $canAcquisModifier);
		$canSupprimer = (CompetenceBlocViewHelper::isActionActivee($options, 'supprimer') AND $canAcquisModifier);
		$canValider = (CompetenceBlocViewHelper::isActionActivee($options, 'valider') AND $canAcquisModifier);

		$displayTitre = CompetenceBlocViewHelper::isDisplayed($options,'titre');
		$displayValidation = CompetenceBlocViewHelper::isDisplayed($options,'validation');

module/Application/src/Application/View/Helper/partial/competence-bloc.phtml

+9 −5

Changes for module/Application/src/Application/View/Helper/partial/competence-bloc.phtml: 9 added lines, 5 removed lines.
Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@ use Application\Entity\Db\CompetenceElement;
		use Application\Entity\Db\CompetenceType;
		use Application\Entity\Db\FicheMetier;
		use Application\Entity\Db\Interfaces\HasCompetenceCollectionInterface;
		use Application\Provider\Privilege\AgentPrivileges;
		use Application\Provider\Privilege\CompetencePrivileges;
		use Application\View\Helper\CompetenceBlocViewHelper;
		use Formation\Entity\Db\Formation;
		@@ -34,11 +35,14 @@ use Formation\Entity\Db\Formation;
		* ]
		*/

		$canAfficher = (CompetenceBlocViewHelper::isActionActivee($options, 'afficher'));
		$canAjouter = (CompetenceBlocViewHelper::isActionActivee($options, 'ajouter'));
		$canModifier = (CompetenceBlocViewHelper::isActionActivee($options, 'modifier'));
		$canSupprimer = (CompetenceBlocViewHelper::isActionActivee($options, 'supprimer'));
		$canValider = (CompetenceBlocViewHelper::isActionActivee($options, 'valider'));
		$canAcquisAfficher = $this->isAllowed($objet, AgentPrivileges::AGENT_ACQUIS_AFFICHER);
		$canAcquisModifier = $this->isAllowed($objet, AgentPrivileges::AGENT_ACQUIS_MODIFIER);

		$canAfficher = (CompetenceBlocViewHelper::isActionActivee($options, 'afficher') AND $canAcquisAfficher);
		$canAjouter = (CompetenceBlocViewHelper::isActionActivee($options, 'ajouter') AND $canAcquisModifier);
		$canModifier = (CompetenceBlocViewHelper::isActionActivee($options, 'modifier') AND $canAcquisModifier);
		$canSupprimer = (CompetenceBlocViewHelper::isActionActivee($options, 'supprimer') AND $canAcquisModifier);
		$canValider = (CompetenceBlocViewHelper::isActionActivee($options, 'valider') AND $canAcquisModifier);

		$displayTitre = CompetenceBlocViewHelper::isDisplayed($options,'titre');
		$displayValidation = CompetenceBlocViewHelper::isDisplayed($options,'validation');