Utilisation de l'établissements de la thèse pour le routing des mails du module soutenance (9cee79e1) · Commits · open-source / sygal

module/Application/src/Application/Controller/StructureConcreteController.php

+2 −1

Changes for module/Application/src/Application/Controller/StructureConcreteController.php: 2 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -112,7 +112,8 @@ abstract class StructureConcreteController extends AbstractController
		foreach ($individuRoles as $individuRole) {
		$denomination = $individuRole->getIndividu()->getNomComplet(false, false, false, true, false);
		$role = $individuRole->getRole()->getLibelle();
		$individuListings[$denomination][] = $role;
		$etablissement = ($individuRole->getIndividu()->getEtablissement())?$individuRole->getIndividu()->getEtablissement()->getLibelle():"Aucun";
		$individuListings[$denomination][] = [ 'Role' => $role, 'Etablissement' => $etablissement ];
		$roleListings[$role]++;
		}

+24 −0

Changes for module/Application/src/Application/Entity/Db/Individu.php: 24 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -116,6 +116,11 @@ class Individu implements HistoriqueAwareInterface, SourceAwareInterface
		*/
		private $type;

		/**
		* @var Etablissement\|null
		*/
		private $etablissement;

		/**
		* Individu constructor.
		*/
		@@ -425,6 +430,8 @@ class Individu implements HistoriqueAwareInterface, SourceAwareInterface
		return 'Mme' === $this->getCivilite();
		}



		/**
		* Retourne la représentation littérale de cet objet.
		*
		@@ -577,5 +584,22 @@ class Individu implements HistoriqueAwareInterface, SourceAwareInterface
		return $this;
		}

		/**
		* @return Etablissement\|null
		*/
		public function getEtablissement(): ?Etablissement
		{
		return $this->etablissement;
		}

		/**
		* @param Etablissement\|null $etablissement
		* @return Individu
		*/
		public function setEtablissement(?Etablissement $etablissement): Individu
		{
		$this->etablissement = $etablissement;
		return $this;
		}

		}
		No newline at end of file

+6 −0

Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Individu.dcm.xml: 6 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -36,6 +36,12 @@
		<one-to-many target-entity="Application\Entity\Db\MailConfirmation" mapped-by="individu" field="mailsConfirmations"/>
		<one-to-many target-entity="Application\Entity\Db\Utilisateur" mapped-by="individu" field="utilisateurs"/>

		<many-to-one field="etablissement" target-entity="Application\Entity\Db\Etablissement">
		<join-columns>
		<join-column name="ETABLISSEMENT_ID" referenced-column-name="ID"/>
		</join-columns>
		</many-to-one>

		<field name="histoCreation" type="datetime" column="HISTO_CREATION"/>
		<field name="histoDestruction" type="datetime" column="HISTO_DESTRUCTION" nullable="true"/>
		<field name="histoModification" type="datetime" column="HISTO_MODIFICATION"/>

+4 −3

Changes for module/Application/view/application/ecole-doctorale/information.phtml: 4 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -157,11 +157,12 @@ $canCoencadrantExport = $this->isAllowed(CoEncadrantPrivileges::getResourceId(Co
		</tr>
		</thead>
		<tbody>
		<?php foreach ($individuListing as $denomination => $roles): ?>
		<?php foreach ($roles as $role): ?>
		<?php foreach ($individuListing as $denomination => $data): ?>
		<?php foreach ($data as $item): ?>
		<tr>
		<td> <?php echo $denomination; ?> </td>
		<td> <?php echo $role; ?> </td>
		<td> <?php echo $item['Etablissement']; ?> </td>
		<td> <?php echo $item['Role']; ?> </td>
		</tr>
		<?php endforeach; ?>
		<?php endforeach; ?>

+5 −3

Changes for module/Application/view/application/unite-recherche/information.phtml: 5 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -163,15 +163,17 @@ $canCoencadrantExport = $this->isAllowed(CoEncadrantPrivileges::getResourceId(Co
		<thead>
		<tr>
		<th> Dénomination</th>
		<th> Établissement</th>
		<th> Rôle</th>
		</tr>
		</thead>
		<tbody>
		<?php foreach ($individuListing as $denomination => $roles): ?>
		<?php foreach ($roles as $role): ?>
		<?php foreach ($individuListing as $denomination => $data): ?>
		<?php foreach ($data as $item): ?>
		<tr>
		<td> <?php echo $denomination; ?> </td>
		<td> <?php echo $role; ?> </td>
		<td> <?php echo $item['Etablissement']; ?> </td>
		<td> <?php echo $item['Role']; ?> </td>
		</tr>
		<?php endforeach; ?>
		<?php endforeach; ?>