Ajout du type de formation (b7a0bc51) · Commits · open-source / emc2

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

+24 −0

Changes for module/Application/src/Application/Entity/Db/FormationInstance.php: 24 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -10,6 +10,10 @@ use UnicaenUtilisateur\Entity\HistoriqueAwareTrait;
		class FormationInstance implements HistoriqueAwareInterface {
		use HistoriqueAwareTrait;

		const TYPE_INTERNE = "formation interne";
		const TYPE_EXTERNE = "formation externe";
		const TYPE_REGIONALE = "formation régionale";

		/** @var integer */
		private $id;
		/** @var Formation */
		@@ -23,6 +27,8 @@ class FormationInstance implements HistoriqueAwareInterface {
		private $nbPlaceComplementaire;
		/** @var string */
		private $lieu;
		/** @var string */
		private $type;

		/** @var ArrayCollection (FormationInstanceJournee) */
		private $journees;
		@@ -129,6 +135,24 @@ class FormationInstance implements HistoriqueAwareInterface {
		return $this;
		}

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

		/**
		* @param string\|null $type
		* @return FormationInstance
		*/
		public function setType(?string $type): FormationInstance
		{
		$this->type = $type;
		return $this;
		}

		/ JOURNEE *****************************************************************************************************/

		public function getJournees()

+2 −1

Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.FormationInstance.dcm.xml: 2 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -12,7 +12,8 @@

		<field name="nbPlacePrincipale" type="integer" column="nb_place_principale" nullable="false"/>
		<field name="nbPlaceComplementaire" type="integer" column="nb_place_complementaire" nullable="false"/>
		<field name="lieu" type="string" length="256" column="lieu" nullable="false"/>
		<field name="lieu" type="string" length="256" column="lieu" nullable="true"/>
		<field name="type" type="string" length="256" column="type" nullable="true"/>
		<field name="complement" type="string" length="4096" column="complement" nullable="true"/>

		<one-to-many field="journees" target-entity="Application\Entity\Db\FormationInstanceJournee" mapped-by="instance"/>

+20 −0

Changes for module/Application/src/Application/Form/FormationInstance/FormationInstanceForm.php: 20 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,8 +2,10 @@

		namespace Application\Form\FormationInstance;

		use Application\Entity\Db\FormationInstance;
		use Zend\Form\Element\Button;
		use Zend\Form\Element\Number;
		use Zend\Form\Element\Select;
		use Zend\Form\Element\Text;
		use Zend\Form\Element\Textarea;
		use Zend\Form\Form;
		@@ -51,6 +53,23 @@ class FormationInstanceForm extends Form {
		],
		]);
		/** taille liste complementaire */
		$this->add([
		'type' => Select::class,
		'name' => 'type',
		'options' => [
		'label' => "Type de formation :",
		'empty_option' => "Sélectionner un type ...",
		'value_options' => [
		FormationInstance::TYPE_INTERNE => 'Formation interne',
		FormationInstance::TYPE_EXTERNE => 'Formation externe',
		FormationInstance::TYPE_REGIONALE => 'Formation régionale',
		],
		],
		'attributes' => [
		'id' => 'type',
		],
		]);
		/** taille liste complementaire */
		$this->add([
		'type' => Text::class,
		'name' => 'lieu',
		@@ -82,6 +101,7 @@ class FormationInstanceForm extends Form {
		'principale' => [ 'required' => true, ],
		'complementaire' => [ 'required' => true, ],
		'lieu' => [ 'required' => true, ],
		'type' => [ 'required' => true, ],
		]));
		}
		}
		No newline at end of file

+3 −0

Changes for module/Application/src/Application/Form/FormationInstance/FormationInstanceHydrator.php: 3 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ class FormationInstanceHydrator implements HydratorInterface {
		'principale' => ($object->getNbPlacePrincipale())?:0,
		'complementaire' => ($object->getNbPlaceComplementaire())?:0,
		'lieu' => ($object->getLieu())?:null,
		'type' => ($object->getType())?:null,
		];
		return $data;
		}
		@@ -33,11 +34,13 @@ class FormationInstanceHydrator implements HydratorInterface {
		$principale = (isset($data['principale']))?((int) $data['principale']):0;
		$complementaire = (isset($data['complementaire']))?((int) $data['complementaire']):0;
		$lieu = (isset($data['lieu']) AND trim($data['lieu']) !== "")?trim($data['lieu']):null;
		$type = (isset($data['type']) AND trim($data['type']) !== "")?trim($data['type']):null;

		$object->setComplement($description);
		$object->setNbPlacePrincipale($principale);
		$object->setNbPlaceComplementaire($complementaire);
		$object->setLieu($lieu);
		$object->setType($type);

		return $object;
		}

+2 −0

Changes for module/Application/view/application/formation-instance/afficher.phtml: 2 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -72,6 +72,8 @@ $historises = $instance->getListeHistorisee();
		<dd> <?php echo $instance->getNbPlaceComplementaire(); ?> </dd>
		<dt> Lieu</dt>
		<dd> <?php echo ($instance->getLieu())?:"Non communiqué"; ?> </dd>
		<dt> Type</dt>
		<dd> <?php echo ($instance->getType())?:"Non communiqué"; ?> </dd>
		</dl>
		</div>
		<?php if ($canInformation) : ?>