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

Changement de la méthode de récup des agents ==> EPro

parent 27f2b733

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

+4 −4
Original line number Diff line number Diff line
@@ -235,8 +235,8 @@ class AgentService { 
            ->andWhere('affectation.deleted_on IS NULL')

            //STATUS

            ->addSelect('statut')->leftjoin('agent.statuts', 'statut')

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

            ->andWhere('statut.dateDebut <= :today')

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

//            ->andWhere('statut.dateDebut <= :today')

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

//            ->andWhere('(statut.enseignant = :false AND statut.chercheur = :false AND statut.etudiant = :false AND statut.retraite = :false AND (statut.detacheOut = :false OR (statut.detacheOut = :true AND statut.detacheIn = :true)) AND statut.vacataire = :false)')

            ->andWhere('(statut.enseignant = :false AND statut.chercheur = :false AND statut.retraite = :false AND (statut.detacheOut = :false OR (statut.detacheOut = :true AND statut.detacheIn = :true)) AND statut.vacataire = :false)')
@@ -247,8 +247,8 @@ class AgentService { 
            ->addSelect('ggrade')->leftjoin('grade.grade', 'ggrade')

            ->addSelect('gcorrespondance')->leftjoin('grade.bap', 'gcorrespondance')

            ->addSelect('gcorps')->leftjoin('grade.corps', 'gcorps')

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

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

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

//            ->andWhere('grade.dateDebut <= :today OR grade.dateDebut IS NULL')

            ->andWhere('grade.deleted_on IS NULL')

            //FICHE DE POSTE

            ->addSelect('ficheposte')->leftJoin('agent.fiches', 'ficheposte')

module/Structure/view/structure/structure/partial/precedente.phtml

+5 −0
Original line number Diff line number Diff line
@@ -41,6 +41,11 @@ use Structure\Entity\Db\Structure; 
<h2> Entretiens professionnels des agents actuellements dans la structure </h2>



<?php

    usort($entretiens, function (EntretienProfessionnel $a, EntretienProfessionnel $b) {

       $aaa = $a->getAgent()->getNomUsuel() . " " . $a->getAgent()->getPrenom();

       $bbb = $b->getAgent()->getNomUsuel() . " " . $b->getAgent()->getPrenom();

       return $aaa > $bbb;

    });

    echo $this->entretienProfessionnelArray($entretiens, [

        'affichages' => ['annee' => false, 'structure' => true, 'lieu' => false, 'width' => '8rem'],

        'droits' => ['modifier' => false, 'sursis' => false, 'historiser' => false, 'supprimer' => false],

public/css/app.css

+10 −0
Original line number Diff line number Diff line 
.unistrap.unistrap-th-cata {

    --unistrap-color-main: #273c83;

    --unistrap-color-light: #eaeefd;

    --unistrap-color-dark: #18285c;

    --bs-link-color: #273c83;

    --unistrap-color-main: #273c83;

    --unistrap-color-light: #eaeefd;

    --unistrap-color-dark: #18285c;

    --bs-link-color: #273c83;

}



/** MODAL *************************************************************************************************************/