cleaning (6f14fe69) · Commits · open-source / emc2

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

+33 −56

Changes for module/Application/src/Application/Entity/Db/Structure.php: 33 added lines, 56 removed lines.
Original line number	Diff line number	Diff line
		@@ -47,8 +47,6 @@ class Structure implements ResourceInterface, SynchroAwareInterface, HasDescript
		/** @var ArrayCollection (Structure) */
		private $enfants;

		/** @var string */
		private $description;
		/** @var ArrayCollection */
		private $gestionnaires;
		/** @var ArrayCollection */
		@@ -76,7 +74,7 @@ class Structure implements ResourceInterface, SynchroAwareInterface, HasDescript
		/**
		* @return string
		*/
		public function getId()
		public function getId() : string
		{
		return $this->id;
		}
		@@ -84,7 +82,7 @@ class Structure implements ResourceInterface, SynchroAwareInterface, HasDescript
		/**
		* @return string
		*/
		public function getCode()
		public function getCode() : string
		{
		return $this->code;
		}
		@@ -92,7 +90,7 @@ class Structure implements ResourceInterface, SynchroAwareInterface, HasDescript
		/**
		* @return string
		*/
		public function getLibelleCourt()
		public function getLibelleCourt() : string
		{
		return $this->libelleCourt;
		}
		@@ -100,7 +98,7 @@ class Structure implements ResourceInterface, SynchroAwareInterface, HasDescript
		/**
		* @return string
		*/
		public function getLibelleLong()
		public function getLibelleLong() : string
		{
		return $this->libelleLong;
		}
		@@ -108,23 +106,23 @@ class Structure implements ResourceInterface, SynchroAwareInterface, HasDescript
		/**
		* @return StructureType
		*/
		public function getType()
		public function getType() : StructureType
		{
		return $this->type;
		}

		/**
		* @return DateTime
		* @return DateTime\|null
		*/
		public function getOuverture()
		public function getOuverture() : ?DateTime
		{
		return $this->ouverture;
		}

		/**
		* @return DateTime
		* @return DateTime\|null
		*/
		public function getFermeture()
		public function getFermeture() : ?DateTime
		{
		return $this->fermeture;
		}
		@@ -146,7 +144,7 @@ class Structure implements ResourceInterface, SynchroAwareInterface, HasDescript
		/**
		* @return User[]
		*/
		public function getGestionnaires()
		public function getGestionnaires() : array
		{
		if ($this->gestionnaires === null) return [];
		return $this->gestionnaires->toArray();
		@@ -156,7 +154,7 @@ class Structure implements ResourceInterface, SynchroAwareInterface, HasDescript
		* @param User $user
		* @return Structure
		*/
		public function addGestionnaire(User $user)
		public function addGestionnaire(User $user) : Structure
		{
		$this->gestionnaires->add($user);
		return $this;
		@@ -166,7 +164,7 @@ class Structure implements ResourceInterface, SynchroAwareInterface, HasDescript
		* @param User $user
		* @return Structure
		*/
		public function removeGestionnaire(User $user)
		public function removeGestionnaire(User $user) : Structure
		{
		$this->gestionnaires->removeElement($user);
		return $this;
		@@ -175,7 +173,7 @@ class Structure implements ResourceInterface, SynchroAwareInterface, HasDescript
		/**
		* @return User[]
		*/
		public function getResponsables()
		public function getResponsables() : array
		{
		if ($this->responsables === null) return [];
		return $this->responsables->toArray();
		@@ -185,7 +183,7 @@ class Structure implements ResourceInterface, SynchroAwareInterface, HasDescript
		* @param User $user
		* @return Structure
		*/
		public function addResponsable(User $user)
		public function addResponsable(User $user) : Structure
		{
		$this->responsables->add($user);
		return $this;
		@@ -195,7 +193,7 @@ class Structure implements ResourceInterface, SynchroAwareInterface, HasDescript
		* @param User $user
		* @return Structure
		*/
		public function removeResponsable(User $user)
		public function removeResponsable(User $user) : Structure
		{
		$this->responsables->removeElement($user);
		return $this;
		@@ -206,7 +204,7 @@ class Structure implements ResourceInterface, SynchroAwareInterface, HasDescript
		/**
		* @return Poste[]
		*/
		public function getPostes()
		public function getPostes() : array
		{
		return $this->postes->toArray();
		}
		@@ -215,7 +213,7 @@ class Structure implements ResourceInterface, SynchroAwareInterface, HasDescript
		* @param Poste $poste
		* @return Structure
		*/
		public function addPoste($poste)
		public function addPoste(Poste $poste) : Structure
		{
		$this->postes->add($poste);
		return $this;
		@@ -225,7 +223,7 @@ class Structure implements ResourceInterface, SynchroAwareInterface, HasDescript
		* @param Poste $poste
		* @return Structure
		*/
		public function removePoste($poste)
		public function removePoste(Poste $poste) : Structure
		{
		$this->postes->removeElement($poste);
		return $this;
		@@ -235,14 +233,14 @@ class Structure implements ResourceInterface, SynchroAwareInterface, HasDescript
		* @param Poste $poste
		* @return boolean
		*/
		public function hasPoste($poste)
		public function hasPoste(Poste $poste) : bool
		{
		return $this->postes->contains($poste);
		}
		/**
		* @return AgentMissionSpecifique[]
		*/
		public function getMissions()
		public function getMissions() : array
		{
		return $this->missions->toArray();
		}
		@@ -251,7 +249,7 @@ class Structure implements ResourceInterface, SynchroAwareInterface, HasDescript
		* @param AgentMissionSpecifique $mission
		* @return Structure
		*/
		public function addMission($mission)
		public function addMission(AgentMissionSpecifique $mission) : Structure
		{
		$this->missions->add($mission);
		return $this;
		@@ -261,7 +259,7 @@ class Structure implements ResourceInterface, SynchroAwareInterface, HasDescript
		* @param AgentMissionSpecifique $mission
		* @return Structure
		*/
		public function removeMission($mission)
		public function removeMission(AgentMissionSpecifique $mission) : Structure
		{
		$this->postes->removeElement($mission);
		return $this;
		@@ -271,51 +269,31 @@ class Structure implements ResourceInterface, SynchroAwareInterface, HasDescript
		* @param AgentMissionSpecifique $mission
		* @return boolean
		*/
		public function hasMission($mission)
		public function hasMission(AgentMissionSpecifique $mission) : bool
		{
		return $this->missions->contains($mission);
		}

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

		/**
		* @param Structure $parent
		* @return Structure
		*/
		public function setParent($parent)
		{
		$this->parent = $parent;
		return $this;
		}

		/**
		* @return ArrayCollection
		* @return Structure[]
		*/
		public function getEnfants()
		public function getEnfants() : array
		{
		return $this->enfants;
		}

		/**
		* @param ArrayCollection $enfants
		* @return Structure
		*/
		public function setEnfants($enfants)
		{
		$this->enfants = $enfants;
		return $this;
		return $this->enfants->toArray();
		}

		/**
		* @return bool
		*/
		public function getRepriseResumeMere()
		public function getRepriseResumeMere() : bool
		{
		return $this->repriseResumeMere;
		}
		@@ -324,7 +302,7 @@ class Structure implements ResourceInterface, SynchroAwareInterface, HasDescript
		* @param bool $repriseResumeMere
		* @return Structure
		*/
		public function setRepriseResumeMere($repriseResumeMere)
		public function setRepriseResumeMere(bool $repriseResumeMere) : Structure
		{
		$this->repriseResumeMere = $repriseResumeMere;
		return $this;
		@@ -351,7 +329,7 @@ class Structure implements ResourceInterface, SynchroAwareInterface, HasDescript
		/**
		* @return FichePoste[]
		*/
		public function getFichesPostesRecrutements()
		public function getFichesPostesRecrutements() : array
		{
		return $this->fichesPostesRecrutements->toArray();
		}
		@@ -380,10 +358,9 @@ class Structure implements ResourceInterface, SynchroAwareInterface, HasDescript
		/**
		* @return string
		*/
		public function __toString()
		public function __toString() : string
		{
		$text = "";
		$text .= "[".$this->getType()."] ";
		$text = "[".$this->getType()."] ";
		$text .= $this->getLibelleCourt();
		return $text;
		}

module/Fichier/src/Fichier/Entity/Db/Nature.php

+6 −23

Changes for module/Fichier/src/Fichier/Entity/Db/Nature.php: 6 added lines, 23 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,7 +2,12 @@

		namespace Fichier\Entity\Db;

		class Nature {
		use Application\Entity\Db\Interfaces\HasDescriptionInterface;
		use Application\Entity\Db\Traits\HasDescriptionTrait;

		class Nature implements HasDescriptionInterface {
		use HasDescriptionTrait;

		const CV = 'CV';
		const MOTIV = 'MOTIV';
		const FORMATION = 'FORMATION';
		@@ -14,8 +19,6 @@ class Nature {
		private $code;
		/** @var string */
		private $libelle;
		/** @var string */
		private $description;

		/**
		* @return int
		@@ -60,24 +63,4 @@ class Nature {
		$this->libelle = $libelle;
		return $this;
		}

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

		/**
		* @param string $description
		* @return Nature
		*/
		public function setDescription($description)
		{
		$this->description = $description;
		return $this;
		}


		}
		No newline at end of file

module/Formation/src/Formation/Entity/Db/Formation.php

+6 −21

Changes for module/Formation/src/Formation/Entity/Db/Formation.php: 6 added lines, 21 removed lines.
Original line number	Diff line number	Diff line
		@@ -5,7 +5,9 @@ namespace Formation\Entity\Db;
		use Application\Entity\Db\Activite;
		use Application\Entity\Db\Interfaces\HasApplicationCollectionInterface;
		use Application\Entity\Db\Interfaces\HasCompetenceCollectionInterface;
		use Application\Entity\Db\Interfaces\HasDescriptionInterface;
		use Application\Entity\Db\Interfaces\HasSourceInterface;
		use Application\Entity\Db\Traits\HasDescriptionTrait;
		use Application\Entity\Db\Traits\HasSourceTrait;
		use Application\Entity\Db\Traits\HasApplicationCollectionTrait;
		use Application\Entity\Db\Traits\HasCompetenceCollectionTrait;
		@@ -13,8 +15,11 @@ use Doctrine\Common\Collections\ArrayCollection;
		use UnicaenUtilisateur\Entity\HistoriqueAwareInterface;
		use UnicaenUtilisateur\Entity\HistoriqueAwareTrait;

		class Formation implements HistoriqueAwareInterface, HasApplicationCollectionInterface, HasCompetenceCollectionInterface, HasSourceInterface
		class Formation implements HistoriqueAwareInterface,
		HasDescriptionInterface, HasSourceInterface,
		HasApplicationCollectionInterface, HasCompetenceCollectionInterface
		{
		use HasDescriptionTrait;
		use HasSourceTrait;
		use HistoriqueAwareTrait;
		use HasApplicationCollectionTrait;
		@@ -28,8 +33,6 @@ class Formation implements HistoriqueAwareInterface, HasApplicationCollectionInt
		/** @var string */
		private $libelle;
		/** @var string */
		private $description;
		/** @var string */
		private $lien;
		/** @var FormationGroupe */
		private $groupe;
		@@ -71,24 +74,6 @@ class Formation implements HistoriqueAwareInterface, HasApplicationCollectionInt
		return $this;
		}

		/**
		* @return string\|null
		*/
		public function getDescription() : ?string
		{
		return $this->description;
		}

		/**
		* @param string\|null $description
		* @return Formation
		*/
		public function setDescription(?string $description) : Formation
		{
		$this->description = $description;
		return $this;
		}

		/**
		* @return string\|null
		*/

module/Formation/src/Formation/Form/Formation/FormationForm.php

+5 −10

Changes for module/Formation/src/Formation/Form/Formation/FormationForm.php: 5 added lines, 10 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@

		namespace Formation\Form\Formation;

		use Application\Form\HasDescription\HasDescriptionFieldset;
		use Formation\Service\FormationGroupe\FormationGroupeServiceAwareTrait;
		use Zend\Form\Element\Button;
		use Zend\Form\Element\Select;
		@@ -47,17 +48,11 @@ class FormationForm extends Form
		]);
		//description
		$this->add([
		'name' => 'description',
		'type' => 'textarea',
		'options' => [
		'label' => 'Description : ',
		'label_attributes' => [
		'class' => 'control-label',
		],
		],
		'name' => 'HasDescription',
		'type' => HasDescriptionFieldset::class,
		'attributes' => [
		'class' => 'type2 form-control',
		]
		'id' => 'description',
		],
		]);
		//lien
		$this->add([

module/Formation/src/Formation/Form/Formation/FormationHydrator.php

+4 −2

Changes for module/Formation/src/Formation/Form/Formation/FormationHydrator.php: 4 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ class FormationHydrator implements HydratorInterface
		{
		$data = [
		'libelle' => $object->getLibelle(),
		'description' => $object->getDescription(),
		'HasDescription' => ['description' => $object->getDescription()],
		'lien' => $object->getLien(),
		'groupe' => ($object->getGroupe()) ? $object->getGroupe()->getId() : null,
		];
		@@ -34,8 +34,10 @@ class FormationHydrator implements HydratorInterface
		public function hydrate(array $data, $object)
		{
		$groupe = (isset($data['groupe']) && $data['groupe'] !== "") ? $this->getFormationGroupeService()->getFormationGroupe($data['groupe']) : null;
		$description = (isset($data['HasDescription']) AND isset($data['HasDescription']['description']) && trim($data['HasDescription']['description']) != '')?trim($data['HasDescription']['description']):null;

		$object->setLibelle($data['libelle']);
		$object->setDescription($data['description']);
		$object->setDescription($description);
		$object->setLien($data['lien']);
		$object->setGroupe($groupe);
		return $object;