Commit 53774d0a authored by Thomas Hamel's avatar Thomas Hamel
Browse files

fix civilite d'un membre incorrect dans certains cas, fix directeur non... 

fix civilite d'un membre incorrect dans certains cas, fix directeur non supprimé si on changeait son individu, affichage du complément d'un financement
parent 53390402

module/Application/src/Application/Filter/FinancementFormatter.php

+10 −0
Changes for module/Application/src/Application/Filter/FinancementFormatter.php: 10 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -25,6 +25,16 @@ class FinancementFormatter 
    private string $sortBy = self::SORT_BY_DATE;

    private bool $displayComplement = false;



    /**

     * @param bool $displayComplement

     * @return self

     */

    public function setDisplayComplement(bool $displayComplement): self

    {

        $this->displayComplement = $displayComplement;

        return $this;

    }



    /**

     * @param string $displayAs

     * @return self

module/Application/src/Application/View/Helper/FinancementFormatterHelper.php

+10 −0
Changes for module/Application/src/Application/View/Helper/FinancementFormatterHelper.php: 10 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -32,6 +32,16 @@ class FinancementFormatterHelper extends \Laminas\View\Helper\AbstractHelper 
        return $this;

    }



    /**

     * @param bool $displayComplement

     * @return self

     */

    public function setDisplayComplement(bool $displayComplement): self

    {

        $this->formatter->setDisplayComplement($displayComplement);

        return $this;

    }



    /**

     * @param string $sortBy

     * @return self

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

+1 −1
Changes for module/Individu/src/Individu/Entity/Db/Individu.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ class Individu implements 
        return [

            self::CIVILITE_M => 'M',

            self::CIVILITE_MME => 'F',

        ][$this->getCivilite()];

        ][$this->getCivilite()] ?? "";

    }



    /**

module/Soutenance/src/Soutenance/Entity/Membre.php

+19 −0
Changes for module/Soutenance/src/Soutenance/Entity/Membre.php: 19 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -90,6 +90,25 @@ class Membre implements HistoriqueAwareInterface { 
        return $this;

    }



    /**

     * @return string|null

     */

    public function getCivilite(): string|null

    {

        $civilite = null;

        if ($this->getIndividu()) {

            if ($this->getIndividu()->getCivilite() === 'M.') $civilite = "Monsieur";

            if ($this->getIndividu()->getCivilite() === 'Mme') $civilite = "Madame";

        }



        if(empty($civilite)){

            if ($this->getGenre() === 'F') $civilite = "Madame";

            if ($this->getGenre() === 'H') $civilite = "Monsieur";

        }



        return $civilite;

    }



    /**

     * @return string

     */

module/Soutenance/src/Soutenance/Service/Exporter/Convocation/convocation_membre.phtml

+2 −12
Changes for module/Soutenance/src/Soutenance/Service/Exporter/Convocation/convocation_membre.phtml: 2 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -27,20 +27,10 @@ use Soutenance\Entity\Proposition; 
$date = new DateTime();



$civilite = null;

//$civilite = ($membre->getGenre() !== "H")?"Madame":"Monsieur";

if ($membre->getIndividu()) {

    if ($membre->getIndividu()->getCivilite() === 'M.') $civilite = "Monsieur";

    if ($membre->getIndividu()->getCivilite() === 'Mme') $civilite = "Madame";

    $denomination = $membre->getIndividu()->getNomComplet();



} else {

    if ($membre->getGenre() === 'F') $civilite = "Madame";

    if ($membre->getGenre() === 'H') $civilite = "Monsieur";

    $denomination = $membre->getDenomination();

}

$civilite = $membre->getCivilite();

$denomination = $membre->getIndividu() ? $membre->getIndividu()->getNomComplet() : $membre->getDenomination();

?>





<style>

    .not-yet {

        background-color: lightpink;