Skip to content
Snippets Groups Projects
Commit 0d67c435 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Some fixes

parent 9d803fae
No related branches found
No related tags found
No related merge requests found
......@@ -74,12 +74,12 @@ class IndividuService {
* @param string $term
* @return Individu[]
*/
public function getEtudiantsByTerm($term, $sourceCode = null)
public function getEtudiantsByTerm($term)
{
$qb = $this->getEntityManager()->getRepository(Individu::class)->createQueryBuilder('individu')
->join('individu.affectations', 'affectation')
->andWhere('LOWER(CONCAT(individu.nomUsage, \' \' , individu.prenom, \' \', individu.nomUsage, \' \'))
OR LOWER(CONCAT(individu.nomFamille, \' \' , individu.prenom, \' \', individu.nomFamille, \' \'))
->andWhere('LOWER(CONCAT(individu.nomUsage, \' \' , individu.prenom, \' \', individu.nomUsage, \' \')) LIKE :search
OR LOWER(CONCAT(individu.nomFamille, \' \' , individu.prenom, \' \', individu.nomFamille, \' \')) LIKE :search
OR individu.cEtu LIKE :term
')
->andWhere('affectation.type = :type')
......@@ -89,7 +89,6 @@ class IndividuService {
->orderBy('individu.nomUsage, individu.prenom')
;
$result = $qb->getQuery()->getResult();
return $result;
}
......@@ -101,11 +100,8 @@ class IndividuService {
public function getEtudiantByNumero($numeroEtudiant)
{
$qb = $this->getEntityManager()->getRepository(Individu::class)->createQueryBuilder('individu')
->addSelect('source')->join('individu.cSource', 'source')
->andWhere('individu.cEtu = :numero')
->andWhere('source.cSource = :sourceCode')
->setParameter('numero', $numeroEtudiant)
->setParameter('sourceCode', Source::SOURCE_APOGEE)
;
try {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment