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

Merge branch 'NouveauxFiltresThese'

parents 51a72443 36d302ad
Loading
Loading
Loading
Loading
Loading
+3 −0
Changes for module/Application/config/others/these.config.php: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ use Application\Form\Factory\RdvBuTheseDoctorantFormFactory;
use Application\Form\Factory\RdvBuTheseFormFactory;
use Application\Provider\Privilege\ThesePrivileges;
use Application\Service\Acteur\ActeurService;
use Application\Service\Financement\FinancementService;
use Application\Service\Financement\FinancementServiceFactory;
use Application\Service\Message\DiffusionMessages;
use Application\Service\ServiceAwareInitializer;
use Application\Service\These\Factory\TheseObserverServiceFactory;
@@ -976,6 +978,7 @@ return [
            'TheseService'                 => TheseServiceFactory::class,
            'TheseRechercheService'        => TheseRechercheServiceFactory::class,
            'TheseObserverService'         => TheseObserverServiceFactory::class,
            FinancementService::class      => FinancementServiceFactory::class,
        ],
    ],
    'controllers'     => [
+28 −0
Changes for module/Application/src/Application/Entity/Db/Repository/TheseRepository.php: 28 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -62,6 +62,32 @@ class TheseRepository extends DefaultEntityRepository
        return $results;
    }

    /**
     * @param Etablissement|null $etablissement
     * @return int[]
     * @see Year
     */
    public function fetchDistinctAnneesSoutenance(Etablissement $etablissement = null)
    {
        $qb = $this->createQueryBuilder('t');
        $qb
            ->distinct()
            ->select("year(t.dateSoutenance)")
            ->orderBy("year(t.dateSoutenance)");

        if ($etablissement !== null) {
            $qb
                ->join('t.etablissement', 'etab', Join::WITH, 'etab = :etablissement')
                ->setParameter('etablissement', $etablissement);
        }

        $results = array_map(function($value) {
            return current($value);
        }, $qb->getQuery()->getScalarResult());

        return $results;
    }

    /**
     * @param Etablissement|null $etablissement
     * @return string[]
@@ -86,4 +112,6 @@ class TheseRepository extends DefaultEntityRepository

        return $results;
    }


}
 No newline at end of file
+24 −0
Changes for module/Application/src/Application/Service/Financement/FinancementService.php: 24 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

namespace Application\Service\Financement;

use Application\Entity\Db\OrigineFinancement;
use UnicaenApp\Service\EntityManagerAwareTrait;

class FinancementService {
    use EntityManagerAwareTrait;

    /**
     * @param string $order
     * @return OrigineFinancement[]
     */
    public function getOriginesFinancements($order = null)
    {
        $qb = $this->getEntityManager()->getRepository(OrigineFinancement::class)->createQueryBuilder('origine');

        if ($order) $qb = $qb->orderBy('origine.' . $order);

        $result = $qb->getQuery()->getResult();
        return $result;
    }
}
 No newline at end of file
+30 −0
Changes for module/Application/src/Application/Service/Financement/FinancementServiceAwareTrait.php: 30 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

namespace Application\Service\Financement;

trait FinancementServiceAwareTrait {

    /** @var FinancementService */
    private $financementService;

    /**
     * @return FinancementService
     */
    public function getFinancementService()
    {
        return $this->financementService;
    }

    /**
     * @param FinancementService $financementService
     * @return FinancementService
     */
    public function setFinancementService($financementService)
    {
        $this->financementService = $financementService;
        return $this->financementService;
    }



}
 No newline at end of file
+24 −0
Changes for module/Application/src/Application/Service/Financement/FinancementServiceFactory.php: 24 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

namespace Application\Service\Financement;

use Application\Entity\Db\OrigineFinancement;
use Doctrine\ORM\EntityManager;
use UnicaenApp\Service\EntityManagerAwareTrait;
use Zend\ServiceManager\ServiceLocatorInterface;

class FinancementServiceFactory {

    public function __invoke(ServiceLocatorInterface $serviceLocator)
    {

        /** @var EntityManager $entityManager */
        $entityManager = $serviceLocator->get('doctrine.entitymanager.orm_default');

        /** @var FinancementService $service */
        $service = new FinancementService();
        $service->setEntityManager($entityManager);

        return $service;
    }
}
 No newline at end of file
Loading