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

Ordre alpha

parent 55d7a6b0

module/Application/src/Application/Entity/Db/Agent.php

+1 −1
Changes for module/Application/src/Application/Entity/Db/Agent.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ class Agent implements 
        $prenom = $this->getPrenom();

        $prenom = str_replace("É", "é", $prenom);

        $prenom = str_replace("È", "è", $prenom);

        return ucwords(strtolower($prenom), "- ") . ' ' . ($this->getNomUsuel())??('<em>'.$this->getNomFamille().'</em>');

        return ucwords(strtolower($prenom), "- ") . ' ' . (($this->getNomUsuel())??$this->getNomFamille());



    }

module/Structure/src/Structure/Controller/StructureController.php

+2 −2
Changes for module/Structure/src/Structure/Controller/StructureController.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -194,8 +194,8 @@ class StructureController extends AbstractActionController { 
        $allAgents = array_merge($agents, $agentsForces);



        usort($agents, function (Agent $a, Agent $b) {

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

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

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

           $bbb = ($b->getNomUsuel()??$a->getNomFamille())." ".$b->getPrenom();

           return $aaa > $bbb;

        });

        $superieurs = []; $autorites = [];