Commit aba7264e authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

[FIX] Correction du filtre Origine de financement ; dédoublonnage des origines... 

[FIX] Correction du filtre Origine de financement ; dédoublonnage des origines en 4 exemplaires (1 par établissement).
parent 4f98f84c

module/Application/src/Application/Search/Financement/OrigineFinancementSearchFilter.php

+1 −1
Changes for module/Application/src/Application/Search/Financement/OrigineFinancementSearchFilter.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ class OrigineFinancementSearchFilter extends SelectSearchFilter 
                ->andWhere('orig.id IS NULL');

        } else {

            $qb

                ->andWhere('orig.id = :origine')

                ->andWhere('orig.code = :origine')

                ->setParameter('origine', $filterValue);

        }

    }

module/Application/src/Application/Service/These/TheseSearchService.php

+7 −1
Changes for module/Application/src/Application/Service/These/TheseSearchService.php: 7 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -375,7 +375,13 @@ EOS; 
    {

        $values = $this->getFinancementService()->getOriginesFinancements("libelleLong");



        return array_filter($values);

        // dédoublonnage (sur le code origine) car chaque établissement pourrait fournir les mêmes données

        $origines = [];

        foreach (array_filter($values) as $origine) {

            $origines[$origine->getCode()] = $origine;

        }



        return $origines;

    }



    private function fetchAnneesInscription(SelectSearchFilter $filter): array