diff --git a/module/DemandeExterne/config/merged/demande-externe.config.php b/module/DemandeExterne/config/merged/demande-externe.config.php index c4f88ce0d745b9fae9a1629192ab4bc0a856d745..2e99395370aa0918a316cd7c0b87b932cf22f550 100644 --- a/module/DemandeExterne/config/merged/demande-externe.config.php +++ b/module/DemandeExterne/config/merged/demande-externe.config.php @@ -40,6 +40,10 @@ return [ DemandeexternePrivileges::DEMANDEEXTERNE_SUPPRIMER, DemandeexternePrivileges::DEMANDEEXTERNE_VALIDER_AGENT, DemandeexternePrivileges::DEMANDEEXTERNE_VALIDER_VALIDEUR, + DemandeexternePrivileges::DEMANDEEXTERNE_VALIDER_GESTIONNAIRE, + DemandeexternePrivileges::DEMANDEEXTERNE_VALIDER_RESPONSABLE, + DemandeexternePrivileges::DEMANDEEXTERNE_VALIDER_DRH, + DemandeexternePrivileges::DEMANDEEXTERNE_VALIDER_DGS, DemandeexternePrivileges::DEMANDEEXTERNE_GERER, ], 'resources' => ['DemandeExterne'], diff --git a/module/DemandeExterne/src/Assertion/DemandeExterneAssertion.php b/module/DemandeExterne/src/Assertion/DemandeExterneAssertion.php index fa24ac8ca0690501192de12ab3f0db504760d37b..346ef17f1711fb49faeda57715088fce6fa200bd 100644 --- a/module/DemandeExterne/src/Assertion/DemandeExterneAssertion.php +++ b/module/DemandeExterne/src/Assertion/DemandeExterneAssertion.php @@ -74,9 +74,6 @@ class DemandeExterneAssertion extends AbstractAssertion switch ($role->getRoleId()) { case AppRoleProvider::ADMIN_TECH : case AppRoleProvider::ADMIN_FONC : - case AppRoleProvider::DRH : - case AppRoleProvider::DGS : - case FormationRoles::GESTIONNAIRE_FORMATION : case FormationRoles::RESPONSABLE_FORMATION : return true; case AgentRoleProvider::ROLE_AGENT : @@ -85,14 +82,28 @@ class DemandeExterneAssertion extends AbstractAssertion case AgentRoleProvider::ROLE_VALIDATEUR : $valideurs = array_map(function (AgentValidateur $a) { return $a->getValidateur(); }, $this->getAgentValidateurService()->getAgentsValidateursByAgent($agent)); $isValideur = DemandeExterneAssertion::userInAgents($user, $valideurs); - switch ($privilege) { - case DemandeexternePrivileges::DEMANDEEXTERNE_VALIDER_VALIDEUR : - return $isValideur and ($demande->isEtatActif(DemandeExterneEtats::ETAT_VALIDATION_AGENT)); - default : - return $isValideur; - } + return match ($privilege) { + DemandeexternePrivileges::DEMANDEEXTERNE_VALIDER_VALIDEUR => $isValideur and ($demande->isEtatActif(DemandeExterneEtats::ETAT_VALIDATION_AGENT)), + default => $isValideur, + }; + case FormationRoles::GESTIONNAIRE_FORMATION : + return match ($privilege) { + DemandeexternePrivileges::DEMANDEEXTERNE_VALIDER_GESTIONNAIRE => $demande->isEtatActif(DemandeExterneEtats::ETAT_VALIDATION_VALIDEUR), + default => true + }; + case AppRoleProvider::DRH : + return match ($privilege) { + DemandeexternePrivileges::DEMANDEEXTERNE_VALIDER_DRH => $demande->isEtatActif(DemandeExterneEtats::ETAT_VALIDATION_RESPONSABLE), + default => true + }; + case AppRoleProvider::DGS : + return match ($privilege) { + DemandeexternePrivileges::DEMANDEEXTERNE_VALIDER_DGS => $demande->isEtatActif(DemandeExterneEtats::ETAT_VALIDATION_DRH), + default => true + }; case RoleProvider::RESPONSABLE : if ($privilege === DemandeexternePrivileges::DEMANDEEXTERNE_MODIFIER and !$demande->isEtatActif(DemandeExterneEtats::ETAT_CREATION_EN_COURS)) return false; + if ($privilege === DemandeexternePrivileges::DEMANDEEXTERNE_VALIDER_RESPONSABLE) return $demande->isEtatActif(DemandeExterneEtats::ETAT_VALIDATION_GESTIONNAIRE); $structures = $this->getAgentService()->computesStructures($agent); $responsables = DemandeExterneAssertion::agentInStructures(RoleProvider::RESPONSABLE, $structures); return DemandeExterneAssertion::userInAgents($user, $responsables); @@ -140,9 +151,18 @@ class DemandeExterneAssertion extends AbstractAssertion 'valider-valideur', 'refuser-valideur' => $this->computeAssertion($entity, DemandeexternePrivileges::DEMANDEEXTERNE_VALIDER_VALIDEUR), + 'valider-gestionnaire', + 'refuser-gestionnaire' + => $this->computeAssertion($entity, DemandeexternePrivileges::DEMANDEEXTERNE_VALIDER_GESTIONNAIRE), + 'valider-responsable', + 'refuser-responsable' + => $this->computeAssertion($entity, DemandeexternePrivileges::DEMANDEEXTERNE_VALIDER_RESPONSABLE), 'valider-drh', 'refuser-drh' => $this->computeAssertion($entity, DemandeexternePrivileges::DEMANDEEXTERNE_VALIDER_DRH), + 'valider-dgs', + 'refuser-dgs' + => $this->computeAssertion($entity, DemandeexternePrivileges::DEMANDEEXTERNE_VALIDER_DGS), default => true, }; } diff --git a/module/Formation/src/Formation/Service/Notification/NotificationService.php b/module/Formation/src/Formation/Service/Notification/NotificationService.php index f2daee31136b62c657d1c2435d336b5dd0fa74d5..4b4f91468d92f79b393adfad1d25af9a95179585 100644 --- a/module/Formation/src/Formation/Service/Notification/NotificationService.php +++ b/module/Formation/src/Formation/Service/Notification/NotificationService.php @@ -285,6 +285,7 @@ class NotificationService $superieurs = $this->getAgentValidateurService()->getAgentsValidateursByAgent($agent); foreach ($superieurs as $superieur) $copie[] = $superieur->getValidateur()->getEmail(); } + $copie = (empty($copie)) ? null : implode(",", $copie); if ($inscrit->getIndividu() !== null AND $inscrit->getIndividu()->getEmail() !== null) { $rendu = $this->getRenduService()->generateRenduByTemplateCode(MailTemplates::SESSION_CONVOCATION, $vars);