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

retraits des agents des structures

parent ea017960

module/Application/src/Application/Service/Agent/AgentService.php

+2 −2
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ class AgentService { 
            ->andWhere('statut.fin >= :today OR statut.fin IS NULL')

            ->andWhere('grade.dateFin >= :today OR grade.dateFin IS NULL')

//            ->andWhere('statut.administratif = :true')

            ->andWhere('statut.enseignant = :false AND statut.chercheur = :false AND statut.etudiant = :false')

            ->andWhere('statut.enseignant = :false AND statut.chercheur = :false AND statut.etudiant = :false AND statut.retraite = :false')

            //->andWhere('fiche.id IS NULL')

            ->setParameter('today', $today)

            ->setParameter('true', 'O')
@@ -276,7 +276,7 @@ class AgentService { 
            ->andWhere('statut.fin >= :today OR statut.fin IS NULL')

            ->andWhere('statut.dispo = :false')

//            ->andWhere('statut.administratif = :true')

            ->andWhere('statut.enseignant = :false AND statut.chercheur = :false AND statut.etudiant = :false')

            ->andWhere('statut.enseignant = :false AND statut.chercheur = :false AND statut.etudiant = :false AND statut.retraite = :false')

            ->andWhere('grade.dateFin >= :today OR grade.dateFin IS NULL')

            ->andWhere('affectation.dateFin >= :today OR affectation.dateFin IS NULL')

            ->andWhere('affectation.principale = :true')