Nettoyage partie agent statut (2f19cecd) · Commits · open-source / emc2

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

+39 −347

Changes for module/Application/src/Application/Entity/Db/AgentStatut.php: 39 added lines, 347 removed lines.
Original line number	Diff line number	Diff line
		@@ -16,114 +16,32 @@ class AgentStatut implements HasPeriodeInterface {
		use HasPeriodeTrait;
		use DbImportableAwareTrait;


		/** @var string */
		private $id;
		/** @var string */
		private $sourceName;
		/** @var string */
		private $sourceId;
		/** @var string */
		private $idOrigine;
		/** @var Agent */
		private $agent;
		/** @var Structure */
		private $structure;

		private string $titulaire = 'N';
		/** @var boolean */
		private $cdi;
		/** @var boolean */
		private $cdd;
		/** @var boolean */
		private $vacataire;
		/** @var boolean */
		private $enseignant;
		/** @var boolean */
		private $administratif;
		/** @var boolean */
		private $chercheur;
		/** @var boolean */
		private $etudiant;
		/** @var boolean */
		private $auditeurLibre;
		/** @var boolean */
		private $doctorant;
		/** @var boolean */
		private $detacheIn;
		/** @var boolean */
		private $detacheOut;
		/** @var boolean */
		private $dispo;
		/** @var boolean */
		private $heberge;
		/** @var boolean */
		private $emerite;
		/** @var boolean */
		private $retraite;

		/**
		* @return string
		*/
		public function getId()
		private ?string $id = null;
		private ?Agent $agent = null;
		private ?Structure $structure = null;

		private ?string $titulaire = 'N';
		private ?string $cdi = 'N';
		private ?string $cdd = 'N';
		private ?string $vacataire = 'N';
		private ?string $enseignant = 'N';
		private ?string $administratif = 'N';
		private ?string $chercheur = 'N';
		private ?string $etudiant = 'N';
		private ?string $auditeurLibre = 'N';
		private ?string $doctorant = 'N';
		private ?string $detacheIn = 'N';
		private ?string $detacheOut = 'N';
		private ?string $dispo = 'N';
		private ?string $heberge = 'N';
		private ?string $emerite = 'N';
		private ?string $retraite = 'N';

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

		/**
		* @return string
		*/
		public function getSourceName()
		{
		return $this->sourceName;
		}

		/**
		* @param string $sourceName
		* @return AgentStatut
		*/
		public function setSourceName($sourceName)
		{
		$this->sourceName = $sourceName;
		return $this;
		}

		/**
		* @return string
		*/
		public function getSourceId()
		{
		return $this->sourceId;
		}

		/**
		* @param string $sourceId
		* @return AgentStatut
		*/
		public function setSourceId($sourceId)
		{
		$this->sourceId = $sourceId;
		return $this;
		}

		/**
		* @return string
		*/
		public function getIdOrigine()
		{
		return $this->idOrigine;
		}

		/**
		* @param string $idOrigine
		* @return AgentStatut
		*/
		public function setIdOrigine($idOrigine)
		{
		$this->idOrigine = $idOrigine;
		return $this;
		}

		/**
		* @return Agent\|null
		*/
		@@ -132,34 +50,14 @@ class AgentStatut implements HasPeriodeInterface {
		return $this->agent;
		}

		/**
		* @param Agent\|null $agent
		* @return AgentStatut
		*/
		public function setAgent(?Agent $agent)
		{
		$this->agent = $agent;
		return $this;
		}

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

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

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

		const TEMOINS = [
		@@ -187,293 +85,87 @@ class AgentStatut implements HasPeriodeInterface {
		}
		}

		/**
		* @return bool
		*/
		public function isTitulaire() : bool
		{
		return $this->titulaire === 'O';
		}

		/**
		* @param bool $titulaire
		* @return AgentStatut
		*/
		public function setTitulaire($titulaire)
		{
		$this->titulaire = $titulaire;
		return $this;
		}

		/**
		* @return bool
		*/
		public function isCdi()
		public function isCdi() : bool
		{
		return $this->cdi === 'O';
		}

		/**
		* @param bool $cdi
		* @return AgentStatut
		*/
		public function setCdi($cdi)
		{
		$this->cdi = $cdi;
		return $this;
		}

		/**
		* @return bool
		*/
		public function isCdd()
		public function isCdd() : bool
		{
		return $this->cdd === 'O';
		}

		/**
		* @param bool $cdd
		* @return AgentStatut
		*/
		public function setCdd($cdd)
		{
		$this->cdd = $cdd;
		return $this;
		}

		/**
		* @return bool
		*/
		public function isVacataire()
		public function isVacataire() : bool
		{
		return $this->vacataire === 'O';
		}

		/**
		* @param bool $vacataire
		* @return AgentStatut
		*/
		public function setVacataire($vacataire)
		{
		$this->vacataire = $vacataire;
		return $this;
		}

		/**
		* @return bool
		*/
		public function isEnseignant()
		public function isEnseignant() : bool
		{
		return $this->enseignant === 'O';
		}

		/**
		* @param bool $enseignant
		* @return AgentStatut
		*/
		public function setEnseignant($enseignant)
		{
		$this->enseignant = $enseignant;
		return $this;
		}

		/**
		* @return bool
		*/
		public function isAdministratif()
		public function isAdministratif() : bool
		{
		return $this->administratif === 'O';
		}

		/**
		* @param bool $administratif
		* @return AgentStatut
		*/
		public function setAdministratif($administratif)
		{
		$this->administratif = $administratif;
		return $this;
		}

		/**
		* @return bool
		*/
		public function isChercheur()
		public function isChercheur() : bool
		{
		return $this->chercheur === 'O';
		}

		/**
		* @param bool $chercheur
		* @return AgentStatut
		*/
		public function setChercheur($chercheur)
		{
		$this->chercheur = $chercheur;
		return $this;
		}

		/**
		* @return bool
		*/
		public function isEtudiant()
		public function isEtudiant() : bool
		{
		return $this->etudiant === 'O';
		}

		/**
		* @param bool $etudiant
		* @return AgentStatut
		*/
		public function setEtudiant($etudiant)
		{
		$this->etudiant = $etudiant;
		return $this;
		}

		/**
		* @return bool
		*/
		public function isAuditeurLibre()
		public function isAuditeurLibre() : bool
		{
		return $this->auditeurLibre === 'O';
		}

		/**
		* @param bool $auditeurLibre
		* @return AgentStatut
		*/
		public function setAuditeurLibre($auditeurLibre)
		{
		$this->auditeurLibre = $auditeurLibre;
		return $this;
		}

		/**
		* @return bool
		*/
		public function isDoctorant()
		public function isDoctorant() : bool
		{
		return $this->doctorant === 'O';
		}

		/**
		* @param bool $doctorant
		* @return AgentStatut
		*/
		public function setDoctorant($doctorant)
		{
		$this->doctorant = $doctorant;
		return $this;
		}

		/**
		* @return bool
		*/
		public function isDetacheIn()
		public function isDetacheIn() : bool
		{
		return $this->detacheIn === 'O';
		}

		/**
		* @param bool $detacheIn
		* @return AgentStatut
		*/
		public function setDetacheIn($detacheIn)
		{
		$this->detacheIn = $detacheIn;
		return $this;
		}

		/**
		* @return bool
		*/
		public function isDetacheOut()
		public function isDetacheOut() : bool
		{
		return $this->detacheOut === 'O';
		}

		/**
		* @param bool $detacheOut
		* @return AgentStatut
		*/
		public function setDetacheOut($detacheOut)
		{
		$this->detacheOut = $detacheOut;
		return $this;
		}

		/**
		* @return boolean
		*/
		public function isDispo()
		public function isDispo() : bool
		{
		return $this->dispo === 'O';
		}

		/**
		* @param boolean $dispo
		* @return AgentStatut
		*/
		public function setDispo($dispo)
		{
		$this->dispo = $dispo;
		return $this;
		}

		/**
		* @return bool
		*/
		public function isHeberge()
		public function isHeberge() : bool
		{
		return $this->heberge === 'O';
		}

		/**
		* @param bool $heberge
		* @return AgentStatut
		*/
		public function setHeberge($heberge)
		{
		$this->heberge = $heberge;
		return $this;
		}

		/**
		* @return bool
		*/
		public function isEmerite()
		public function isEmerite() : bool
		{
		return $this->emerite === 'O';
		}

		/**
		* @param bool $emerite
		* @return AgentStatut
		*/
		public function setEmerite($emerite)
		{
		$this->emerite = $emerite;
		return $this;
		}

		/**
		* @return bool
		*/
		public function isRetraite()
		public function isRetraite() : bool
		{
		return $this->retraite === 'O';
		}

		/**
		* @param bool $retraite
		* @return AgentStatut
		*/
		public function setRetraite($retraite)
		{
		$this->retraite = $retraite;
		return $this;
		}
		/ Fonction pour affichage/macro *******************************************************************************/

		/**
		* @param AgentStatut[] $agentStatuts

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

+1 −0

Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.AgentStatut.dcm.xml: 1 added line, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -33,5 +33,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>

module/Application/src/Application/Entity/Db/Traits/DbImportableAwareTrait.php

+13 −7

Changes for module/Application/src/Application/Entity/Db/Traits/DbImportableAwareTrait.php: 13 added lines, 7 removed lines.
Original line number	Diff line number	Diff line
		@@ -6,14 +6,15 @@ use DateTime;

		trait DbImportableAwareTrait {

		/** @var DateTime */
		private $created_on;
		/** @var DateTime */
		private $updated_on;
		/** @var DateTime */
		private $deleted_on;
		private ?DateTime $created_on;
		private ?DateTime $updated_on;
		private ?DateTime $deleted_on;
		private ?string $sourceId = null;

		public function getDeleted() { return $this->deleted_on; }
		public function getDeleted() : DateTime
		{
		return $this->deleted_on;
		}

		public function isDeleted(DateTime $date = null) : bool
		{
		@@ -44,4 +45,9 @@ trait DbImportableAwareTrait {
		$this->deleted_on = null;
		}

		public function getSourceId() : ?string
		{
		return $this->sourceId;
		}

		}
		No newline at end of file

module/Application/src/Application/View/Helper/partial/agent-status.phtml

+1 −2

Changes for module/Application/src/Application/View/Helper/partial/agent-status.phtml: 1 added line, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@ $displayTemoin = (isset($options['temoin']) and $options['temoin'] !== false);
		<?php if ($displayIdentifiant) : ?>
		<strong> Identifiant </strong> <br/>
		<span class="badge">
		<?php echo $statut->getIdOrigine(); ?>
		<?php echo $statut->getId(); ?>
		</span>
		<?php endif; ?>

		@@ -96,6 +96,5 @@ $displayTemoin = (isset($options['temoin']) and $options['temoin'] !== false);
		border: solid lightblue 1px;
		margin: 1rem;
		padding: 1rem;
		/border-radius: 5px;/
		}
		</style>
		No newline at end of file