From ee9ce4230fb3600639c6e0f2937daba59d91f359 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Metivier <jean-philippe.metivier@unicaen.fr>
Date: Fri, 22 Sep 2023 13:32:24 +0200
Subject: [PATCH] ...

---
 .../Controller/DemandeExterneController.php   |  30 ++--
 .../Formation/Entity/Db/FormationInstance.php |  12 +-
 .../DemandeExterne/DemandeExterneService.php  | 141 +++++++++---------
 .../formation/demande-externe/parapheur.phtml |   9 +-
 4 files changed, 102 insertions(+), 90 deletions(-)

diff --git a/module/Formation/src/Formation/Controller/DemandeExterneController.php b/module/Formation/src/Formation/Controller/DemandeExterneController.php
index b5973a23b..0921924ea 100644
--- a/module/Formation/src/Formation/Controller/DemandeExterneController.php
+++ b/module/Formation/src/Formation/Controller/DemandeExterneController.php
@@ -17,6 +17,7 @@ use Formation\Provider\Etat\InscriptionEtats;
 use Formation\Provider\Validation\DemandeExterneValidations;
 use Formation\Service\DemandeExterne\DemandeExterneServiceAwareTrait;
 use Formation\Service\Notification\NotificationServiceAwareTrait;
+use Laminas\Form\Element\Select;
 use Laminas\Http\Request;
 use Laminas\Http\Response;
 use Laminas\Mvc\Controller\AbstractActionController;
@@ -224,17 +225,20 @@ class DemandeExterneController extends AbstractActionController {
         if ($request->isPost()) {
             $data = $request->getPost();
             $form->setData($data);
-            if ($form->isValid()) {
-                if ($demande->getJustificationResponsable() === null) {
+            $justification = $data['HasDescription']['description'];
+//            if ($form->isValid()) {
+//              if ($demande->getJustificationResponsable() === null) {
+            if ($justification === null || trim($justification) === '') {
                     $this->flashMessenger()->addErrorMessage("<strong> Échec de la validation </strong> <br/> Veuillez justifier votre validation !");
                 } else {
                     $this->getValidationInstanceService()->setValidationActive($demande, DemandeExterneValidations::FORMATION_DEMANDE_RESPONSABLE);
+                    $demande->setJustificationResponsable($justification);
                     $this->getDemandeExterneService()->update($demande);
                     $this->flashMessenger()->addSuccessMessage("Validation effectuée.");
                     $this->getNotificationService()->triggerValidationResponsableAgent($demande);
                     $this->getNotificationService()->triggerValidationResponsableDrh($demande);
                 }
-            }
+//            }
         }
 
         $vm =  new ViewModel([
@@ -295,14 +299,12 @@ class DemandeExterneController extends AbstractActionController {
         $request = $this->getRequest();
         if ($request->isPost()) {
             $data = $request->getPost();
-            $form->setData($data);
-            if ($form->isValid()) {
-                $this->getValidationInstanceService()->setValidationActive($demande, DemandeExterneValidations::FORMATION_DEMANDE_DRH);
-                $this->getDemandeExterneService()->update($demande);
-                $this->flashMessenger()->addSuccessMessage("Validation effectuée.");
-                $this->getNotificationService()->triggerValidationDrh($demande);
-                $this->getNotificationService()->triggerValidationComplete($demande);
-            }
+            $justification = $data['HasDescription']['description'];
+            $this->getValidationInstanceService()->setValidationActive($demande, DemandeExterneValidations::FORMATION_DEMANDE_DRH, $justification);
+            $this->getDemandeExterneService()->update($demande);
+            $this->flashMessenger()->addSuccessMessage("Validation effectuée.");
+            $this->getNotificationService()->triggerValidationDrh($demande);
+            $this->getNotificationService()->triggerValidationComplete($demande);
         }
 
         $vm =  new ViewModel([
@@ -416,7 +418,9 @@ class DemandeExterneController extends AbstractActionController {
         $fichier->setNature($devisNature);
         $form = $this->getUploadForm();
         $form->setAttribute('action', $this->url()->fromRoute('formation/demande-externe/ajouter-devis', ['demande-externe' => $demande->getId()], [], true));
-        $form->get('nature')->setValueOptions([$devisNature->getId() => $devisNature->getLibelle()]);
+        /** @var Select $select */
+        $select = $form->get('nature');
+        $select->setValueOptions([$devisNature->getId() => $devisNature->getLibelle()]);
         $form->bind($fichier);
 
 
@@ -433,7 +437,7 @@ class DemandeExterneController extends AbstractActionController {
                 $demande->addDevis($fichier);
                 $this->getDemandeExterneService()->update($demande);
             }
-            return $this->redirect()->toRoute('inscription-formation', [], [], true);
+            return $this->redirect()->toRoute('inscription-externe', [], [], true);
         }
 
         $vm = new ViewModel();
diff --git a/module/Formation/src/Formation/Entity/Db/FormationInstance.php b/module/Formation/src/Formation/Entity/Db/FormationInstance.php
index 63e8f3e3a..5494413f8 100644
--- a/module/Formation/src/Formation/Entity/Db/FormationInstance.php
+++ b/module/Formation/src/Formation/Entity/Db/FormationInstance.php
@@ -252,8 +252,10 @@ class FormationInstance implements HistoriqueAwareInterface, HasSourceInterface,
                     if ($minimum === null or $reversed < $minimum) $minimum = $reversed;
                 }
                 if ($journee->getType() === Seance::TYPE_VOLUME) {
-                    $debut = $journee->getVolumeDebut()->format("Y/m/d");
-                    if ($minimum === null or $debut < $minimum) $minimum = $debut;
+                    if ($journee->getVolumeDebut()) {
+                        $debut = $journee->getVolumeDebut()->format("Y/m/d");
+                        if ($minimum === null or $debut < $minimum) $minimum = $debut;
+                    }
                 }
             }
         }
@@ -279,8 +281,10 @@ class FormationInstance implements HistoriqueAwareInterface, HasSourceInterface,
                     if ($maximum === null or $reversed > $maximum) $maximum = $reversed;
                 }
                 if ($journee->getType() === Seance::TYPE_VOLUME) {
-                    $fin = $journee->getVolumeFin()->format("Y/m/d");
-                    if ($maximum === null or $fin > $maximum) $maximum = $fin;
+                    if ($journee->getVolumeFin()) {
+                        $fin = $journee->getVolumeFin()->format("Y/m/d");
+                        if ($maximum === null or $fin > $maximum) $maximum = $fin;
+                    }
                 }
             }
         }
diff --git a/module/Formation/src/Formation/Service/DemandeExterne/DemandeExterneService.php b/module/Formation/src/Formation/Service/DemandeExterne/DemandeExterneService.php
index 2a807b7ae..034fa4a8c 100644
--- a/module/Formation/src/Formation/Service/DemandeExterne/DemandeExterneService.php
+++ b/module/Formation/src/Formation/Service/DemandeExterne/DemandeExterneService.php
@@ -19,7 +19,6 @@ use Formation\Entity\Db\Seance;
 use Formation\Provider\Etat\DemandeExterneEtats;
 use Formation\Provider\Etat\InscriptionEtats;
 use Formation\Provider\Etat\SessionEtats;
-use Formation\Provider\Validation\DemandeExterneValidations;
 use Formation\Service\Formation\FormationServiceAwareTrait;
 use Formation\Service\FormationGroupe\FormationGroupeServiceAwareTrait;
 use Formation\Service\FormationInstance\FormationInstanceServiceAwareTrait;
@@ -34,12 +33,11 @@ use UnicaenApp\Service\EntityManagerAwareTrait;
 use UnicaenEtat\Entity\Db\EtatType;
 use UnicaenEtat\Service\EtatInstance\EtatInstanceServiceAwareTrait;
 use UnicaenEtat\Service\EtatType\EtatTypeServiceAwareTrait;
-use UnicaenValidation\Entity\Db\ValidationInstance;
-use UnicaenValidation\Entity\Db\ValidationType;
 use UnicaenValidation\Service\ValidationInstance\ValidationInstanceServiceAwareTrait;
 use UnicaenValidation\Service\ValidationType\ValidationTypeServiceAwareTrait;
 
-class DemandeExterneService {
+class DemandeExterneService
+{
     use EntityManagerAwareTrait;
     use EtatInstanceServiceAwareTrait;
     use EtatTypeServiceAwareTrait;
@@ -56,7 +54,7 @@ class DemandeExterneService {
 
     /** GESTION ENTITE ************************************************************************************************/
 
-    public function create(DemandeExterne $demande) : DemandeExterne
+    public function create(DemandeExterne $demande): DemandeExterne
     {
         try {
             $this->getEntityManager()->persist($demande);
@@ -67,7 +65,7 @@ class DemandeExterneService {
         return $demande;
     }
 
-    public function update(DemandeExterne $demande) : DemandeExterne
+    public function update(DemandeExterne $demande): DemandeExterne
     {
         try {
             $this->getEntityManager()->flush($demande);
@@ -77,7 +75,7 @@ class DemandeExterneService {
         return $demande;
     }
 
-    public function historise(DemandeExterne $demande) : DemandeExterne
+    public function historise(DemandeExterne $demande): DemandeExterne
     {
         try {
             $demande->historiser();
@@ -88,7 +86,7 @@ class DemandeExterneService {
         return $demande;
     }
 
-    public function restore(DemandeExterne $demande) : DemandeExterne
+    public function restore(DemandeExterne $demande): DemandeExterne
     {
         try {
             $demande->dehistoriser();
@@ -99,7 +97,7 @@ class DemandeExterneService {
         return $demande;
     }
 
-    public function delete(DemandeExterne $demande) : DemandeExterne
+    public function delete(DemandeExterne $demande): DemandeExterne
     {
         try {
             $this->getEntityManager()->remove($demande);
@@ -112,33 +110,34 @@ class DemandeExterneService {
 
     /** REQUETAGE *****************************************************************************************************/
 
-    public function createQueryBuilder() : QueryBuilder
+    public function createQueryBuilder(): QueryBuilder
     {
         try {
             $qb = $this->getEntityManager()->getRepository(DemandeExterne::class)->createQueryBuilder('demande')
                 ->join('demande.agent', 'agent')->addSelect('agent')
                 ->join('demande.etats', 'etat')->addSelect('etat')
                 ->join('etat.type', 'type')->addSelect('type')
-            ;
+                ->andWhere('etat.histoDestruction IS NULL')
+                ;
         } catch (NotSupported $e) {
-            throw new RuntimeException("Un problème est survenu lors de la création du QueryBuilder de [".DemandeExterne::class."]", 0 ,$e);
+            throw new RuntimeException("Un problème est survenu lors de la création du QueryBuilder de [" . DemandeExterne::class . "]", 0, $e);
         }
         return $qb;
     }
 
-    public function getDemandeExterne(?int $id) : ?DemandeExterne
+    public function getDemandeExterne(?int $id): ?DemandeExterne
     {
         $qb = $this->createQueryBuilder()
-         ->andWhere('demande.id = :id')->setParameter('id', $id);
+            ->andWhere('demande.id = :id')->setParameter('id', $id);
         try {
             $result = $qb->getQuery()->getOneOrNullResult();
         } catch (NonUniqueResultException $e) {
-            throw new RuntimeException("Plusieurs DemandeExterne partagent le même id [".$id."]", 0, $e);
+            throw new RuntimeException("Plusieurs DemandeExterne partagent le même id [" . $id . "]", 0, $e);
         }
         return $result;
     }
 
-    public function getRequestedDemandeExterne(AbstractActionController $controller, string $param = 'demande-externe') : ?DemandeExterne
+    public function getRequestedDemandeExterne(AbstractActionController $controller, string $param = 'demande-externe'): ?DemandeExterne
     {
         $id = $controller->params()->fromRoute($param);
         $result = $this->getDemandeExterne($id);
@@ -150,10 +149,10 @@ class DemandeExterneService {
      * @param string $ordre
      * @return DemandeExterne[]
      */
-    public function getDemandesExternes(string $champ = 'histoCreation', string $ordre = 'ASC') : array
+    public function getDemandesExternes(string $champ = 'histoCreation', string $ordre = 'ASC'): array
     {
         $qb = $this->createQueryBuilder()
-            ->orderBy('demande.'.$champ, $ordre);
+            ->orderBy('demande.' . $champ, $ordre);
         $result = $qb->getQuery()->getResult();
         return $result;
     }
@@ -164,42 +163,42 @@ class DemandeExterneService {
      * @param string $ordre
      * @return array
      */
-    public function getDemandesExternesWithFiltre(array $params, string $champ = 'histoCreation', string $ordre = 'ASC') : array
+    public function getDemandesExternesWithFiltre(array $params, string $champ = 'histoCreation', string $ordre = 'ASC'): array
     {
-        $qb = $this->createQueryBuilder()->orderBy('demande.'.$champ, $ordre);
+        $qb = $this->createQueryBuilder()->orderBy('demande.' . $champ, $ordre);
 
         if (isset($params['agent'])) $qb = $qb->andWhere('demande.agent = :agent')->setParameter('agent', $params['agent']);
-        if (isset($params['organisme']) AND trim($params['organisme'] !== '')) $qb = $qb->andWhere('demande.organisme = :organisme')->setParameter('organisme', $params['organisme']);
-        if (isset($params['etat'])) $qb = $qb->andWhere('etat.type = :etat')->setParameter('etat', $params['etat']);
+        if (isset($params['organisme']) && trim($params['organisme'] !== '')) $qb = $qb->andWhere('demande.organisme = :organisme')->setParameter('organisme', $params['organisme']);
+        if (isset($params['etat'])) $qb = $qb->andWhere('etat.type = :etat')->setParameter('etat', $params['etat'])->andWhere('etat.histoDestruction IS NULL');
         if (isset($params['historise'])) {
             if ($params['historise'] === '1') $qb = $qb->andWhere('demande.histoDestruction IS NOT NULL');
             if ($params['historise'] === '0') $qb = $qb->andWhere('demande.histoDestruction IS NULL');
         }
-        if (isset($params['annee']) AND $params['annee'] !== '') {
-            $annee = (int) $params['annee'];
-            $debut = DateTime::createFromFormat('d/m/Y', '01/09/'.$annee);
-            $fin = DateTime::createFromFormat('d/m/Y', '31/08/'.($annee+1));
+        if (isset($params['annee']) and $params['annee'] !== '') {
+            $annee = (int)$params['annee'];
+            $debut = DateTime::createFromFormat('d/m/Y', '01/09/' . $annee);
+            $fin = DateTime::createFromFormat('d/m/Y', '31/08/' . ($annee + 1));
             $qb = $qb
                 ->andWhere('demande.fin >= :debut')->setParameter('debut', $debut)
-                ->andWhere('demande.debut <= :fin')->setParameter('fin', $fin)
-            ;
+                ->andWhere('demande.debut <= :fin')->setParameter('fin', $fin);
         }
 
         $result = $qb->getQuery()->getResult();
         return $result;
 
     }
+
     /**
      * @param Agent $agent
      * @param string $champ
      * @param string $ordre
      * @return DemandeExterne[]
      */
-    public function getDemandesExternesByAgent(Agent $agent, string $champ = 'histoCreation', string $ordre = 'ASC') : array
+    public function getDemandesExternesByAgent(Agent $agent, string $champ = 'histoCreation', string $ordre = 'ASC'): array
     {
         $qb = $this->createQueryBuilder()
             ->andWhere('demande.agent = :agent')->setParameter('agent', $agent)
-            ->orderBy('demande.'.$champ, $ordre);
+            ->orderBy('demande.' . $champ, $ordre);
         $result = $qb->getQuery()->getResult();
         return $result;
     }
@@ -212,7 +211,7 @@ class DemandeExterneService {
      * @param bool $anneeCourrante
      * @return DemandeExterne[]
      */
-    public function getDemandeByStructure(Structure $structure, bool $avecStructuresFilles = false, bool $anneeCourrante = false) : array
+    public function getDemandeByStructure(Structure $structure, bool $avecStructuresFilles = false, bool $anneeCourrante = false): array
     {
         $structures = [];
         $structures[] = $structure;
@@ -223,7 +222,7 @@ class DemandeExterneService {
         }
 
         $qb = $this->createQueryBuilder()
-            ->addSelect('affectation')->join('agent.affectations','affectation')
+            ->addSelect('affectation')->join('agent.affectations', 'affectation')
             ->andWhere('affectation.structure in (:structures)')
             ->setParameter('structures', $structures)
             ->andWhere('demande.histoDestruction IS NULL')
@@ -234,29 +233,27 @@ class DemandeExterneService {
         if ($anneeCourrante) {
             $annee = Formation::getAnnee();
             $mini = DateTime::createFromFormat('d/m/Y', '01/09/' . $annee);
-            $maxi = DateTime::createFromFormat('d/m/Y', '31/08/' . ($annee+1));
+            $maxi = DateTime::createFromFormat('d/m/Y', '31/08/' . ($annee + 1));
 
             $qb = $qb->andWhere('demande.histoCreation >= :mini AND demande.histoCreation <= :maxi')
                 ->setParameter('mini', $mini)
-                ->setParameter('maxi', $maxi)
-            ;
+                ->setParameter('maxi', $maxi);
         }
 
         $result = $qb->getQuery()->getResult();
         return $result;
     }
 
-    public function getDemandesExternesByAgentsAndAnnee(array $agents, ?int $annee = null) : array
+    public function getDemandesExternesByAgentsAndAnnee(array $agents, ?int $annee = null): array
     {
         if ($annee === null) $annee = Formation::getAnnee();
-        $debut = DateTime::createFromFormat('d/m/Y H:i', '01/09/'.$annee.' 08:00');
-        $fin = DateTime::createFromFormat('d/m/Y H:i', '31/08/'.($annee+1).' 18:00');
+        $debut = DateTime::createFromFormat('d/m/Y H:i', '01/09/' . $annee . ' 08:00');
+        $fin = DateTime::createFromFormat('d/m/Y H:i', '31/08/' . ($annee + 1) . ' 18:00');
 
         $qb = $this->createQueryBuilder()->orderBy('demande.histoCreation', 'asc')
             ->andWhere('demande.agent in (:agents)')->setParameter('agents', $agents)
             ->andWhere('demande.histoCreation >= :debut')->setParameter('debut', $debut)
-            ->andWhere('demande.histoCreation <= :fin')->setParameter('fin', $fin)
-        ;
+            ->andWhere('demande.histoCreation <= :fin')->setParameter('fin', $fin);
         /** @var FormationInstanceInscrit[] $result */
         $result = $qb->getQuery()->getResult();
 
@@ -274,11 +271,11 @@ class DemandeExterneService {
      * @param string $texte
      * @return Agent[]
      */
-    public function findAgentByTerm(string $texte) : array
+    public function findAgentByTerm(string $texte): array
     {
         $qb = $this->createQueryBuilder()
             ->andWhere("LOWER(CONCAT(agent.prenom, ' ', agent.nomUsuel)) like :search OR LOWER(CONCAT(agent.nomUsuel, ' ', agent.prenom)) like :search")
-            ->setParameter('search', '%'.strtolower($texte).'%');
+            ->setParameter('search', '%' . strtolower($texte) . '%');
         $result = $qb->getQuery()->getResult();
 
         $agents = [];
@@ -294,11 +291,11 @@ class DemandeExterneService {
      * @param string $texte
      * @return Agent[]
      */
-    public function findOrganismeByTerm(string $texte) : array
+    public function findOrganismeByTerm(string $texte): array
     {
         $qb = $this->createQueryBuilder()
             ->andWhere("LOWER(demande.organisme) like :search")
-            ->setParameter('search', '%'.strtolower($texte).'%');
+            ->setParameter('search', '%' . strtolower($texte) . '%');
         $result = $qb->getQuery()->getResult();
 
         $organismes = [];
@@ -309,7 +306,7 @@ class DemandeExterneService {
         return $organismes;
     }
 
-    public function transformer(?DemandeExterne $demande, string $libelle, float $volume, float $suivi) : FormationInstance
+    public function transformer(?DemandeExterne $demande, string $libelle, float $volume, float $suivi): FormationInstance
     {
         //theme
         $theme = $this->getFormationGroupeService()->getFormationGroupeByLibelle("Stage externe");
@@ -317,18 +314,22 @@ class DemandeExterneService {
             $theme = new FormationGroupe();
             $theme->setLibelle('Stage externe');
             $theme->setOrdre(99999999);
-            //source ... todo
+            $theme->setSource(HasSourceInterface::SOURCE_EMC2);
             $this->getFormationGroupeService()->create($theme);
+            $theme->setIdSource($theme->getId());
+            $this->getFormationGroupeService()->update($theme);
         }
 
         //creation de l'action de formation
         $formation = new Formation();
         $formation->setLibelle($libelle);
         $formation->setGroupe($theme);
-        $formation->setDescription("Action de formation générée depuis la demande ".$demande->getId());
+        $formation->setDescription("Action de formation générée depuis la demande " . $demande->getId());
         $formation->setAffichage(false);
-        //source ... todo
+        $theme->setSource(HasSourceInterface::SOURCE_EMC2);
         $this->getFormationService()->create($formation);
+        $theme->setIdSource($formation->getId());
+        $this->getFormationService()->update($formation);
 
         //session
         $session = new FormationInstance();
@@ -340,6 +341,7 @@ class DemandeExterneService {
         $session->setSource(HasSourceInterface::SOURCE_EMC2);
         $this->getFormationInstanceService()->create($session);
         $this->getEtatInstanceService()->setEtatActif($session, SessionEtats::ETAT_CLOTURE_INSTANCE);
+        $session->setIdSource($formation->getId() . "-" . $session->getId());
         $this->getFormationInstanceService()->update($session);
 
         //inscription
@@ -354,15 +356,19 @@ class DemandeExterneService {
 
         $absence = $volume - $suivi;
 
-        if ($suivi !== 0) {
+        if ($suivi != 0) {
             //seance
             $seance = new Seance();
             $seance->setInstance($session);
             $seance->setVolume($suivi);
             $seance->setLieu("");
             $seance->setType(Seance::TYPE_VOLUME);
-            //source ... todo
+            $seance->setVolumeDebut($demande->getDebut());
+            $seance->setVolumeFin($demande->getFin());
+            $inscription->setSource(HasSourceInterface::SOURCE_EMC2);
             $this->getSeanceService()->create($seance);
+            $seance->setIdSource($formation->getId() . "-" . $session->getId() . "-" . $seance->getId());
+            $this->getSeanceService()->update($seance);
 
             //presence true
             $presence = new Presence();
@@ -374,7 +380,7 @@ class DemandeExterneService {
             $this->getPresenceService()->create($presence);
         }
 
-        if ($absence !== 0) {
+        if ($absence != 0) {
             //seance
             $seance = new Seance();
             $seance->setInstance($session);
@@ -403,25 +409,18 @@ class DemandeExterneService {
      * @param int|null $annee
      * @return DemandeExterne[]
      */
-    public function getDemandesExternesValideesByAgentsAndEtats(array $agents, array $etats, ?int $annee) : array
+    public function getDemandesExternesValideesByAgentsAndEtats(array $agents, array $etats, ?int $annee): array
     {
         if ($annee === null) Formation::getAnnee();
-        $debut = DateTime::createFromFormat('d/m/Y', '01/09/'.$annee);
-        $fin   = DateTime::createFromFormat('d/m/Y', '31/08/'.($annee+1));
+        $debut = DateTime::createFromFormat('d/m/Y', '01/09/' . $annee);
+        $fin = DateTime::createFromFormat('d/m/Y', '31/08/' . ($annee + 1));
 
-        try {
-//            $qb = $this->getEntityManager()->getRepository(DemandeExterne::class)->createQueryBuilder('demande')
-//                ->join('demande.etat', 'etat')->addSelect('etat')
-//                ->join('demande.agent', 'agent')->addSelect('agent')
-            $qb = $this->createQueryBuilder()
-                ->andWhere('demande.histoDestruction IS NULL')
-                ->andWhere('type.code in (:etats)')->setParameter('etats', $etats)
-                ->andWhere('demande.debut > :debut')->setParameter('debut', $debut)
-                ->andWhere('demande.debut < :fin')->setParameter('fin', $fin)
-                ->andWhere('agent in (:agents)')->setParameter('agents', $agents);
-        } catch (NotSupported $e) {
-            throw new RuntimeException("Un problème est survenu lors de la création du QueryBuilder de [".DemandeExterne::class."]", 0 ,$e);
-        }
+        $qb = $this->createQueryBuilder()
+            ->andWhere('demande.histoDestruction IS NULL')
+            ->andWhere('type.code in (:etats)')->setParameter('etats', $etats)
+            ->andWhere('demande.debut > :debut')->setParameter('debut', $debut)
+            ->andWhere('demande.debut < :fin')->setParameter('fin', $fin)
+            ->andWhere('agent in (:agents)')->setParameter('agents', $agents);
 
         $result = $qb->getQuery()->getResult();
         return $result;
@@ -432,9 +431,9 @@ class DemandeExterneService {
      * @param int|null $annee
      * @return DemandeExterne[]
      */
-    public function getDemandesExternesValideesByAgents(array $agents, ?int $annee) : array
+    public function getDemandesExternesValideesByAgents(array $agents, ?int $annee): array
     {
-        $etats = [ DemandeExterneEtats::ETAT_VALIDATION_DRH, DemandeExterneEtats::ETAT_REJETEE, DemandeExterneEtats::ETAT_TERMINEE];
+        $etats = [DemandeExterneEtats::ETAT_VALIDATION_DRH, DemandeExterneEtats::ETAT_REJETEE, DemandeExterneEtats::ETAT_TERMINEE];
         $result = $this->getDemandesExternesValideesByAgentsAndEtats($agents, $etats, $annee);
         return $result;
     }
@@ -444,9 +443,9 @@ class DemandeExterneService {
      * @param int|null $annee
      * @return DemandeExterne[]
      */
-    public function getDemandesExternesNonValideesByAgents(array $agents, ?int $annee) : array
+    public function getDemandesExternesNonValideesByAgents(array $agents, ?int $annee): array
     {
-        $etats = [ DemandeExterneEtats::ETAT_VALIDATION_AGENT, DemandeExterneEtats::ETAT_VALIDATION_RESP ];
+        $etats = [DemandeExterneEtats::ETAT_VALIDATION_AGENT, DemandeExterneEtats::ETAT_VALIDATION_RESP];
         $result = $this->getDemandesExternesValideesByAgentsAndEtats($agents, $etats, $annee);
         return $result;
     }
diff --git a/module/Formation/view/formation/demande-externe/parapheur.phtml b/module/Formation/view/formation/demande-externe/parapheur.phtml
index bd6626485..27495d8ee 100644
--- a/module/Formation/view/formation/demande-externe/parapheur.phtml
+++ b/module/Formation/view/formation/demande-externe/parapheur.phtml
@@ -46,7 +46,9 @@ $canValider     = $this->isAllowed(DemandeexternePrivileges::getResourceId(Deman
             <td> <?php echo $demande->getAgent()->getDenomination(); ?> </td>
             <td> <?php echo $demande->getInstance()->getFormation()->getLibelle(); ?> </td>
             <td> <?php echo $demande->getInstance()->getType(); ?> </td>
-            <td> <?php echo $this->etatinstance($demande->getEtatActif()); ?> </td>
+            <td> <?php
+                echo $this->etatinstance($demande->getEtatActif());
+                ?> </td>
             <td class="action">
                 <?php if ($canAfficher) : ?>
                     <?php /** @see \Formation\Controller\FormationInstanceInscritController::afficherAgentAction() */ ?>
@@ -120,7 +122,10 @@ $canValider     = $this->isAllowed(DemandeexternePrivileges::getResourceId(Deman
             <td> <?php echo $demande->getAgent()->getDenomination(); ?> </td>
             <td> <?php echo $demande->getLibelle(); ?> </td>
             <td> <?php echo $demande->getOrganisme(); ?> </td>
-            <td> <?php echo $this->etatinstance($demande->getEtatActif()); ?> </td>
+            <td>
+                <?php
+                echo $this->etatinstance($demande->getEtatActif());
+                ?> </td>
             <td class="action">
                 <?php if ($canAfficher) : ?>
                     <?php /** @see \Formation\Controller\DemandeExterneController::afficherAction() */ ?>
-- 
GitLab