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

Correction du bug de listing des agents ayant un métier

parent 5b8af2e9
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ class MetierService {
        $params = ["metier" => $metier->getId()];
        $sql = <<<EOS
select m.id, m.libelle_default,
       f.id, fp.id, fte.principale, fte.quotite, e.code,
       f.id, fp.id, fte.principale, fte.quotite, et.code,
       a.c_individu, a.prenom, a.nom_usage, 
       g.id as g_id, g.lib_court, ag.d_debut as g_debut, ag.d_fin as g_fin,
       cp.categorie as categorie,
@@ -285,7 +285,9 @@ left join metier_domaine d on md.domaine_id = d.id
left join fichemetier f on m.id = f.metier_id
left join ficheposte_fichemetier fte on f.id = fte.fiche_type
left join ficheposte fp on fte.fiche_poste = fp.id
left join unicaen_etat_etat e on fp.etat_id = e.id
left join ficheposte_etat fpe on fp.id = fpe.ficheposte_id
left join unicaen_etat_instance ei on fpe.etat_id = ei.id
left join unicaen_etat_type et on ei.type_id = et.id
left join agent a on fp.agent = a.c_individu
left join agent_carriere_grade ag on a.c_individu=ag.agent_id
left join carriere_grade g on ag.grade_id = g.id
@@ -300,7 +302,7 @@ and aa.date_debut < current_date and (aa.date_fin IS NULL OR aa.date_fin > curre
and aa.t_principale = 'O'
and (fp.fin_validite IS NULL OR fp.fin_validite >= now())
and fp.histo_destruction IS NULL 
and e.code not in ('FICHE_POSTE_REDACTION')
and et.code not in ('FICHE_POSTE_REDACTION')
order by a.nom_usage, a.prenom
EOS;