Propagation des compléments d'individu au UR et ED (cff8e4a6) · Commits · open-source / sygal

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

+6 −17

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

		/**
		@@ -631,14 +628,9 @@ class Individu implements HistoriqueAwareInterface, SourceAwareInterface
		*/
		public function getEtablissement(): ?Etablissement
		{
		$etablissement = $this->etablissement;
		if ($etablissement === null) {
		$complement = $this->getComplement();
		if ($complement) {
		$etablissement = $complement->getEtablissement();
		}
		}
		return $etablissement;
		if ($complement AND $complement->getEtablissement() !== null) return $complement->getEtablissement();
		return $this->etablissement;
		}

		/**
		@@ -656,12 +648,9 @@ class Individu implements HistoriqueAwareInterface, SourceAwareInterface
		*/
		public function getUniteRecherche(): ?UniteRecherche
		{
		$unite = null;
		if ($unite === null) {
		$complement = $this->getComplement();
		if ($complement) $unite = $complement->getUniteRecherche();
		}
		return $unite;
		if ($complement AND $complement->getUniteRecherche() !== null) return $complement->getUniteRecherche();
		return null;
		}

		/**

module/Application/view/application/ecole-doctorale/information.phtml

+17 −10

Changes for module/Application/view/application/ecole-doctorale/information.phtml: 17 added lines, 10 removed lines.
Original line number	Diff line number	Diff line
		@@ -143,8 +143,7 @@ $structure = $ecole->getStructure();
		<h2>
		Rôles et membres
		</h2>
		<div class="row">
		<div class="col-md-6">

		<table class="table table-sm">
		<thead>
		<tr>
		@@ -161,31 +160,39 @@ $structure = $ecole->getStructure();
		<?php endforeach; ?>
		</tbody>
		</table>
		</div>


		<div class="col-md-6">
		<table class="table table-sm">
		<thead>
		<tr>
		<th> Dénomination</th>
		<th> Adresse électronique</th>
		<th> Établissement</th>
		<th> Rôle</th>
		<th>   </th>
		</tr>
		</thead>
		<tbody>
		<?php /** @var IndividuRole $individuRole */ ?>
		<?php foreach ($individuRoles as $individuRole): ?>
		<?php
		$individu = $individuRole->getIndividu();
		$role = $individuRole->getRole();
		?>
		<tr>
		<td> <?php echo $individuRole->getIndividu()->getNomComplet(); ?> </td>
		<td> <?php echo $individuRole->getIndividu()->getEtablissement(); ?> </td>
		<td> <?php echo $individuRole->getRole()->getLibelle(); ?> </td>
		<td> <?php echo $individu->getNomComplet(); ?> </td>
		<td> <?php echo $individu->getEmail(); ?> </td>
		<td> <?php echo $individu->getEtablissement(); ?> </td>
		<td> <?php echo $role->getLibelle(); ?> </td>
		<td>
		<?php if ($canEdit) : ?>
		<a href="<?php echo $this->url("individu-compl/gerer", ['individu' => $individu->getId()], [], true); ?>" class="ajax-modal" data-event="modification">
		<span class="icon icon-editer" title="Ajouter/Modifier un complément"></span></a>
		<?php endif; ?>
		</td>
		</tr>
		<?php endforeach; ?>
		</tbody>
		</table>
		</div>
		</div>

		<?php if ($canAddRole && empty($roleListing)): ?>
		<a href="<?php echo $this->url('structure/generer-roles-defauts', [

module/Application/view/application/unite-recherche/information.phtml

+17 −10

Changes for module/Application/view/application/unite-recherche/information.phtml: 17 added lines, 10 removed lines.
Original line number	Diff line number	Diff line
		@@ -152,8 +152,7 @@ $structure = $unite->getStructure();
		<h2>
		Rôles et membres
		</h2>
		<div class="row">
		<div class="col-md-6">

		<table class="table table-sm">
		<thead>
		<tr>
		@@ -171,30 +170,38 @@ $structure = $unite->getStructure();
		</tbody>

		</table>
		</div>


		<div class="col-md-6">
		<table class="table table-sm">
		<thead>
		<tr>
		<th> Dénomination</th>
		<th> Adresse électronique</th>
		<th> Établissement</th>
		<th> Rôle</th>
		<th>   </th>
		</tr>
		</thead>
		<tbody>
		<?php foreach ($individuRoles as $individuRole): ?>
		<?php
		$individu = $individuRole->getIndividu();
		$role = $individuRole->getRole();
		?>
		<tr>
		<td> <?php echo $individuRole->getIndividu()->getNomComplet(); ?> </td>
		<td> <?php echo $individuRole->getIndividu()->getEtablissement(); ?> </td>
		<td> <?php echo $individuRole->getRole()->getLibelle(); ?> </td>
		<td> <?php echo $individu->getNomComplet(); ?> </td>
		<td> <?php echo $individu->getEmail(); ?> </td>
		<td> <?php echo $individu->getEtablissement(); ?> </td>
		<td> <?php echo $role->getLibelle(); ?> </td>
		<td>
		<?php if ($canEdit) : ?>
		<a href="<?php echo $this->url("individu-compl/gerer", ['individu' => $individu->getId()], [], true); ?>" class="ajax-modal" data-event="modification">
		<span class="icon icon-editer" title="Ajouter/Modifier un complément"></span></a>
		<?php endif; ?>
		</td>
		</tr>
		<?php endforeach; ?>
		</tbody>
		</table>
		</div>
		</div>

		<?php if ($canAddRole && empty($roleListing)): ?>
		<a href="<?php echo $this->url('structure/generer-roles-defauts', [