Merge branch 'master' into todos-solution-provisoire (958f85c3) · Commits · open-source / sygal

code/test.php

+0 −2

Changes for code/test.php: 0 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -26,8 +26,6 @@ $doctrineMetadatas = array_filter($doctrineMetadatas, function(ClassMetadata $me
		'Privilege',
		'Role',
		'Utilisateur',
		'EcoleDoctoraleIndividu',
		'UniteRechercheIndividu',
		'WfEtape',
		'Parametre',
		'Variable',

data/SQL/sygal/schema-sygal.sql

+0 −34

Changes for data/SQL/sygal/schema-sygal.sql: 0 added lines, 34 removed lines.
Original line number	Diff line number	Diff line
		@@ -800,23 +800,6 @@ create index ECOLE_DOCT_STRUCT_ID_IDX on ECOLE_DOCT (structure_id);

		------

		create table ECOLE_DOCT_IND
		(
		ID NUMBER not null constraint ECOLE_DOCT_IND_PK primary key,
		ECOLE_DOCT_ID NUMBER not null constraint ECOLE_DOCT_IND_EDFK references ECOLE_DOCT,
		INDIVIDU_ID NUMBER not null constraint ECOLE_DOCT_IND_IFK references INDIVIDU,
		ROLE_ID NUMBER not null constraint ECOLE_DOCT_IND_RFK references ROLE,
		constraint ECOLE_DOCT_IND_UN unique (ECOLE_DOCT_ID, INDIVIDU_ID, ROLE_ID)
		);

		create index ECOLE_DOCT_IND_ECOLE_IDX on ECOLE_DOCT_IND (ECOLE_DOCT_ID);
		create index ECOLE_DOCT_IND_INDIVIDU_IDX on ECOLE_DOCT_IND (INDIVIDU_ID);
		create index ECOLE_DOCT_IND_ROLE_IDX on ECOLE_DOCT_IND (ROLE_ID);

		create sequence ECOLE_DOCT_IND_ID_SEQ;

		------

		create table METADONNEE_THESE
		(
		ID NUMBER not null constraint METADONNEE_THESE_PK primary key,
		@@ -963,23 +946,6 @@ create index UNITE_RECH_STRUCT_ID_IDX on UNITE_RECH (structure_id);

		-----

		create table UNITE_RECH_IND
		(
		ID NUMBER not null constraint UNITE_RECH_IND_PK primary key,
		UNITE_RECH_ID NUMBER not null constraint UNITE_RECH_IND_URFK references UNITE_RECH,
		INDIVIDU_ID NUMBER not null constraint UNITE_RECH_IND_IFK references INDIVIDU,
		ROLE_ID NUMBER not null constraint UNITE_RECH_IND_RFK references ROLE,
		constraint UNITE_RECH_IND_UN unique (UNITE_RECH_ID, INDIVIDU_ID, ROLE_ID)
		);

		create index UNITE_RECH_IND_ECOLE_IDX on UNITE_RECH_IND (UNITE_RECH_ID);
		create index UNITE_RECH_IND_INDIVIDU_IDX on UNITE_RECH_IND (INDIVIDU_ID);
		create index UNITE_RECH_IND_ROLE_IDX on UNITE_RECH_IND (ROLE_ID);

		create sequence UNITE_RECH_IND_ID_SEQ;

		-----

		create table UTILISATEUR_ROLE
		(
		UTILISATEUR_ID NUMBER constraint UTILISATEUR_ROLE_U_FK references UTILISATEUR on delete cascade,

module/Application/config/module.config.php

+1 −0

Changes for module/Application/config/module.config.php: 1 added line, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -248,6 +248,7 @@ return array(
		'060_uploader' => "/js/jquery.ui.widget.js",
		'061_uploader' => "/js/jquery.iframe-transport.js",
		'062_uploader' => "/js/jquery.fileupload.js",
		'063_uploader' => "/js/unicaen.uploader.widget.js",
		],
		'inline_scripts' => [
		],

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

+2 −40

Changes for module/Application/src/Application/Entity/Db/EcoleDoctorale.php: 2 added lines, 40 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,9 +2,6 @@

		namespace Application\Entity\Db;

		use Doctrine\Common\Collections\ArrayCollection;
		use Doctrine\Common\Collections\Collection;
		use Doctrine\ORM\Mapping as ORM;
		use UnicaenApp\Entity\HistoriqueAwareInterface;
		use UnicaenApp\Entity\HistoriqueAwareTrait;
		use UnicaenApp\Util;
		@@ -34,17 +31,11 @@ class EcoleDoctorale implements HistoriqueAwareInterface, SourceAwareInterface
		*/
		protected $structure;

		/**
		* @var Collection
		*/
		protected $ecoleDoctoraleIndividus;

		/**
		* EcoleDoctorale constructor.
		*/
		public function __construct()
		{
		$this->ecoleDoctoraleIndividus = new ArrayCollection();
		$this->structure = new Structure();
		}

		@@ -52,7 +43,8 @@ class EcoleDoctorale implements HistoriqueAwareInterface, SourceAwareInterface
		* EcoleDoctorale prettyPrint
		* @return string
		*/
		public function __toString() {
		public function __toString()
		{
		return $this->structure->getLibelle();
		}

		@@ -165,34 +157,4 @@ class EcoleDoctorale implements HistoriqueAwareInterface, SourceAwareInterface
		{
		return $this->structure;
		}

		/**
		* @return Collection
		*/
		public function getEcoleDoctoraleIndividus()
		{
		return $this->ecoleDoctoraleIndividus;
		}

		/**
		* @param EcoleDoctoraleIndividu $edi
		* @return self
		*/
		public function addEcoleDoctoraleIndividu(EcoleDoctoraleIndividu $edi)
		{
		$this->ecoleDoctoraleIndividus->add($edi);

		return $this;
		}

		/**
		* @param EcoleDoctoraleIndividu $edi
		* @return self
		*/
		public function removeEcoleDoctoraleIndividu(EcoleDoctoraleIndividu $edi)
		{
		$this->ecoleDoctoraleIndividus->removeElement($edi);

		return $this;
		}
		}
		No newline at end of file

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

deleted100644 → 0

+0 −98

Changes for module/Application/src/Application/Entity/Db/EcoleDoctoraleIndividu.php: 0 added lines, 98 removed lines.
Original line number	Diff line number	Diff line
		<?php

		namespace Application\Entity\Db;

		use Doctrine\ORM\Mapping as ORM;

		/**
		* EcoleDoctoraleIndividu
		*/
		class EcoleDoctoraleIndividu
		{
		/**
		* @var int
		*/
		private $id;

		/**
		* @var EcoleDoctorale
		*/
		private $ecole;

		/**
		* @var Individu
		*/
		private $individu;

		/**
		* @var Role
		*/
		private $role;

		/**
		* @return int
		*/
		public function getId()
		{
		return $this->id;
		}

		/**
		* @return EcoleDoctorale
		*/
		public function getEcole()
		{
		return $this->ecole;
		}

		/**
		* @return Individu
		*/
		public function getIndividu()
		{
		return $this->individu;
		}

		/**
		* @return Role
		*/
		public function getRole()
		{
		return $this->role;
		}

		/**
		* @param EcoleDoctorale $ecole
		* @return EcoleDoctoraleIndividu
		*/
		public function setEcole($ecole)
		{
		$this->ecole = $ecole;

		return $this;
		}

		/**
		* @param Individu $individu
		* @return EcoleDoctoraleIndividu
		*/
		public function setIndividu($individu)
		{
		$this->individu = $individu;

		return $this;
		}

		/**
		* @param Role $role
		* @return EcoleDoctoraleIndividu
		*/
		public function setRole($role)
		{
		$this->role = $role;

		return $this;
		}


		}
		No newline at end of file