Commit 6278765b authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Merge branch 'info_financement' into release-1.4.7

parents fb0ed750 f3a61f96

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

+13 −1
Changes for module/Application/src/Application/Filter/FinancementFormatter.php: 13 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -15,6 +15,18 @@ class FinancementFormatter { 
    private $displayAs;

    /** @var string */

    private $sortBy;

    /** @var boolean */

    private $displayComplement;



    /**

     * @param bool $displayComplement

     * @return FinancementFormatter

     */

    public function setDisplayComplement(bool $displayComplement)

    {

        $this->displayComplement = $displayComplement;

        return $this;

    }



    /**

     * @return string
@@ -79,7 +91,7 @@ class FinancementFormatter { 
                    $infos = [];

                    if ($financement->getAnnee())                   $infos[] = $financement->getAnnee();

                    if ($financement->getOrigineFinancement())      $infos[] = $financement->getOrigineFinancement()->getLibelleLong();

                    if ($financement->getComplementFinancement())   $infos[] = $financement->getComplementFinancement();

                    if ($this->displayComplement === true AND $financement->getComplementFinancement())   $infos[] = $financement->getComplementFinancement();

                    if ($financement->getQuotiteFinancement())      $infos[] = $financement->getQuotiteFinancement();

                    if ($financement->getDateDebut())               $infos[] = $financement->getDateDebut()->format('d/m/Y');

                    if ($financement->getDateFin())                 $infos[] = $financement->getDateFin()->format('d/m/Y');