Abandon (avant suppression) de la table obsolète doctorant_compl. (b3e29c6f) · Commits · open-source / sygal

CHANGELOG.md

+2 −1

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ Journal des modifications
		- Ajout de la possibilité d'enregistrer et de valider l'enquête de retour de formation
		- Doctorant : peut refuser de recevoir sur son adresse électronique de contact les messages des listes de diffusion
		- Suppression du menu 'Mes données' : la modif de l'adresse de contact et du consentement associé est désormais sur la fiche Thèse
		- Abandon (avant suppression) de la table obsolète doctorant_compl.
		- [FIX] Retrait de la liste complémentaire du mail d'echec
		- [FIX] Ordonnancement des séances sur les index des formations et des sessions
		- [FIX] Correction paramètre de route erronée + suppression bouton inactif

doc/release-notes/v5.2.7.md

+3 −0

Original line number	Diff line number	Diff line
		@@ -31,4 +31,7 @@ update privilege set code = 'afficher-email-contact', libelle = 'Visualiser l''e

		alter table mail_confirmation add refus_liste_diff boolean default false not null;
		comment on column mail_confirmation.refus_liste_diff is 'Refus de recevoir les messages des listes de diffusion sur cette adresse';

		comment on table doctorant_compl is 'Table obsolète conservée un temps';
		alter table doctorant_compl rename to z_doctorant_compl;
		```

module/Doctorant/src/Doctorant/Entity/Db/Doctorant.php

+4 −36

Original line number	Diff line number	Diff line
		@@ -2,16 +2,15 @@

		namespace Doctorant\Entity\Db;

		use Structure\Entity\Db\Etablissement;
		use Individu\Entity\Db\Individu;
		use Individu\Entity\Db\IndividuAwareInterface;
		use Doctrine\Common\Collections\ArrayCollection;
		use Doctrine\Common\Collections\Collection;
		use LogicException;
		use Individu\Entity\Db\Individu;
		use Individu\Entity\Db\IndividuAwareInterface;
		use Laminas\Permissions\Acl\Resource\ResourceInterface;
		use Structure\Entity\Db\Etablissement;
		use UnicaenApp\Entity\HistoriqueAwareInterface;
		use UnicaenApp\Entity\HistoriqueAwareTrait;
		use UnicaenDbImport\Entity\Db\Traits\SourceAwareTrait;
		use Laminas\Permissions\Acl\Resource\ResourceInterface;

		/**
		* Doctorant
		@@ -36,11 +35,6 @@ class Doctorant implements HistoriqueAwareInterface, ResourceInterface, Individu
		*/
		private $individu;

		/**
		* @var Collection
		*/
		private $complements;

		/**
		* @var Collection
		*/
		@@ -88,7 +82,6 @@ class Doctorant implements HistoriqueAwareInterface, ResourceInterface, Individu
		*/
		public function __construct()
		{
		$this->complements = new ArrayCollection();
		$this->theses = new ArrayCollection();
		}

		@@ -375,31 +368,6 @@ class Doctorant implements HistoriqueAwareInterface, ResourceInterface, Individu
		return $this;
		}

		/**
		* @return DoctorantCompl\|null
		*/
		public function getComplement()
		{
		return $this->complements->first() ?: null;
		}

		/**
		* @param DoctorantCompl $complement
		* @return static
		* @throws LogicException S'il existe déjà un complément lié
		*/
		public function setComplement(DoctorantCompl $complement)
		{
		// NB: le to-many 'complements' est utilisé comme un to-one
		if ($this->complements->count() > 0) {
		throw new LogicException(sprintf("Il existe déjà un enregistrement '%s' lié", get_class($this->getComplement())));
		}

		$this->complements->add($complement);

		return $this;
		}

		/**
		* @return \These\Entity\Db\These[]
		*/

module/Doctorant/src/Doctorant/Entity/Db/DoctorantCompl.php

deleted100644 → 0

+0 −113

Original line number	Diff line number	Diff line
		<?php

		namespace Doctorant\Entity\Db;

		use UnicaenApp\Entity\HistoriqueAwareInterface;
		use UnicaenApp\Entity\HistoriqueAwareTrait;

		/**
		* DoctorantCompl
		*/
		class DoctorantCompl implements HistoriqueAwareInterface
		{
		use HistoriqueAwareTrait;

		/**
		* @var string
		*/
		private $persopass;

		/**
		* @var string
		*/
		private $emailPro;

		/**
		* @var integer
		*/
		private $id;

		/**
		* @var Doctorant
		*/
		private $doctorant;


		/**
		* Set persopass
		*
		* @param string $persopass
		*
		* @return DoctorantCompl
		*/
		public function setPersopass($persopass)
		{
		$this->persopass = $persopass;

		return $this;
		}

		/**
		* Get persopass
		*
		* @return string
		*/
		public function getPersopass()
		{
		return $this->persopass;
		}

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

		/**
		* @param string $emailPro
		* @return DoctorantCompl
		*/
		public function setEmailPro($emailPro)
		{
		$this->emailPro = $emailPro;

		return $this;
		}

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

		/**
		* Set doctorant
		*
		* @param Doctorant $doctorant
		*
		* @return DoctorantCompl
		*/
		public function setDoctorant(Doctorant $doctorant = null)
		{
		$this->doctorant = $doctorant;

		return $this;
		}

		/**
		* Get doctorant
		*
		* @return Doctorant
		*/
		public function getDoctorant()
		{
		return $this->doctorant;
		}
		}

module/Doctorant/src/Doctorant/Entity/Db/Mapping/Doctorant.Entity.Db.Doctorant.dcm.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@
		</join-columns>
		</many-to-one>

		<one-to-many field="complements" target-entity="Doctorant\Entity\Db\DoctorantCompl" mapped-by="doctorant"/>
		<one-to-many field="theses" target-entity="These\Entity\Db\These" mapped-by="doctorant"/>

		<many-to-one field="source" target-entity="Application\Entity\Db\Source">