Ajout de la notion d'element clef (eb23543d) · Commits · open-source / emc2

module/Application/src/Application/Controller/FicheMetierController.php

+1 −0

Changes for module/Application/src/Application/Controller/FicheMetierController.php: 1 added line, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -421,6 +421,7 @@ class FicheMetierController extends AbstractActionController
		$agent = $this->getAgentService()->getRequestedAgent($this);

		$dictionnaire = $this->getFicheMetierService()->getCompetencesDictionnaires($ficheMetier, true);
		$dictionnaire = array_filter($dictionnaire, function($item) { return ($item['entite'])->isClef();});
		$labels = []; $values = [];

		$valuesFiche = [];

+3 −0

Changes for module/Application/src/Application/Entity/Db/Interfaces/HasNiveauMaitriseInterface.php: 3 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -9,4 +9,7 @@ interface HasNiveauMaitriseInterface {
		public function getNiveauMaitrise() : ?CompetenceMaitrise;
		public function setNiveauMaitrise(?CompetenceMaitrise $competenceMaitrise);

		public function isClef() : ?bool;
		public function setClef(bool $clef);

		}
		No newline at end of file

+6 −3

Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.CompetenceElement.dcm.xml: 6 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -9,14 +9,17 @@
		<many-to-one target-entity="Application\Entity\Db\Competence" field="competence">
		<join-column name="competence_id" referenced-column-name="id"/>
		</many-to-one>
		<many-to-one target-entity="Application\Entity\Db\CompetenceMaitrise" field="niveau">
		<join-column name="niveau_id" referenced-column-name="id"/>
		</many-to-one>
		<field name="commentaire" type="string" length="4096" column="commentaire" nullable="true"/>
		<one-to-one target-entity="UnicaenValidation\Entity\Db\ValidationInstance" field="validation">
		<join-column name="validation_id" referenced-column-name="id" />
		</one-to-one>

		<many-to-one target-entity="Application\Entity\Db\CompetenceMaitrise" field="niveau">
		<join-column name="niveau_id" referenced-column-name="id"/>
		</many-to-one>
		<field name="clef" column="clef" type="boolean" nullable="true"/>


		<!-- HISTORISATION ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
		<field name="histoCreation" type="datetime" column="histo_creation" nullable="false"/>
		<field name="histoModification" type="datetime" column="histo_modification" nullable="false"/>

+21 −0

Changes for module/Application/src/Application/Entity/Db/Traits/HasNiveauMaitriseTrait.php: 21 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -8,6 +8,8 @@ trait HasNiveauMaitriseTrait {

		/** @var CompetenceMaitrise */
		private $niveau;
		/** @var bool */
		private $clef;

		/**
		* @return CompetenceMaitrise\|null
		@@ -27,4 +29,23 @@ trait HasNiveauMaitriseTrait {
		return $this;
		}

		/**
		* @return bool\|null
		*/
		public function isClef(): ?bool
		{
		return $this->clef;
		}

		/**
		* @param bool $clef
		* @return HasNiveauMaitriseTrait
		*/
		public function setClef(bool $clef): self
		{
		$this->clef = $clef;
		return $this;
		}


		}
		No newline at end of file

+12 −0

Changes for module/Application/src/Application/Form/SelectionCompetenceMaitrise/SelectionCompetenceMaitriseForm.php: 12 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@ namespace Application\Form\SelectionCompetenceMaitrise;

		use Application\Service\CompetenceMaitrise\CompetenceMaitriseServiceAwareTrait;
		use Zend\Form\Element\Button;
		use Zend\Form\Element\Checkbox;
		use Zend\Form\Element\Select;
		use Zend\Form\Form;
		use Zend\InputFilter\Factory;
		@@ -28,6 +29,16 @@ class SelectionCompetenceMaitriseForm extends Form {
		'data-live-search' => 'true',
		],
		]);
		$this->add([
		'type' => Checkbox::class,
		'name' => 'clef',
		'options' => [
		'label' => "Est clef",
		],
		'attributes' => [
		'id' => 'clef',
		],
		]);
		//button
		$this->add([
		'type' => Button::class,
		@@ -46,6 +57,7 @@ class SelectionCompetenceMaitriseForm extends Form {
		//inputfilter
		$this->setInputFilter((new Factory())->createInputFilter([
		'niveau' => [ 'required' => true, ],
		'clef' => [ 'required' => false, ],
		]));

		}