HasDescription pour le sursis (fd162484) · Commits · open-source / emc2

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

+4 −23

Changes for module/EntretienProfessionnel/src/EntretienProfessionnel/Entity/Db/Sursis.php: 4 added lines, 23 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,12 +2,15 @@

		namespace EntretienProfessionnel\Entity\Db;

		use Application\Entity\Db\Interfaces\HasDescriptionInterface;
		use Application\Entity\Db\Traits\HasDescriptionTrait;
		use DateTime;
		use UnicaenUtilisateur\Entity\HistoriqueAwareInterface;
		use UnicaenUtilisateur\Entity\HistoriqueAwareTrait;

		class Sursis implements HistoriqueAwareInterface {
		class Sursis implements HistoriqueAwareInterface, HasDescriptionInterface {
		use HistoriqueAwareTrait;
		use HasDescriptionTrait;

		/** @var integer */
		private $id;
		@@ -15,8 +18,6 @@ class Sursis implements HistoriqueAwareInterface {
		private $entretien;
		/** @var DateTime */
		private $sursis;
		/** @var string */
		private $description;

		/**
		* @return int
		@@ -63,24 +64,4 @@ class Sursis implements HistoriqueAwareInterface {
		return $this;
		}

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

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



		}
		No newline at end of file

+5 −12

Changes for module/EntretienProfessionnel/src/EntretienProfessionnel/Form/Sursis/SursisForm.php: 5 added lines, 12 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,8 +2,8 @@

		namespace EntretienProfessionnel\Form\Sursis;

		use Application\Form\HasDescription\HasDescriptionFieldset;
		use Zend\Form\Element\Date;
		use Zend\Form\Element\Textarea;
		use Zend\Form\Form;
		use Zend\InputFilter\Factory;

		@@ -25,18 +25,11 @@ class SursisForm extends Form
		]);
		//description
		$this->add([
		'name' => 'description',
		'type' => Textarea::class,
		'options' => [
		'label' => 'Description : ',
		'label_attributes' => [
		'class' => 'control-label',
		],
		],
		'name' => 'HasDescription',
		'type' => HasDescriptionFieldset::class,
		'attributes' => [
		'id' => 'description',
		'class' => 'description form-control',
		]
		],
		]);
		//button
		$this->add([
		@@ -51,7 +44,7 @@ class SursisForm extends Form
		//inputfilter
		$this->setInputFilter((new Factory())->createInputFilter([
		'date' => [ 'required' => true, ],
		'description' => [ 'required' => true, ],
		'description' => [ 'required' => false, ],
		]));
		}
		}
		No newline at end of file

+2 −2

Changes for module/EntretienProfessionnel/src/EntretienProfessionnel/Form/Sursis/SursisHydrator.php: 2 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@ class SursisHydrator implements HydratorInterface {
		{
		$data = [
		'date' => ($object->getSursis())?$object->getSursis()->format('Y-m-d'):null,
		'description' => $object->getDescription(),
		'HasDescription' => ['description' => $object->getDescription()],
		];
		return $data;
		}
		@@ -29,7 +29,7 @@ class SursisHydrator implements HydratorInterface {
		public function hydrate(array $data, $object)
		{
		$date = (isset($data['date']))?DateTime::createFromFormat('Y-m-d H:i:s', $data['date']." 23:59:59"):null;
		$description = (isset($data['description']) AND trim($data['description']) !== "")?trim($data['description']):null;
		$description = (isset($data['HasDescription']) AND isset($data['HasDescription']['description']) && trim($data['HasDescription']['description']) != '')?trim($data['HasDescription']['description']):null;

		$object->setSursis($date);
		$object->setDescription($description);