deplacement des formations vers les activités (1793b665) · Commits · open-source / emc2

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

+30 −0

Changes for module/Application/src/Application/Entity/Db/Activite.php: 30 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -17,10 +17,13 @@ class Activite
		private $description;
		/** @var ArrayCollection */
		private $applications;
		/** @var ArrayCollection */
		private $formations;

		public function __construct()
		{
		$this->applications = new ArrayCollection();
		$this->formations = new ArrayCollection();
		}
		/**
		* @return int
		@@ -103,4 +106,31 @@ class Activite
		return $this->applications->contains($application);
		}

		/**
		* @return Formation[]
		*/
		public function getFormations()
		{
		return $this->formations->toArray();
		}

		/**
		* @param Formation $formation
		* @return Activite
		*/
		public function addFormation($formation)
		{
		$this->formations->add($formation);
		return $this;
		}

		/**
		* @param Formation $formation
		* @return Activite
		*/
		public function removeFormation($formation)
		{
		$this->formations->removeElement($formation);
		return $this;
		}
		}
		No newline at end of file

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

+0 −90

Changes for module/Application/src/Application/Entity/Db/FicheMetier.php: 0 added lines, 90 removed lines.
Original line number	Diff line number	Diff line
		@@ -16,20 +16,12 @@ class FicheMetier {
		/** @var string */
		private $connaissances;
		/** @var string */
		private $connaissancesFormation;
		/** @var string */
		private $competencesOperationnelles;
		/** @var string */
		private $competencesOperationnellesFormation;
		/** @var string */
		private $competencesComportementales;
		/** @var string */
		private $competencesComportementalesFormation;

		/** @var ArrayCollection */
		private $applications;
		/** @var string */
		private $applicationsFormation;

		/** @var ArrayCollection */
		private $activites;
		@@ -84,16 +76,6 @@ class FicheMetier {
		return $texte;
		}

		/**
		* @param string $missionsPrincipales
		* @return FicheMetier
		*/
		public function setMissionsPrincipales($missionsPrincipales)
		{
		$this->missionsPrincipales = $missionsPrincipales;
		return $this;
		}

		/**
		* @return string
		*/
		@@ -112,24 +94,6 @@ class FicheMetier {
		return $this;
		}

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

		/**
		* @param string $connaissancesFormation
		* @return FicheMetier
		*/
		public function setConnaissancesFormation($connaissancesFormation)
		{
		$this->connaissancesFormation = $connaissancesFormation;
		return $this;
		}

		/**
		* @return string
		*/
		@@ -148,24 +112,6 @@ class FicheMetier {
		return $this;
		}

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

		/**
		* @param string $competencesOperationnellesFormation
		* @return FicheMetier
		*/
		public function setCompetencesOperationnellesFormation($competencesOperationnellesFormation)
		{
		$this->competencesOperationnellesFormation = $competencesOperationnellesFormation;
		return $this;
		}

		/**
		* @return string
		*/
		@@ -184,24 +130,6 @@ class FicheMetier {
		return $this;
		}

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

		/**
		* @param string $competencesComportementalesFormation
		* @return FicheMetier
		*/
		public function setCompetencesComportementalesFormation($competencesComportementalesFormation)
		{
		$this->competencesComportementalesFormation = $competencesComportementalesFormation;
		return $this;
		}

		/**
		* @return ArrayCollection
		*/
		@@ -230,24 +158,6 @@ class FicheMetier {
		return $this;
		}

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

		/**
		* @param string $formation
		* @return FicheMetier
		*/
		public function setApplicationsFormation($formation)
		{
		$this->applicationsFormation = $formation;
		return $this;
		}

		/**
		* @return FicheMetierTypeActivite[]
		*/

module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Activite.dcm.xml

+11 −0

Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Activite.dcm.xml: 11 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -20,6 +20,17 @@
		</join-table>
		</many-to-many>

		<many-to-many field="formations" target-entity="Application\Entity\Db\Formation" inversed-by="formation" fetch="LAZY">
		<join-table name="activite_formation">
		<join-columns>
		<join-column name="activite_id" referenced-column-name="id"/>
		</join-columns>
		<inverse-join-columns>
		<join-column name="formation_id" referenced-column-name="id"/>
		</inverse-join-columns>
		</join-table>
		</many-to-many>

		<field name="histoCreation" type="datetime" column="histo_creation" nullable="false"/>
		<field name="histoModification" type="datetime" column="histo_modification" nullable="false"/>
		<field name="histoDestruction" type="datetime" column="histo_destruction" nullable="true"/>

module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.FicheMetier.dcm.xml

+0 −7

Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.FicheMetier.dcm.xml: 0 added lines, 7 removed lines.
Original line number	Diff line number	Diff line
		@@ -12,15 +12,8 @@
		</many-to-one>

		<field name="connaissances" type="string" length="1024" column="connaissances" nullable="true"/>
		<field name="connaissancesFormation" type="string" length="1024" column="connaissances_formation" nullable="true"/>

		<field name="competencesOperationnelles" type="string" length="1024" column="competences_operationnelles" nullable="true"/>
		<field name="competencesOperationnellesFormation" type="string" length="1024" column="competences_operationnelles_formation" nullable="true"/>

		<field name="competencesComportementales" type="string" length="1024" column="competences_comportementales" nullable="true"/>
		<field name="competencesComportementalesFormation" type="string" length="1024" column="competences_comportementales_formation" nullable="true"/>

		<field name="applicationsFormation" type="string" length="1024" column="applications_formation" nullable="true"/>

		<many-to-many field="applications" target-entity="Application\Entity\Db\Application">
		<join-table name="fiche_metier_type_application">

module/Application/src/Application/Form/Activite/ActiviteForm.php

+19 −0

Changes for module/Application/src/Application/Form/Activite/ActiviteForm.php: 19 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@
		namespace Application\Form\Activite;

		use Application\Service\Application\ApplicationServiceAwareTrait;
		use Application\Service\Formation\FormationServiceAwareTrait;
		use Zend\Form\Element\Button;
		use Zend\Form\Element\Select;
		use Zend\Form\Element\Text;
		@@ -11,6 +12,7 @@ use Zend\InputFilter\Factory;

		class ActiviteForm extends Form {
		use ApplicationServiceAwareTrait;
		use FormationServiceAwareTrait;

		public function init()
		{
		@@ -39,6 +41,7 @@ class ActiviteForm extends Form {
		'class' => 'type2 form-control',
		]
		]);
		//application
		$this->add([
		'name' => 'applications',
		'type' => Select::class,
		@@ -55,6 +58,22 @@ class ActiviteForm extends Form {
		'multiple' => 'multiple',
		]
		]);
		// formation
		$this->add([
		'type' => Select::class,
		'name' => 'formations',
		'options' => [
		'label' => "Formations associées :",
		'empty_option' => "Sélectionner la ou les formations ...",
		'value_options' => $this->getFormationService()->getFormationsAsOptions(),
		],
		'attributes' => [
		'id' => 'formations',
		'class' => 'bootstrap-selectpicker show-tick',
		'data-live-search' => 'true',
		'multiple' => 'multiple',
		],
		]);
		// button
		$this->add([
		'type' => Button::class,