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

Merge branch 'Fix-FiltrageThese'

parents 9f5fb5b1 512f2ffc
Loading
Loading
Loading
Loading
+1 −1
Changes for module/Application/src/Application/Controller/TheseController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ class TheseController extends AbstractController
            'theses' => $paginator,
            'text'   => $text,
            'roleDirecteurThese' => $this->roleService->getRepository()->findOneBy(['sourceCode' => Role::CODE_DIRECTEUR_THESE]),
            'etablissements' => $this->etablissementService->getEtablissements(),
            'etablissements' => $this->etablissementService->getEtablissementsBySource("COMUE::SYGAL"),
        ]);
    }

+7 −0
Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Etablissement.dcm.xml: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -25,6 +25,13 @@
            </cascade>
        </one-to-one>

        <many-to-one field="source" target-entity="UnicaenImport\Entity\Db\Source">
            <join-columns>
                <join-column name="SOURCE_ID" referenced-column-name="ID"/>
            </join-columns>
        </many-to-one>


        <field name="histoCreation" type="datetime" column="HISTO_CREATION" nullable="false"/>
        <field name="histoDestruction" type="datetime" column="HISTO_DESTRUCTION" nullable="true"/>
        <field name="histoModification" type="datetime" column="HISTO_MODIFICATION" nullable="false"/>
+15 −0
Changes for module/Application/src/Application/Service/Etablissement/EtablissementService.php: 15 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -31,6 +31,21 @@ class EtablissementService extends BaseService
        return $etablissments;
    }

    /**
     * @param string source
     * @return Etablissement[]
     */
    public function getEtablissementsBySource($source) {
        $qb = $this->entityManager->getRepository(Etablissement::class)->createQueryBuilder("e")
            ->join("e.source", "s")
            ->andWhere("s.code = :source")
            ->setParameter("source", $source);

        /** @var Etablissement[] $etablissments */
        $etablissments = $qb->getQuery()->execute();
        return $etablissments;
    }

    /**
     * @param int $id
     * @return null|Etablissement