Début d'indicateur (cb12e29e) · Commits · open-source / emc2

config/application.config.php

+1 −0

Changes for config/application.config.php: 1 added line, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ $modules = [
		'Mailing',
		'Octopus',
		'Utilisateur',
		'Indicateur',
		'Application',
		//'ZendDeveloperTools',
		];

module/Application/config/merged/menu.config.php

+13 −4

Changes for module/Application/config/merged/menu.config.php: 13 added lines, 4 removed lines.
Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@ namespace Application;

		use Application\Provider\Privilege\ActivitePrivileges;
		use Application\Provider\Privilege\AdministrationPrivileges;
		use Application\Provider\Privilege\AgentPrivileges;
		use Application\Provider\Privilege\ApplicationPrivileges;
		use Application\Provider\Privilege\FicheMetierPrivileges;
		use Application\Provider\Privilege\FormationPrivileges;
		@@ -219,6 +220,14 @@ return [
		],
		[
		'order' => 3,
		'label' => 'Affectations de missions',
		'route' => 'agent-mission-specifique',
		'resource' => AgentPrivileges::getResourceId(AgentPrivileges::AFFICHER) ,
		'dropdown-header' => true,
		'icon' => 'fas fa-angle-right'
		],
		[
		'order' => 4,
		'label' => 'Les applications',
		'route' => 'application',
		'privileges' => ApplicationPrivileges::AFFICHER,
		@@ -226,7 +235,7 @@ return [
		'icon' => 'fas fa-angle-right'
		],
		[
		'order' => 4,
		'order' => 5,
		'label' => 'Les formations',
		'route' => 'formation',
		'privileges' => FormationPrivileges::AFFICHER,
		@@ -242,7 +251,7 @@ return [
		// 'icon' => 'fas fa-angle-right'
		// ],
		[
		'order' => 7,
		'order' => 8,
		'label' => 'Les fiches de poste',
		'route' => 'fiche-poste',
		'privileges' => FicheMetierPrivileges::AFFICHER,
		@@ -250,7 +259,7 @@ return [
		'icon' => 'fas fa-angle-right'
		],
		[
		'order' => 6,
		'order' => 7,
		'label' => 'Les fiches métiers',
		'route' => 'fiche-metier-type',
		'privileges' => FicheMetierPrivileges::AFFICHER,
		@@ -258,7 +267,7 @@ return [
		'icon' => 'fas fa-angle-right'
		],
		[
		'order' => 5,
		'order' => 6,
		'label' => 'Les postes',
		'route' => 'poste',
		'privileges' => PostePrivileges::AFFICHER,

module/Application/src/Application/Entity/Db/Agent.php

+1 −30

Changes for module/Application/src/Application/Entity/Db/Agent.php: 1 added line, 30 removed lines.
Original line number	Diff line number	Diff line
		@@ -35,8 +35,6 @@ class Agent {

		/** @var ArrayCollection (AgentStatut)*/
		private $statuts;
		/** @var ArrayCollection (MissionSpecifique) */
		private $missions;
		/** @var ArrayCollection (AgentMissionSpecifique) */
		private $missionsSpecifiques;
		/** @var ArrayCollection (Fichier) */
		@@ -45,7 +43,6 @@ class Agent {
		public function __construct()
		{
		$this->statuts = new ArrayCollection();
		$this->missions = new ArrayCollection();
		$this->missionsSpecifiques = new ArrayCollection();
		$this->fichiers = new ArrayCollection();
		}
		@@ -255,33 +252,6 @@ class Agent {
		return $this;
		}

		/**
		* @return MissionSpecifique[]
		*/
		public function getMissions() {
		return $this->missions->toArray();
		}

		/**
		* @param MissionSpecifique
		* @return Agent
		*/
		public function addMission($mission)
		{
		$this->missions->add($mission);
		return $this;
		}

		/**
		* @param MissionSpecifique
		* @return Agent
		*/
		public function removeMission($mission)
		{
		$this->missions->removeElement($mission);
		return $this;
		}

		/**
		* @return Fichier[]
		*/
		@@ -322,6 +292,7 @@ class Agent {
		return $fichiers;
		}

		/** @return AgentMissionSpecifique[] */
		public function getMissionsSpecifiques() {
		return $this->missionsSpecifiques->toArray();
		}

module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Agent.dcm.xml

+1 −12

Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Agent.dcm.xml: 1 added line, 12 removed lines.
Original line number	Diff line number	Diff line
		@@ -19,18 +19,7 @@
		<join-column name="utilisateur_id" referenced-column-name="id" />
		</one-to-one>

		<many-to-many field="missions" target-entity="Application\Entity\Db\MissionSpecifique" inversed-by="mission" fetch="LAZY">
		<join-table name="agent_mission">
		<join-columns>
		<join-column name="agent_id" referenced-column-name="c_individu"/>
		</join-columns>
		<inverse-join-columns>
		<join-column name="mission_id" referenced-column-name="id"/>
		</inverse-join-columns>
		</join-table>
		</many-to-many>

		<one-to-many target-entity="Application\Entity\Db\AgentMissionSpecifique" mapped-by="agent_id" field="missionsSpecifiques"/>
		<one-to-many target-entity="Application\Entity\Db\AgentMissionSpecifique" mapped-by="agent" field="missionsSpecifiques"/>

		<many-to-many field="fichiers" target-entity="Fichier\Entity\Db\Fichier" inversed-by="fichier" fetch="LAZY">
		<join-table name="agent_fichier">

module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.MissionSpecifique.dcm.xml

+1 −10

Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.MissionSpecifique.dcm.xml: 1 added line, 10 removed lines.
Original line number	Diff line number	Diff line
		@@ -8,16 +8,7 @@

		<field name="libelle" type="string" length="256" column="libelle" nullable="false"/>

		<many-to-many field="agents" target-entity="Application\Entity\Db\Agent" inversed-by="agent" fetch="LAZY">
		<join-table name="agent_mission">
		<join-columns>
		<join-column name="mission_id" referenced-column-name="id"/>
		</join-columns>
		<inverse-join-columns>
		<join-column name="agent_id" referenced-column-name="c_individu"/>
		</inverse-join-columns>
		</join-table>
		</many-to-many>
		<one-to-many target-entity="Application\Entity\Db\AgentMissionSpecifique" mapped-by="mission" field="affectations"/>


		<field name="histoCreation" type="datetime" column="histo_creation" nullable="false"/>