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

Merge branch 'feature_export_diplome_acces' into develop

parents c3fef47d 9cd354c6
Loading
Loading
Loading
Loading
+3 −0
Changes for module/Application/src/Application/Controller/ExportController.php: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -58,6 +58,9 @@ class ExportController extends AbstractController
            'Unité de Recherche'                    => function (These $these) { if($these->getUniteRecherche() !== null) return $these->getUniteRecherche()->getLibelle(); else return null; },
            'Etablissement Co-Tutelle'              => function (These $these) { return $these->getLibelleEtabCotutelle(); },
            'Pays Co-Tutelle'                       => function (These $these) { return $these->getLibellePaysCotutelle(); },
            //accession
            'Diplôme d\'accession à la thèse'       => function (These $these) { if($these->getTitreAcces() !== null) return $these->getTitreAcces()->getLibelleTitreAcces(); },
            'Établissement d\'accession à la thèse' => function (These $these) { if($these->getTitreAcces() !== null) return $these->getTitreAcces()->getLibelleEtabTitreAcces(); },
            //Financements
            'Origines du financement'                            => function (These $these) {
                $financements = $these->getFinancements();
+1 −0
Changes for module/Application/src/Application/Service/These/TheseRechercheService.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -322,6 +322,7 @@ class TheseRechercheService
            ->addSelect('r')->leftJoin('a.role', 'r')
            ->addSelect('f')->leftJoin('t.financements', 'f')
            ->addSelect('fi')->leftJoin('t.fichiers', 'fi')
            ->addSelect('ta')->leftJoin('t.titreAcces', 'ta')
//            ->addSelect('ds')->leftJoin('ur.domaines', 'ds')
            ->andWhere('1 = pasHistorise(t)');