Déplacement de la partie EPro dans un module a part (WIP) (6fd7969c) · Commits · open-source / emc2

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ use Application\Entity\Db\Traits\HasCompetenceCollectionTrait;
		use Application\Service\Agent\AgentServiceAwareTrait;
		use DateTime;
		use Doctrine\Common\Collections\ArrayCollection;
		use EntretienProfessionnel\Entity\Db\EntretienProfessionnel;
		use Fichier\Entity\Db\Fichier;
		use Formation\Entity\Db\Interfaces\HasFormationCollectionInterface;
		use Formation\Entity\Db\Traits\HasFormationCollectionTrait;

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

deleted100644 → 0

+0 −376

Original line number	Diff line number	Diff line
		<?php

		namespace Application\Entity\Db;

		use Application\Entity\HasAgentInterface;
		use Autoform\Entity\Db\FormulaireInstance;
		use DateTime;
		use Doctrine\Common\Collections\ArrayCollection;
		use EntretienProfessionnel\Entity\Db\Campagne;
		use EntretienProfessionnel\Entity\Db\Observation;
		use UnicaenApp\Exception\RuntimeException;
		use UnicaenUtilisateur\Entity\Db\User;
		use UnicaenUtilisateur\Entity\HistoriqueAwareInterface;
		use UnicaenUtilisateur\Entity\HistoriqueAwareTrait;
		use UnicaenValidation\Entity\Db\ValidationInstance;
		use Zend\Permissions\Acl\Resource\ResourceInterface;

		class EntretienProfessionnel implements HistoriqueAwareInterface, ResourceInterface, HasAgentInterface {
		use HistoriqueAwareTrait;

		public function getResourceId()
		{
		return 'EntretienProfessionnel';
		}

		/** @var integer */
		private $id;
		/** @var Agent */
		private $agent;
		/** @var User */
		private $responsable;
		/** @var Campagne */
		private $campagne;
		/** @var DateTime */
		private $dateEntretien;
		/** @var string */
		private $lieu;
		/** @var FormulaireInstance */
		private $formulaireInstance;
		/** @var FormulaireInstance */
		private $formationInstance;

		/** @var ArrayCollection (Observation) */
		private $observations;

		/** @var ValidationInstance */
		private $validationAgent;
		/** @var ValidationInstance */
		private $validationResponsable;
		/** @var ValidationInstance */
		private $validationDRH;
		/** @var string */
		private $token;
		/** @var DateTime */
		private $acceptation;

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

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

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

		/**
		* @return User
		*/
		public function getResponsable()
		{
		return $this->responsable;
		}

		/**
		* @param User\|null $responsable
		* @return EntretienProfessionnel
		*/
		public function setResponsable(?User $responsable)
		{
		$this->responsable = $responsable;
		return $this;
		}

		/**
		* @return string
		*/
		public function getAnnee()
		{
		if ($this->campagne === null) return "Aucune campagne";
		return $this->campagne->getAnnee();
		}

		/**
		* @return Campagne
		*/
		public function getCampagne() : ?Campagne
		{
		return $this->campagne;
		}

		/**
		* @param Campagne\|null $campagne
		* @return EntretienProfessionnel
		*/
		public function setCampagne(?Campagne $campagne) : EntretienProfessionnel
		{
		$this->campagne = $campagne;
		return $this;
		}

		/**
		* @return DateTime
		*/
		public function getDateEntretien()
		{
		return $this->dateEntretien;
		}

		/**
		* @param DateTime\|null $dateEntretien
		* @return EntretienProfessionnel
		*/
		public function setDateEntretien(?DateTime $dateEntretien)
		{
		$this->dateEntretien = $dateEntretien;
		return $this;
		}

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

		/**
		* @param string\|null $lieu
		* @return EntretienProfessionnel
		*/
		public function setLieu(?string $lieu)
		{
		$this->lieu = $lieu;
		return $this;
		}

		/**
		* @return FormulaireInstance
		*/
		public function getFormulaireInstance()
		{
		return $this->formulaireInstance;
		}

		/**
		* @param FormulaireInstance\|null $formulaireInstance
		* @return EntretienProfessionnel
		*/
		public function setFormulaireInstance(?FormulaireInstance $formulaireInstance)
		{
		$this->formulaireInstance = $formulaireInstance;
		return $this;
		}

		/**
		* @return FormulaireInstance
		*/
		public function getFormationInstance()
		{
		return $this->formationInstance;
		}

		/**
		* @param FormulaireInstance\|null $formationInstance
		* @return EntretienProfessionnel
		*/
		public function setFormationInstance(?FormulaireInstance $formationInstance)
		{
		$this->formationInstance = $formationInstance;
		return $this;
		}

		/ OBSERVATIONS ************************************************************************************************/

		/**
		* @return Observation[]
		*/
		public function getObservations() : array
		{
		return $this->observations->toArray();
		}

		/**
		* @param Observation\|null $observation
		* @return boolean
		*/
		public function hasObservation(?Observation $observation) : bool
		{
		return $this->observations->contains($observation);
		}

		/**
		* @param Observation\|null $observation
		* @return EntretienProfessionnel
		*/
		public function addObservation(?Observation $observation) : EntretienProfessionnel
		{
		if ($this->hasObservation($observation)) $this->observations->add($observation);
		return $this;
		}

		/**
		* @param Observation\|null $observation
		* @return EntretienProfessionnel
		*/
		public function removeObservation(?Observation $observation) : EntretienProfessionnel
		{
		$this->observations->removeElement($observation);
		return $this;
		}

		/**
		* @param Observation[] $observations
		* @return EntretienProfessionnel
		*/
		public function setObservations(array $observations) : EntretienProfessionnel
		{
		$this->observations->clear();
		foreach ($observations as $observation) $this->addObservation($observation);
		return $this;
		}

		/**
		* @return Observation\|null
		*/
		public function getObservationActive() : ?Observation
		{
		$observation = null;
		/** @var Observation $obs */
		foreach ($this->observations as $obs) {
		if ($obs->estNonHistorise()) {
		if ($observation !== null) throw new RuntimeException("Plusieurs observations actives pour l'entretien #".$this->id, 0, null);
		$observation = $obs;
		}
		}
		return $observation;
		}

		/ VALIDATION **************************************************************************************************/

		/**
		* @return ValidationInstance
		*/
		public function getValidationAgent()
		{
		return $this->validationAgent;
		}

		/**
		* @param ValidationInstance $validationAgent
		* @return EntretienProfessionnel
		*/
		public function setValidationAgent(ValidationInstance $validationAgent)
		{
		$this->validationAgent = $validationAgent;
		return $this;
		}

		/**
		* @return bool
		*/
		public function hasValidationAgent() {
		return ($this->validationAgent AND $this->validationAgent->estNonHistorise());
		}

		/**
		* @return ValidationInstance
		*/
		public function getValidationResponsable()
		{
		return $this->validationResponsable;
		}

		/**
		* @param ValidationInstance $validationResponsable
		* @return EntretienProfessionnel
		*/
		public function setValidationResponsable(ValidationInstance $validationResponsable)
		{
		$this->validationResponsable = $validationResponsable;
		return $this;
		}

		/**
		* @return bool
		*/
		public function hasValidationResponsable() {
		return ($this->validationResponsable AND $this->validationResponsable->estNonHistorise());
		}

		/**
		* @return ValidationInstance
		*/
		public function getValidationDRH()
		{
		return $this->validationDRH;
		}

		/**
		* @param ValidationInstance $validationDRH
		*/
		public function setValidationDRH(ValidationInstance $validationDRH)
		{
		$this->validationDRH = $validationDRH;
		}

		/**
		* @return bool
		*/
		public function hasValidationDRH() {
		return ($this->validationDRH AND $this->validationDRH->estNonHistorise());
		}

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

		/**
		* @param string\|null $token
		* @return EntretienProfessionnel
		*/
		public function setToken(?string $token)
		{
		$this->token = $token;
		return $this;
		}

		/**
		* @return DateTime
		*/
		public function getAcceptation()
		{
		return $this->acceptation;
		}

		/**
		* @param DateTime\|null $acceptation
		* @return EntretienProfessionnel
		*/
		public function setAcceptation(?DateTime $acceptation)
		{
		$this->acceptation = $acceptation;
		return $this;
		}
		}
		No newline at end of file

module/Application/view/application/agent/afficher.phtml

+1 −1

Original line number	Diff line number	Diff line
		<?php

		use Application\Entity\Db\Agent;
		use Application\Entity\Db\EntretienProfessionnel;
		use Application\Provider\Privilege\AgentPrivileges;
		use EntretienProfessionnel\Entity\Db\EntretienProfessionnel;
		use UnicaenUtilisateur\Entity\Db\User;

		/**

module/Application/view/application/agent/partial/entretien-professionnel.phtml

+2 −2

Original line number	Diff line number	Diff line
		@@ -7,8 +7,8 @@
		*/

		use Application\Entity\Db\Agent;
		use Application\Entity\Db\EntretienProfessionnel;
		use Application\Provider\Privilege\EntretienproPrivileges;
		use EntretienProfessionnel\Entity\Db\EntretienProfessionnel;
		use EntretienProfessionnel\Provider\Privilege\EntretienproPrivileges;


		$canVoirEntretienPro = $droits['voir'];

module/EntretienProfessionnel/src/EntretienProfessionnel/Assertion/EntretienProfessionnelAssertion.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,8 +3,8 @@
		namespace EntretienProfessionnel\Assertion;

		use Application\Constant\RoleConstant;
		use Application\Entity\Db\EntretienProfessionnel;
		use Application\Service\Structure\StructureServiceAwareTrait;
		use EntretienProfessionnel\Entity\Db\EntretienProfessionnel;
		use EntretienProfessionnel\Provider\Privilege\EntretienproPrivileges;
		use UnicaenAuthentification\Assertion\AbstractAssertion;
		use UnicaenUtilisateur\Service\User\UserServiceAwareTrait;