Modification bulles + descriptions dans missions specifiques (0a86d439) · Commits · open-source / emc2

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

+5 −0

Changes for module/Application/src/Application/Entity/Db/Agent.php: 5 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -203,6 +203,11 @@ class Agent implements

		/ AFFECTATIONS ************************************************************************************************/

		public function isIn(Structure $structure)
		{
		return true;
		}

		/**
		* @return AgentAffectation[]
		*/

+1 −0

Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.MissionSpecifique.dcm.xml: 1 added line, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@
		</id>

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

		<one-to-many target-entity="Application\Entity\Db\AgentMissionSpecifique" mapped-by="mission" field="affectations"/>

+21 −1

Changes for module/Application/src/Application/Entity/Db/MissionSpecifique.php: 21 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -17,6 +17,8 @@ class MissionSpecifique implements HistoriqueAwareInterface {
		private $theme;
		/** @var MissionSpecifiqueType */
		private $type;
		/** @var string */
		private $description;
		/** @var ArrayCollection */
		private $affectations;

		@@ -97,10 +99,28 @@ class MissionSpecifique implements HistoriqueAwareInterface {
		return $this;
		}

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

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

		/**
		* @return AgentMissionSpecifique[]
		*/
		public function getAffectations()
		public function getAffectations() : array
		{
		return $this->affectations->toArray();
		}

+15 −0

Changes for module/Application/src/Application/Form/MissionSpecifique/MissionSpecifiqueForm.php: 15 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -56,6 +56,20 @@ class MissionSpecifiqueForm extends Form
		'data-live-search' => 'true',
		],
		]);
		// description
		$this->add([
		'name' => 'description',
		'type' => 'textarea',
		'options' => [
		'label' => 'Description : ',
		'label_attributes' => [
		'class' => 'control-label',
		],
		],
		'attributes' => [
		'class' => 'type2 form-control',
		]
		]);

		// button
		$this->add([
		@@ -77,6 +91,7 @@ class MissionSpecifiqueForm extends Form
		'libelle' => [ 'required' => true, ],
		'type' => [ 'required' => false, ],
		'theme' => [ 'required' => false, ],
		'description' => [ 'required' => false, ],
		]));
		}

+3 −0

Changes for module/Application/src/Application/Form/MissionSpecifique/MissionSpecifiqueHydrator.php: 3 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ class MissionSpecifiqueHydrator implements HydratorInterface
		$data['libelle'] = $object->getLibelle();
		if ($object->getType()) $data['type'] = $object->getType()->getId();
		if ($object->getTheme()) $data['theme'] = $object->getTheme()->getId();
		if ($object->getDescription()) $data['description'] = $object->getDescription();
		return $data;
		}

		@@ -50,6 +51,8 @@ class MissionSpecifiqueHydrator implements HydratorInterface
		$object->setTheme(null);
		}

		$description = (isset($data['description']) AND trim($data['description']) !== '')?trim($data['description']):null;
		$object->setDescription($description);
		return $object;
		}