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

Ajustement des services

parent 71e1c40e
Loading
Loading
Loading
Loading
+3 −6
Original line number Diff line number Diff line
@@ -71,14 +71,11 @@ class CompetenceService {
    /**
     * @return QueryBuilder
     */
    public function createQueryBuilderForCompetence()
    public function createQueryBuilder()
    {
        $qb = $this->getEntityManager()->getRepository(Competence::class)->createQueryBuilder('competence')
            ->addSelect('type')->leftJoin('competence.type', 'type')
            ->addSelect('theme')->leftJoin('competence.theme', 'theme')
            ->addSelect('createur')->join('competence.histoCreateur', 'createur')
            ->addSelect('modificateur')->join('competence.histoModificateur', 'modificateur')
            ->addSelect('destructeur')->leftJoin('competence.histoDestructeur', 'destructeur')
        ;
        return $qb;
    }
@@ -90,7 +87,7 @@ class CompetenceService {
     */
    public function getCompetences($champ = 'libelle', $order = 'ASC')
    {
        $qb = $this->createQueryBuilderForCompetence()
        $qb = $this->createQueryBuilder()
            ->orderBy('competence.'.$champ, $order)
        ;
        $result = $qb->getQuery()->getResult();
@@ -118,7 +115,7 @@ class CompetenceService {
     */
    public function getCompetence(int $id)
    {
        $qb = $this->createQueryBuilderForCompetence()
        $qb = $this->createQueryBuilder()
            ->andWhere('competence.id = :id')
            ->setParameter('id', $id)
        ;
+3 −0
Original line number Diff line number Diff line
@@ -81,6 +81,9 @@ class ParcoursDeFormationService {
    public function createQueryBuilder()
    {
        $qb = $this->getEntityManager()->getRepository(ParcoursDeFormation::class)->createQueryBuilder('parcours')
            ->addSelect('formation')->leftJoin('parcours.formations', 'formation')
            ->addSelect('groupe')->leftJoin('formation.groupe', 'groupe')
        ;
            ;
        return $qb;
    }