Commit 53390402 authored by Thomas Hamel's avatar Thomas Hamel
Browse files

modif affichage identite these

parent f5a04357

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

+64 −9
Changes for module/Application/src/Application/Filter/FinancementFormatter.php: 64 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ class FinancementFormatter 
    use AuthorizeServiceAwareTrait;



    const DISPLAY_AS_HTML_LINES = 'DISPLAY_AS_HTML_LINES';

    const DISPLAY_AS_ARRAY = 'DISPLAY_AS_ARRAY';



    const SORT_BY_DATE = 'SORT_DATE';

    const SORT_BY_ORIGINE = 'SORT_ORIGINE';
@@ -32,6 +33,7 @@ class FinancementFormatter 
    {

        Assert::inArray($displayAs, [

            self::DISPLAY_AS_HTML_LINES,

            self::DISPLAY_AS_ARRAY,

        ]);

        $this->displayAs = $displayAs;

        return $this;
@@ -49,9 +51,9 @@ class FinancementFormatter 


    /**

     * @param Financement[] $financements

     * @return string

     * @return array|string

     */

    public function doFormat(array $financements): string

    public function doFormat(array $financements): array|string

    {

        //sorting

        switch($this->sortBy) {
@@ -67,6 +69,28 @@ class FinancementFormatter 
                break;

        }



        switch ($this->displayAs) {

            case FinancementFormatter::DISPLAY_AS_HTML_LINES :

                $output = $this->doFormatSeparated($financements);

                break;

            case FinancementFormatter::DISPLAY_AS_ARRAY :

                $output = $this->doFormatArray($financements);

                break;

            default:

                throw new InvalidArgumentException("Option d'affichage imprévue");

        }



        return $output;

    }



    /**

     * This function format an array of acteurs as Separated Values object

     *

     * @param  Financement[] $financements

     * @return string Separated Values object

     */

    private function doFormatSeparated(array $financements): string

    {

        $data = [];

        foreach ($financements as $financement) {

            $infos = [];
@@ -91,19 +115,50 @@ class FinancementFormatter 
        }



        $output = '';



        switch ($this->displayAs) {

            case FinancementFormatter::DISPLAY_AS_HTML_LINES :

        foreach ($data as $infos) {

            $line = implode(" ; ", $infos);

            $output .= $line . "<br/>";

        }

                break;

            default:

                throw new InvalidArgumentException("Option d'affichage imprévue");

        return $output;

    }



        return $output;

    /**

     * This function format an array of financements as Array.

     *

     * @param Financement[] $financements

     * @return array Array of array with key => value

     */

    private function doFormatArray(array $financements): array

    {

        $infos = [];



        foreach ($financements as $financement) {

            $info = [];

            if ($financement->getAnnee()) {

                if($financement->getDateDebut() && $financement->getDateFin()  && $financement->getDateFin()){

                    $annee = $financement->getDateDebut()->format("Y")."/".$financement->getDateFin()->format("Y");

                }else{

                    $annee = $financement->getAnnee();

                }

                $info["annee"] = $annee;

            }

            if ($origine = $financement->getOrigineFinancement()) {

                if ($this->isOrigineVisible($origine)) {

                    $info["origine"] = $origine->getLibelleLong();

                }

            }

            if ($this->displayComplement && $financement->getComplementFinancement()) {

                $info["complement"] = $financement->getComplementFinancement();

            }

            if ($financement->getQuotiteFinancement()) {

                $info["quotite"] = $financement->getQuotiteFinancement();

            }

            $info["dates"] = $this->formatDates($financement);

            $info["typeFinancement"] = $this->formatTypeFinancement($financement);



            $infos[] = $info;

        }

        return $infos;

    }



    private function isOrigineVisible(OrigineFinancement $origine): bool

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

+2 −2
Changes for module/Application/src/Application/View/Helper/FinancementFormatterHelper.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -44,9 +44,9 @@ class FinancementFormatterHelper extends \Laminas\View\Helper\AbstractHelper 


    /**

     * @param Financement[] $financements

     * @return string

     * @return array|string

     */

    public function format(array $financements): string

    public function format(array $financements): array|string

    {

        return $this->formatter->doFormat($financements);

    }

module/These/src/These/Fieldset/Generalites/GeneralitesFieldset.php

+2 −2
Changes for module/These/src/These/Fieldset/Generalites/GeneralitesFieldset.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -113,8 +113,8 @@ class GeneralitesFieldset extends Fieldset implements InputFilterProviderInterfa 
            'name' => 'confidentialite',

            'options' => [

                'value_options' => [

                    0 => "These non confidentielle ",

                    1 => "Thèse confidentielle ",

                    0 => "Non confidentielle ",

                    1 => "Confidentielle ",

                ],

            ],

            'attributes' => [

module/These/view/these/these-saisie/ajouter.phtml

+11 −11
Changes for module/These/view/these/these-saisie/ajouter.phtml: 11 added lines, 11 removed lines.
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ $form->prepare(); 
    </div>

<?php } ?>



<ul class="nav nav-tabs" id="myTab" role="tablist">

<ul class="nav nav-tabs" role="tablist">

    <li class="nav-item" role="presentation">

        <button class="nav-link active" id="informations-tab" data-bs-toggle="tab" data-bs-target="#informations" type="button" role="tab" aria-controls="informations" aria-selected="true"><?php echo $form->get("generalites")->getLabel();?></button>

    </li>
@@ -50,16 +50,16 @@ $form->prepare(); 
        <button class="nav-link" id="structures-tab" data-bs-toggle="tab" data-bs-target="#structures" type="button" role="tab" aria-controls="structures" aria-selected="false"><?php echo $form->get("structures")->getLabel();?></button>

    </li>

    <li class="nav-item" role="presentation">

        <button class="nav-link" id="specifites-tab" data-bs-toggle="tab" data-bs-target="#specifites" type="button" role="tab" aria-controls="specifites" aria-selected="false">Spécifités envisagées</button>

        <button class="nav-link" id="direction-tab" data-bs-toggle="tab" data-bs-target="#direction" type="button" role="tab" aria-controls="direction" aria-selected="false"><?php echo $form->get("direction")->getLabel();?></button>

    </li>

    <li class="nav-item" role="presentation">

        <button class="nav-link" id="direction-tab" data-bs-toggle="tab" data-bs-target="#direction" type="button" role="tab" aria-controls="direction" aria-selected="false"><?php echo $form->get("direction")->getLabel();?></button>

        <button class="nav-link" id="financement-tab" data-bs-toggle="tab" data-bs-target="#financements" type="button" role="tab" aria-controls="financement" aria-selected="false">Financement</button>

    </li>

    <li class="nav-item" role="presentation">

        <button class="nav-link" id="encadrements-tab" data-bs-toggle="tab" data-bs-target="#encadrements" type="button" role="tab" aria-controls="encadrements" aria-selected="false"><?php echo $form->get("encadrements")->getLabel();?></button>

    </li>

    <li class="nav-item" role="presentation">

        <button class="nav-link" id="financement-tab" data-bs-toggle="tab" data-bs-target="#financements" type="button" role="tab" aria-controls="financement" aria-selected="false">Financement</button>

        <button class="nav-link" id="specifites-tab" data-bs-toggle="tab" data-bs-target="#specifites" type="button" role="tab" aria-controls="specifites" aria-selected="false">Spécifités envisagées</button>

    </li>

</ul>
@@ -69,20 +69,20 @@ $form->prepare(); 
    <div class="tab-pane fade show active" id="informations" role="tabpanel" aria-labelledby="informations-tab">

        <?php echo $this->partial('these/these-saisie/partial/generalites'); ?>

    </div>

    <div class="tab-pane fade" id="direction" role="tabpanel" aria-labelledby="direction-tab">

        <?php echo $this->partial('these/these-saisie/partial/direction'); ?>

    </div>

    <div class="tab-pane fade" id="structures" role="tabpanel" aria-labelledby="structures-tab">

        <?php echo $this->partial('these/these-saisie/partial/structures'); ?>

    </div>

    <div class="tab-pane fade" id="specifites" role="tabpanel" aria-labelledby="specifites-tab">

        <?php echo $this->partial('these/these-saisie/partial/specifites'); ?>

    <div class="tab-pane fade" id="financements" role="tabpanel" aria-labelledby="financements-tab">

        <?php echo $this->partial('these/these-saisie/partial/financements'); ?>

    </div>

    <div class="tab-pane fade" id="encadrements" role="tabpanel" aria-labelledby="encadrements-tab">

        <?php echo $this->partial('these/these-saisie/partial/encadrement'); ?>

    </div>

    <div class="tab-pane fade" id="direction" role="tabpanel" aria-labelledby="direction-tab">

        <?php echo $this->partial('these/these-saisie/partial/direction'); ?>

    </div>

    <div class="tab-pane fade" id="financements" role="tabpanel" aria-labelledby="financements-tab">

        <?php echo $this->partial('these/these-saisie/partial/financements'); ?>

    <div class="tab-pane fade" id="specifites" role="tabpanel" aria-labelledby="specifites-tab">

        <?php echo $this->partial('these/these-saisie/partial/specifites'); ?>

    </div>

</div>

module/These/view/these/these-saisie/modifier.phtml

+10 −10
Changes for module/These/view/these/these-saisie/modifier.phtml: 10 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -52,16 +52,16 @@ $form->prepare(); 
        <button class="nav-link" id="structures-tab" data-bs-toggle="tab" data-bs-target="#structures" type="button" role="tab" aria-controls="structures" aria-selected="false"><?php echo $form->get("structures")->getLabel();?></button>

    </li>

    <li class="nav-item" role="presentation">

        <button class="nav-link" id="specifites-tab" data-bs-toggle="tab" data-bs-target="#specifites" type="button" role="tab" aria-controls="specifites" aria-selected="false">Spécifités envisagées</button>

        <button class="nav-link" id="direction-tab" data-bs-toggle="tab" data-bs-target="#direction" type="button" role="tab" aria-controls="direction" aria-selected="false"><?php echo $form->get("direction")->getLabel();?></button>

    </li>

    <li class="nav-item" role="presentation">

        <button class="nav-link" id="direction-tab" data-bs-toggle="tab" data-bs-target="#direction" type="button" role="tab" aria-controls="direction" aria-selected="false"><?php echo $form->get("direction")->getLabel();?></button>

        <button class="nav-link" id="financement-tab" data-bs-toggle="tab" data-bs-target="#financements" type="button" role="tab" aria-controls="financement" aria-selected="false">Financement</button>

    </li>

    <li class="nav-item" role="presentation">

        <button class="nav-link" id="encadrements-tab" data-bs-toggle="tab" data-bs-target="#encadrements" type="button" role="tab" aria-controls="encadrements" aria-selected="false"><?php echo $form->get("encadrements")->getLabel();?></button>

    </li>

    <li class="nav-item" role="presentation">

        <button class="nav-link" id="financement-tab" data-bs-toggle="tab" data-bs-target="#financements" type="button" role="tab" aria-controls="financement" aria-selected="false">Financement</button>

        <button class="nav-link" id="specifites-tab" data-bs-toggle="tab" data-bs-target="#specifites" type="button" role="tab" aria-controls="specifites" aria-selected="false">Spécifités envisagées</button>

    </li>

</ul>
@@ -79,20 +79,20 @@ echo $this->formHidden($form->get('id')); 
    <div class="tab-pane fade show active" id="informations" role="tabpanel" aria-labelledby="informations-tab">

        <?php echo $this->partial('these/these-saisie/partial/generalites'); ?>

    </div>

    <div class="tab-pane fade" id="direction" role="tabpanel" aria-labelledby="direction-tab">

        <?php echo $this->partial('these/these-saisie/partial/direction'); ?>

    </div>

    <div class="tab-pane fade" id="structures" role="tabpanel" aria-labelledby="structures-tab">

        <?php echo $this->partial('these/these-saisie/partial/structures'); ?>

    </div>

    <div class="tab-pane fade" id="specifites" role="tabpanel" aria-labelledby="specifites-tab">

        <?php echo $this->partial('these/these-saisie/partial/specifites'); ?>

    <div class="tab-pane fade" id="financements" role="tabpanel" aria-labelledby="financements-tab">

        <?php echo $this->partial('these/these-saisie/partial/financements'); ?>

    </div>

    <div class="tab-pane fade" id="encadrements" role="tabpanel" aria-labelledby="encadrements-tab">

        <?php echo $this->partial('these/these-saisie/partial/encadrement'); ?>

    </div>

    <div class="tab-pane fade" id="direction" role="tabpanel" aria-labelledby="direction-tab">

        <?php echo $this->partial('these/these-saisie/partial/direction'); ?>

    </div>

    <div class="tab-pane fade" id="financements" role="tabpanel" aria-labelledby="financements-tab">

        <?php echo $this->partial('these/these-saisie/partial/financements'); ?>

    <div class="tab-pane fade" id="specifites" role="tabpanel" aria-labelledby="specifites-tab">

        <?php echo $this->partial('these/these-saisie/partial/specifites'); ?>

    </div>

</div>