Ajustement + correction doc (83ec0edc) · Commits · open-source / sygal

doc/release-notes/v4.0.4.md

+2 −0

Changes for doc/release-notes/v4.0.4.md: 2 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -21,6 +21,8 @@ create table individu_compl
		id serial constraint individu_compl_pk primary key,
		individu_id integer not null constraint table_name_individu_id_fk references individu on delete cascade,
		email varchar(1024) not null,
		etablissement_id integer constraint individu_compl_etablissement_id_fk references etablissement on delete set null,
		unite_id integer constraint individu_compl_unite_rech_id_fk references unite_rech on delete set null,
		histo_creation timestamp default CURRENT_DATE not null ,
		histo_createur_id integer not null constraint utilisateur_id_fk_1 references utilisateur,
		histo_modification timestamp,

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

+6 −1

Changes for module/Application/src/Application/Entity/Db/Individu.php: 6 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -243,7 +243,12 @@ class Individu implements HistoriqueAwareInterface, SourceAwareInterface
		*/
		public function getEmail(): ?string
		{
		return $this->email;
		$email = $this->getEmail();
		if ($email === null) {
		$complement = $this->getComplement();
		if ($complement) $email = $this->getComplement()->getEmail();
		}
		return $email;
		}

		/**

module/Soutenance/src/Soutenance/Service/Notifier/NotifierSoutenanceService.php

+1 −1

Changes for module/Soutenance/src/Soutenance/Service/Notifier/NotifierSoutenanceService.php: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -843,7 +843,7 @@ class NotifierSoutenanceService extends NotifierService
		{
		if ($membre->getActeur() === null) throw new RuntimeException("Notification vers rapporteur [MembreId = " . $membre->getId() . "] impossible car aucun acteur n'est lié.");

		$email = $membre->getIndividu()->getEmail();
		$email = $membre->getEmail();
		if ($email === null) throw new RuntimeException("Notification vers rapporteur [MembreId = " . $membre->getId() . "] impossible car aucun email est donné pour l'individu associé [IndividuId = " . $membre->getIndividu()->getId() . "].");

module/Soutenance/view/soutenance/proposition/partial/informations.phtml

+22 −6

Changes for module/Soutenance/view/soutenance/proposition/partial/informations.phtml: 22 added lines, 6 removed lines.
Original line number	Diff line number	Diff line
		@@ -111,10 +111,14 @@ $etablissement = $these->getEtablissement();
		<?php else : ?>
		<ul>
		<?php foreach ($uniteResponsables as $uniteResponsable) : ?>
		<?php
		$email = $uniteResponsable->getIndividu()->getEmail();
		$complement = $uniteResponsable->getIndividu()->getComplement();
		if ($email === null AND $complement !== null) $email = "<span class='complement'>" . $complement->getEmail() . "</span>";
		?>
		<li>
		<?php echo $uniteResponsable->getIndividu()->getNomComplet(); ?>
		<?php //echo ($uniteResponsable->getIndividu()->getEtablissement())?$uniteResponsable->getIndividu()->getEtablissement()->getSigle():"Aucun"; ?>
		(<?php echo $uniteResponsable->getIndividu()->getEmail(); ?>)
		(<?php echo $email; ?>)
		</li>
		<?php endforeach; ?>
		</ul>
		@@ -134,10 +138,14 @@ $etablissement = $these->getEtablissement();
		<?php else : ?>
		<ul>
		<?php foreach ($ecoleResponsables as $ecoleResponsable) : ?>
		<?php
		$email = $ecoleResponsable->getIndividu()->getEmail();
		$complement = $ecoleResponsable->getIndividu()->getComplement();
		if ($email === null AND $complement !== null) $email = "<span class='complement'>" . $complement->getEmail() . "</span>";
		?>
		<li>
		<?php echo $ecoleResponsable->getIndividu()->getNomComplet(); ?>
		<?php //echo ($ecoleResponsable->getIndividu()->getEtablissement())?$ecoleResponsable->getIndividu()->getEtablissement()->getSigle():"Aucun"; ?>
		(<?php echo $ecoleResponsable->getIndividu()->getEmail(); ?>)
		(<?php echo $email; ?>)
		</li>
		<?php endforeach; ?>
		</ul>
		@@ -157,10 +165,14 @@ $etablissement = $these->getEtablissement();
		<?php else : ?>
		<ul>
		<?php foreach ($etablissementResponsables as $etablissementResponsable) : ?>
		<?php
		$email = $etablissementResponsable->getIndividu()->getEmail();
		$complement = $etablissementResponsable->getIndividu()->getComplement();
		if ($email === null AND $complement !== null) $email = "<span class='complement'>" . $complement->getEmail() . "</span>";
		?>
		<li>
		<?php echo $etablissementResponsable->getIndividu()->getNomComplet(); ?>
		<?php //echo ($etablissementResponsable->getIndividu()->getEtablissement())?$etablissementResponsable->getIndividu()->getEtablissement()->getSigle():"Aucun"; ?>
		(<?php echo $etablissementResponsable->getIndividu()->getEmail(); ?>)
		(<?php echo $email; ?>)
		</li>
		<?php endforeach; ?>
		</ul>
		@@ -180,3 +192,7 @@ $etablissement = $these->getEtablissement();
		color:darkblue;
		}
		</style>

		<script>
		$('span.complement').attr('title','Information obtenue depuis un complément');
		</script>
		No newline at end of file