Individu : remplacement des usages de getCiviliteToString() par getCivilite()... (24f2ae28) · Commits · open-source / sygal

module/Admission/src/Admission/Entity/Db/Inscription.php

+1 −1

Changes for module/Admission/src/Admission/Entity/Db/Inscription.php: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -954,7 +954,7 @@ class Inscription implements HistoriqueAwareInterface{
		}else{
		if($this->getCoDirection()) {
		$coDirecteur = $this->getCoDirecteur() ?
		$this->getCoDirecteur()->getCiviliteToString() . " " . $this->getCoDirecteur()->getNomComplet() :
		$this->getCoDirecteur()->getCivilite() . " " . $this->getCoDirecteur()->getNomComplet() :
		$this->getNomCodirecteurThese() . " " . $this->getPrenomCodirecteurThese();
		return $coDirecteur;
		}else{

+1 −1

Changes for module/Admission/src/Admission/Filter/AdmissionInscriptionFormatter.php: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@ class AdmissionInscriptionFormatter extends AbstractFilter {
		public function htmlifyDiplomeIntituleInformations(Inscription $inscription){
		if ($inscription->getCoDirection()) {
		if($inscription->getCoDirecteur()){
		$nomPrenom = $inscription->getCoDirecteur()->getCiviliteToString() . " " .$inscription->getCoDirecteur()->getNomComplet();
		$nomPrenom = $inscription->getCoDirecteur()->getCivilite() . " " .$inscription->getCoDirecteur()->getNomComplet();
		}else{
		$nomPrenom = $inscription->getNomCodirecteurThese() . " " . $inscription->getPrenomCodirecteurThese();
		}

+0 −11

Changes for module/Doctorant/src/Doctorant/Entity/Db/Doctorant.php: 0 added lines, 11 removed lines.
Original line number	Diff line number	Diff line
		@@ -289,17 +289,6 @@ class Doctorant implements
		return $this->getIndividu()->getCivilite();
		}

		/**
		* Get civilite
		*
		* @return string
		* @deprecated Passe par getIndividu() toi-même !
		*/
		public function getCiviliteToString()
		{
		return $this->getIndividu()->getCiviliteToString();
		}

		/**
		* Get estUneFemme
		*

+11 −30

Changes for module/Individu/src/Individu/Entity/Db/Individu.php: 11 added lines, 30 removed lines.
Original line number	Diff line number	Diff line
		@@ -493,12 +493,8 @@ class Individu implements

		/**
		* Set civilite
		*
		* @param string\|null $civilite
		*
		* @return self
		*/
		public function setCivilite(?string $civilite)
		public function setCivilite(?string $civilite): static
		{
		$this->civilite = $civilite;

		@@ -506,48 +502,33 @@ class Individu implements
		}

		/**
		* Get civilite
		*
		* @return string\|null
		* Retourne "Mme" ou "M.", ou `null`.
		*/
		public function getCivilite()
		public function getCivilite(): ?string
		{
		return $this->civilite;
		}

		/**
		* Get civilite
		*
		* @return string
		* Retourne "Madame" ou "Monsieur", ou `null`.
		*/
		public function getCiviliteToString()
		public function getCiviliteToString(): ?string
		{
		return $this->getCivilite();
		if (!$this->civilite) {
		return null;
		}

		/**
		* @return string 'F' ou 'M'
		*/
		public function getCiviliteAsLetter(): string
		{
		return [
		self::CIVILITE_M => 'M',
		self::CIVILITE_MME => 'F',
		][$this->getCivilite()] ?? "";
		return $this->estUneFemme() ? "Madame" : "Monsieur";
		}

		/**
		* Get estUneFemme
		*
		* @return bool
		* Retourn `true` si cet individu a une civilité correspondant à une femme.
		*/
		public function estUneFemme()
		public function estUneFemme(): bool
		{
		return 'Mme' === $this->getCivilite();
		return self::CIVILITE_MME === $this->civilite;
		}



		/**
		* Retourne la représentation littérale de cet objet.
		*

+1 −1

Changes for module/Individu/view/individu/individu/partial/dl.phtml: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ if (!isset($verbose)) $verbose = false;
		<dl class="<?php echo $dlClass ?>">
		<?php if ($entity->getCivilite()): ?>
		<dt class="<?php echo $dtClass ?>">Civilité</dt>
		<dd class="<?php echo $ddClass ?>"><?php echo $entity->getCiviliteToString() ?></dd>
		<dd class="<?php echo $ddClass ?>"><?php echo $entity->getCivilite() ?></dd>
		<?php endif ?>

		<dt class="<?php echo $dtClass ?>">Nom d'usage</dt>