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

Ajout d'un début de formatteur

parent 95f5c603
Loading
Loading
Loading
Loading
+20 −0
Changes for module/Application/src/Application/Entity/Db/Financement.php: 20 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ class Financement {
    private $id;
    /** @var Source */
    private $source;
    /** @var string */
    private $sourceCode;
    /** @var These */
    private $these;
    /** @var int */
@@ -52,6 +54,24 @@ class Financement {
        return $this;
    }

    /**
     * @return string
     */
    public function getSourceCode()
    {
        return $this->sourceCode;
    }

    /**
     * @param string $sourceCode
     * @return Financement
     */
    public function setSourceCode($sourceCode)
    {
        $this->sourceCode = $sourceCode;
        return $this;
    }

    /**
     * @return These
     */
+25 −10
Changes for module/Application/src/Application/Entity/Db/OrigineFinancement.php: 25 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@

namespace Application\Entity\Db;

use Doctrine\Common\Collections\ArrayCollection;
use UnicaenImport\Entity\Db\Source;

class OrigineFinancement {
@@ -17,11 +16,8 @@ class OrigineFinancement {
    private $libelleCourt;
    /** @var Source */
    private $source;

    public function __construct()
    {
        $this->theses = new ArrayCollection();
    }
    /** @var string */
    private $sourceCode;

    /**
     * @return int
@@ -41,7 +37,7 @@ class OrigineFinancement {

    /**
     * @param string $code
     * @return Financement
     * @return OrigineFinancement
     */
    public function setCode($code)
    {
@@ -59,7 +55,7 @@ class OrigineFinancement {

    /**
     * @param string $libelle
     * @return Financement
     * @return OrigineFinancement
     */
    public function setLibelle($libelle)
    {
@@ -77,7 +73,7 @@ class OrigineFinancement {

    /**
     * @param string $libelleCourt
     * @return Financement
     * @return OrigineFinancement
     */
    public function setLibelleCourt($libelleCourt)
    {
@@ -95,11 +91,30 @@ class OrigineFinancement {

    /**
     * @param Source $source
     * @return Financement
     * @return OrigineFinancement
     */
    public function setSource($source)
    {
        $this->source = $source;
        return $this;
    }

    /**
     * @return string
     */
    public function getSourceCode()
    {
        return $this->sourceCode;
    }

    /**
     * @param string $sourceCode
     * @return OrigineFinancement
     */
    public function setSourceCode($sourceCode)
    {
        $this->sourceCode = $sourceCode;
        return $this;
    }

}
 No newline at end of file
+87 −0
Changes for module/Application/src/Application/Filter/FinancementFormatter.php: 87 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

namespace Application\Filter;

use Application\Entity\Db\Financement;

class FinancementFormatter {

    const DISPLAY_AS_LINE = 'DISPLAY_LINE';

    const SORT_BY_DATE = 'SORT_DATE';
    const SORT_BY_ORIGINE = 'SORT_ORIGINE';

    /** @var string */
    private $displayAs;
    /** @var string */
    private $sortBy;

    /**
     * @return string
     */
    public function getDisplayAs()
    {
        return $this->displayAs;
    }

    /**
     * @param string $displayAs
     * @return FinancementFormatter
     */
    public function setDisplayAs($displayAs)
    {
        $this->displayAs = $displayAs;
        return $this;
    }

    /**
     * @return string
     */
    public function getSortBy()
    {
        return $this->sortBy;
    }

    /**
     * @param string $sortBy
     * @return FinancementFormatter
     */
    public function setSortBy($sortBy)
    {
        $this->sortBy = $sortBy;
        return $this;
    }

    /**
     * @param Financement[] $financements
     * @return string
     */
    public function doFormat($financements) {

        //sorting
        switch($this->getSortBy()) {
            case FinancementFormatter::SORT_BY_DATE :
                usort($financements->toArray(), function (Financement $a, Financement $b) { return $a->getDateDebut() > $b->getDateDebut();});
                break;
            case FinancementFormatter::SORT_BY_ORIGINE :
                usort($financements->toArray(), function (Financement $a, Financement $b) { return $a->getOrigineFinancement()->getLibelle() < $b->getOrigineFinancement()->getLibelle();});
                break;
        }

        $output = "";
        foreach ($financements as $financement) {
            switch($this->getDisplayAs()) {
                case FinancementFormatter::DISPLAY_AS_LINE :
                    $infos = [];
                    if ($financement->getOrigineFinancement())  $infos[] = $financement->getOrigineFinancement()->getLibelle();
                    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');
                    $line = implode(", ", $infos);
                    $output .= $line . "<br/>";
                    break;
            }
        }
        return $output;
    }
}
 No newline at end of file
+7 −11
Changes for module/Application/view/application/these/identite.phtml: 7 added lines, 11 removed lines.
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ use Application\Entity\Db\Individu;
use Application\Entity\Db\Etablissement;
use Application\Filter\ActeursFormatter;
use Application\Entity\Db\WfEtape;
use Application\Filter\FinancementFormatter;
use Application\Provider\Privilege\DoctorantPrivileges;
use Application\Provider\Privilege\ThesePrivileges;
use Application\View\Renderer\PhpRenderer;
@@ -33,6 +34,10 @@ $canEditPersopass = $this->isAllowed($these, DoctorantPrivileges::DOCTORANT_MODI
$canEditPersopass = $canEditPersopass && (!$estDoctorant || !$these->getDoctorant()->getPersopass());
$persopassModifiedEvent = 'persopass-modified-event';


$financementFormatter = new FinancementFormatter();
$financementFormatter->setSortBy(FinancementFormatter::SORT_BY_DATE);
$financementFormatter->setDisplayAs(FinancementFormatter::DISPLAY_AS_LINE);
?>

<?php $this->headTitle($this->translate("Thèse"))->prepend($these->getDoctorant()->getNomUsuel()) ?>
@@ -225,17 +230,8 @@ $persopassModifiedEvent = 'persopass-modified-event';
                Financement(s)
            </dt>
            <dd>
                <?php /** @var \Application\Entity\Db\Financement $financement */ ?>
                <?php foreach ($these->getFinancements() as $financement) : ?>
                    <?php echo $financement->getOrigineFinancement()->getLibelle(); ?>
                    <?php if($financement->getQuotiteFinancement()): ?>
                        (<?php echo $financement->getQuotiteFinancement(); ?>)
                    <?php endif; ?>
                    <?php if($financement->getComplementFinancement()): ?>
                        - <?php echo $financement->getComplementFinancement(); ?>
                    <?php endif; ?>
                    <br/>
                <?php endforeach; ?>

                <?php echo $financementFormatter->doFormat($these->getFinancements()); ?>
            </dd>

            <dt>