modernisation AgentCarriere ... (0d6b1aa4) · Commits · open-source / emc2

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

+0 −6

Changes for module/Application/src/Application/Entity/Db/AgentAffectation.php: 0 added lines, 6 removed lines.
Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ class AgentAffectation implements HasPeriodeInterface {
		private ?int $id = null;
		private ?Agent $agent = null;
		private ?Structure $structure = null;
		private ?string $idOrig = null;
		private ?string $principale = null;
		private ?string $hierarchique = null;
		private ?string $fonctionnelle = null;
		@@ -40,11 +39,6 @@ class AgentAffectation implements HasPeriodeInterface {
		return $this->structure;
		}

		public function getIdOrig() : ?string
		{
		return $this->idOrig;
		}

		/ Gestion des témoins *************************************************************************************/

		const TEMOINS = [

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

+8 −83

Changes for module/Application/src/Application/Entity/Db/AgentGrade.php: 8 added lines, 83 removed lines.
Original line number	Diff line number	Diff line
		@@ -18,115 +18,40 @@ class AgentGrade implements HasPeriodeInterface {
		use DbImportableAwareTrait;
		use HasPeriodeTrait;

		/** @var string */
		private $id;
		/** @var Agent */
		private $agent;
		/** @var Structure */
		private $structure;
		/** @var Corps */
		private $corps;
		/** @var Grade */
		private $grade;
		/** @var Correspondance */
		private $bap;
		private ?string $id = null;
		private ?Agent $agent = null;
		private ?Structure $structure = null;
		private ?Corps $corps = null;
		private ?Grade $grade = null;
		private ?Correspondance $correspondance = null;

		/**
		* @return string
		*/
		public function getId() : string
		{
		return $this->id;
		}

		/**
		* @return Agent
		*/
		public function getAgent() : Agent
		{
		return $this->agent;
		}

		/**
		* @param Agent $agent
		* @return AgentGrade
		*/
		public function setAgent(Agent $agent) : AgentGrade
		{
		$this->agent = $agent;
		return $this;
		}

		/**
		* @return Structure\|null
		*/
		public function getStructure() : ?Structure
		{
		return $this->structure;
		}

		/**
		* @param Structure $structure
		* @return AgentGrade
		*/
		public function setStructure(Structure $structure) : AgentGrade
		{
		$this->structure = $structure;
		return $this;
		}

		/**
		* @return Corps\|null
		*/
		public function getCorps() : ?Corps
		{
		return $this->corps;
		}

		/**
		* @param Corps $corps
		* @return AgentGrade
		*/
		public function setCorps(Corps $corps) : AgentGrade
		{
		$this->corps = $corps;
		return $this;
		}

		/**
		* @return Grade\|null
		*/
		public function getGrade() : ?Grade
		{
		return $this->grade;
		}

		/**
		* @param Grade $grade
		* @return AgentGrade
		*/
		public function setGrade(Grade $grade) : AgentGrade
		public function getCorrespondance() : ?Correspondance
		{
		$this->grade = $grade;
		return $this;
		return $this->correspondance;
		}

		/**
		* @return Correspondance\|null
		*/
		public function getBap() : ?Correspondance
		{
		return $this->bap;
		}

		/**
		* @param Correspondance $bap
		* @return AgentGrade
		*/
		public function setBap(Correspondance $bap) : AgentGrade
		{
		$this->bap = $bap;
		return $this;
		}

		}
		No newline at end of file

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

+3 −29

Changes for module/Application/src/Application/Entity/Db/AgentQuotite.php: 3 added lines, 29 removed lines.
Original line number	Diff line number	Diff line
		@@ -11,55 +11,29 @@ class AgentQuotite implements HasPeriodeInterface
		use HasPeriodeTrait;
		use DbImportableAwareTrait;

		/** @var int */
		private $id;
		/** @var Agent */
		private $agent;
		/** @var integer */
		private $quotite;
		private ?int $id = null;
		private ?Agent $agent = null;
		private ?int $quotite = null;

		/**
		* @return int
		*/
		public function getId(): int
		{
		return $this->id;
		}

		/**
		* @return Agent
		*/
		public function getAgent(): Agent
		{
		return $this->agent;
		}

		/**
		* @param Agent $agent
		* @return AgentQuotite
		*/
		public function setAgent(Agent $agent): AgentQuotite
		{
		$this->agent = $agent;
		return $this;
		}

		/**
		* @return int\|null
		*/
		public function getQuotite(): ?int
		{
		return $this->quotite;
		}

		/**
		* @param int $quotite
		* @return AgentQuotite
		*/
		public function setQuotite(int $quotite): AgentQuotite
		{
		$this->quotite = $quotite;
		return $this;
		}

		}
		No newline at end of file

module/Application/src/Application/Entity/Db/MacroContent/AgentMacroTrait.php

+1 −1

Changes for module/Application/src/Application/Entity/Db/MacroContent/AgentMacroTrait.php: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -126,7 +126,7 @@ trait AgentMacroTrait
		foreach ($grades as $grade) {
		// $texte .= "<li>";
		$grade_libelle = $grade->getCorps()->getLibelleLong();
		$correspondance = $grade->getBap();
		$correspondance = $grade->getCorrespondance();
		if ($correspondance) {
		$grade_bap = $correspondance->getType()->getLibelleCourt(). " " .$correspondance->getLibelleCourt();
		} else {

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

+1 −1

Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.AgentAffectation.dcm.xml: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -14,7 +14,6 @@
		</many-to-one>
		<field name="dateDebut" column="date_debut" type="datetime"/>
		<field name="dateFin" column="date_fin" type="datetime"/>
		<field name="idOrig" column="id_orig" type="string" length="255"/>
		<field name="principale" column="t_principale" type="string" length="1"/>
		<field name="hierarchique" column="t_hierarchique" type="string" length="1"/>
		<field name="fonctionnelle" column="t_fonctionnelle" type="string" length="1"/>
		@@ -24,5 +23,6 @@
		<field name="created_on" column="created_on" type="datetime"/>
		<field name="updated_on" column="updated_on" type="datetime"/>
		<field name="deleted_on" column="deleted_on" type="datetime"/>
		<field name="sourceId" column="source_id" type="string" length="128"/>
		</entity>
		</doctrine-mapping>