Loading module/Formation/src/Formation/Entity/Db/StagiaireExterne.php +5 Changes for module/Formation/src/Formation/Entity/Db/StagiaireExterne.php: 5 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -111,4 +111,9 @@ class StagiaireExterne implements HistoriqueAwareInterface { return $this->getPrenom().' '.$this->getNom(); } public function generateTag(): string { return "STAGIARE_" . $this->getId(); } } No newline at end of file module/Formation/src/Formation/Service/FormationInstance/FormationInstanceService.php +11 −1 Changes for module/Formation/src/Formation/Service/FormationInstance/FormationInstanceService.php: 11 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -328,8 +328,12 @@ class FormationInstanceService { $this->getEtatInstanceService()->setEtatActif($instance,SessionEtats::ETAT_FORMATION_CONVOCATION); $this->update($instance); // Enovyer convocation aux agents en liste principale foreach ($instance->getListePrincipale() as $inscrit) { $this->getNotificationService()->triggerConvocation($inscrit); if ($inscrit->estNonHistorise()) $this->getNotificationService()->triggerConvocation($inscrit); } foreach ($instance->getInscriptionsExternes() as $inscrit) { if ($inscrit->estNonHistorise()) $this->getNotificationService()->triggerConvocation($inscrit); } return $instance; } Loading Loading @@ -357,6 +361,9 @@ class FormationInstanceService foreach ($instance->getListePrincipale() as $inscrit) { $this->getNotificationService()->triggerDemandeRetour($inscrit); } foreach ($instance->getInscriptionsExternes() as $inscrit) { $this->getNotificationService()->triggerDemandeRetour($inscrit); } return $instance; } Loading Loading @@ -386,6 +393,9 @@ class FormationInstanceService $abonnement = $this->getAbonnementService()->getAbonnementByAgentAndFormation($agent, $formation); if ($abonnement === null) $this->getAbonnementService()->ajouterAbonnement($agent, $formation); } foreach ($instance->getInscriptionsExternes() as $inscrit) { $this->getNotificationService()->triggerSessionAnnulee($inscrit); } return $instance; } Loading module/Formation/src/Formation/Service/Notification/NotificationService.php +44 −11 Changes for module/Formation/src/Formation/Service/Notification/NotificationService.php: 44 added lines, 11 removed lines. Original line number Diff line number Diff line Loading @@ -17,6 +17,7 @@ use Formation\Provider\Parametre\FormationParametres; use Formation\Provider\Role\FormationRoles; use Formation\Provider\Template\MailTemplates; use Formation\Service\Url\UrlServiceAwareTrait; use RuntimeException; use UnicaenMail\Entity\Db\Mail; use UnicaenMail\Service\Mail\MailServiceAwareTrait; use UnicaenParametre\Service\Parametre\ParametreServiceAwareTrait; Loading Loading @@ -249,29 +250,47 @@ class NotificationService { return $mail; } public function triggerConvocation(FormationInstanceInscrit $inscrit) : ?Mail public function triggerConvocation(FormationInstanceInscrit|InscriptionExterne $inscrit) : ?Mail { $instance = $inscrit->getInstance(); $instance = null; if ($instance instanceof FormationInstanceInscrit) $instance = $inscrit->getInstance(); if ($inscrit instanceof InscriptionExterne) $instance = $inscrit->getSession(); if ($instance === null) throw new RuntimeException("Aucune session d'identifié pour cette inscription"); if (!$instance->isMailActive()) return null; $agent = null; if ($inscrit instanceof FormationInstanceInscrit) $agent = $inscrit->getAgent(); if ($inscrit instanceof InscriptionExterne) $agent = $inscrit->getStagiaire(); if ($agent === null) throw new RuntimeException("Aucune personne d'identifié·e pour cette inscription"); $vars = [ 'session' => $instance, 'agent' => $inscrit->getAgent(), 'agent' => $agent, 'MacroService' => $this->getMacroService(), 'UrlService' => $this->getUrlService() ]; $rendu = $this->getRenduService()->generateRenduByTemplateCode(MailTemplates::SESSION_CONVOCATION, $vars); $mail = $this->getMailService()->sendMail($inscrit->getAgent()->getEmail(), $rendu->getSujet(), $rendu->getCorps(), 'Formation'); $mail = $this->getMailService()->sendMail($agent->getEmail(), $rendu->getSujet(), $rendu->getCorps(), 'Formation'); $mail->setMotsClefs([$instance->generateTag(), $rendu->getTemplate()->generateTag()]); $this->getMailService()->update($mail); return $mail; } public function triggerDemandeRetour(FormationInstanceInscrit $inscrit) : ?Mail public function triggerDemandeRetour(FormationInstanceInscrit|InscriptionExterne $inscrit) : ?Mail { $instance = $inscrit->getInstance(); if (!$instance->isMailActive() OR !$instance->isEnqueteActive()) return null; $instance = null; if ($instance instanceof FormationInstanceInscrit) $instance = $inscrit->getInstance(); if ($inscrit instanceof InscriptionExterne) $instance = $inscrit->getSession(); if ($instance === null) throw new RuntimeException("Aucune session d'identifié pour cette inscription"); if (!$instance->isMailActive()) return null; $agent = null; if ($inscrit instanceof FormationInstanceInscrit) $agent = $inscrit->getAgent(); if ($inscrit instanceof InscriptionExterne) $agent = $inscrit->getStagiaire(); if ($agent === null) throw new RuntimeException("Aucune personne d'identifié·e pour cette inscription"); $vars = [ 'session' => $instance, Loading @@ -287,11 +306,19 @@ class NotificationService { return $mail; } public function triggerSessionAnnulee(FormationInstanceInscrit $inscrit) : ?Mail public function triggerSessionAnnulee(FormationInstanceInscrit|InscriptionExterne $inscrit) : ?Mail { $instance = $inscrit->getInstance(); $instance = null; if ($instance instanceof FormationInstanceInscrit) $instance = $inscrit->getInstance(); if ($inscrit instanceof InscriptionExterne) $instance = $inscrit->getSession(); if ($instance === null) throw new RuntimeException("Aucune session d'identifié pour cette inscription"); if (!$instance->isMailActive()) return null; $agent = null; if ($inscrit instanceof FormationInstanceInscrit) $agent = $inscrit->getAgent(); if ($inscrit instanceof InscriptionExterne) $agent = $inscrit->getStagiaire(); if ($agent === null) throw new RuntimeException("Aucune personne d'identifié·e pour cette inscription"); $vars = [ 'session' => $instance, 'agent' => $inscrit->getAgent(), Loading Loading @@ -326,9 +353,8 @@ class NotificationService { /** Mails de rappel ***********************************************************************************************/ public function triggerRappelAgentAvantFormation(FormationInstance $instance) : array public function triggerRappelAgentAvantFormation(FormationInstance $instance) : ?array { if (!$instance->isMailActive()) return []; $vars = [ 'session' => $instance, 'UrlService' => $this->getUrlService(), Loading @@ -344,6 +370,13 @@ class NotificationService { $this->getMailService()->update($mail); $mails[] = $mail; } foreach ($instance->getInscriptionsExternes() as $inscrit) { $agent = $inscrit->getStagiaire(); $mail = $this->getMailService()->sendMail($agent->getEmail(), $rendu->getSujet(), $rendu->getCorps(), 'Formation'); $mail->setMotsClefs([$instance->generateTag(), $rendu->getTemplate()->generateTag(), $agent->generateTag() ]); $this->getMailService()->update($mail); $mails[] = $mail; } return $mails; } Loading Loading
module/Formation/src/Formation/Entity/Db/StagiaireExterne.php +5 Changes for module/Formation/src/Formation/Entity/Db/StagiaireExterne.php: 5 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -111,4 +111,9 @@ class StagiaireExterne implements HistoriqueAwareInterface { return $this->getPrenom().' '.$this->getNom(); } public function generateTag(): string { return "STAGIARE_" . $this->getId(); } } No newline at end of file
module/Formation/src/Formation/Service/FormationInstance/FormationInstanceService.php +11 −1 Changes for module/Formation/src/Formation/Service/FormationInstance/FormationInstanceService.php: 11 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -328,8 +328,12 @@ class FormationInstanceService { $this->getEtatInstanceService()->setEtatActif($instance,SessionEtats::ETAT_FORMATION_CONVOCATION); $this->update($instance); // Enovyer convocation aux agents en liste principale foreach ($instance->getListePrincipale() as $inscrit) { $this->getNotificationService()->triggerConvocation($inscrit); if ($inscrit->estNonHistorise()) $this->getNotificationService()->triggerConvocation($inscrit); } foreach ($instance->getInscriptionsExternes() as $inscrit) { if ($inscrit->estNonHistorise()) $this->getNotificationService()->triggerConvocation($inscrit); } return $instance; } Loading Loading @@ -357,6 +361,9 @@ class FormationInstanceService foreach ($instance->getListePrincipale() as $inscrit) { $this->getNotificationService()->triggerDemandeRetour($inscrit); } foreach ($instance->getInscriptionsExternes() as $inscrit) { $this->getNotificationService()->triggerDemandeRetour($inscrit); } return $instance; } Loading Loading @@ -386,6 +393,9 @@ class FormationInstanceService $abonnement = $this->getAbonnementService()->getAbonnementByAgentAndFormation($agent, $formation); if ($abonnement === null) $this->getAbonnementService()->ajouterAbonnement($agent, $formation); } foreach ($instance->getInscriptionsExternes() as $inscrit) { $this->getNotificationService()->triggerSessionAnnulee($inscrit); } return $instance; } Loading
module/Formation/src/Formation/Service/Notification/NotificationService.php +44 −11 Changes for module/Formation/src/Formation/Service/Notification/NotificationService.php: 44 added lines, 11 removed lines. Original line number Diff line number Diff line Loading @@ -17,6 +17,7 @@ use Formation\Provider\Parametre\FormationParametres; use Formation\Provider\Role\FormationRoles; use Formation\Provider\Template\MailTemplates; use Formation\Service\Url\UrlServiceAwareTrait; use RuntimeException; use UnicaenMail\Entity\Db\Mail; use UnicaenMail\Service\Mail\MailServiceAwareTrait; use UnicaenParametre\Service\Parametre\ParametreServiceAwareTrait; Loading Loading @@ -249,29 +250,47 @@ class NotificationService { return $mail; } public function triggerConvocation(FormationInstanceInscrit $inscrit) : ?Mail public function triggerConvocation(FormationInstanceInscrit|InscriptionExterne $inscrit) : ?Mail { $instance = $inscrit->getInstance(); $instance = null; if ($instance instanceof FormationInstanceInscrit) $instance = $inscrit->getInstance(); if ($inscrit instanceof InscriptionExterne) $instance = $inscrit->getSession(); if ($instance === null) throw new RuntimeException("Aucune session d'identifié pour cette inscription"); if (!$instance->isMailActive()) return null; $agent = null; if ($inscrit instanceof FormationInstanceInscrit) $agent = $inscrit->getAgent(); if ($inscrit instanceof InscriptionExterne) $agent = $inscrit->getStagiaire(); if ($agent === null) throw new RuntimeException("Aucune personne d'identifié·e pour cette inscription"); $vars = [ 'session' => $instance, 'agent' => $inscrit->getAgent(), 'agent' => $agent, 'MacroService' => $this->getMacroService(), 'UrlService' => $this->getUrlService() ]; $rendu = $this->getRenduService()->generateRenduByTemplateCode(MailTemplates::SESSION_CONVOCATION, $vars); $mail = $this->getMailService()->sendMail($inscrit->getAgent()->getEmail(), $rendu->getSujet(), $rendu->getCorps(), 'Formation'); $mail = $this->getMailService()->sendMail($agent->getEmail(), $rendu->getSujet(), $rendu->getCorps(), 'Formation'); $mail->setMotsClefs([$instance->generateTag(), $rendu->getTemplate()->generateTag()]); $this->getMailService()->update($mail); return $mail; } public function triggerDemandeRetour(FormationInstanceInscrit $inscrit) : ?Mail public function triggerDemandeRetour(FormationInstanceInscrit|InscriptionExterne $inscrit) : ?Mail { $instance = $inscrit->getInstance(); if (!$instance->isMailActive() OR !$instance->isEnqueteActive()) return null; $instance = null; if ($instance instanceof FormationInstanceInscrit) $instance = $inscrit->getInstance(); if ($inscrit instanceof InscriptionExterne) $instance = $inscrit->getSession(); if ($instance === null) throw new RuntimeException("Aucune session d'identifié pour cette inscription"); if (!$instance->isMailActive()) return null; $agent = null; if ($inscrit instanceof FormationInstanceInscrit) $agent = $inscrit->getAgent(); if ($inscrit instanceof InscriptionExterne) $agent = $inscrit->getStagiaire(); if ($agent === null) throw new RuntimeException("Aucune personne d'identifié·e pour cette inscription"); $vars = [ 'session' => $instance, Loading @@ -287,11 +306,19 @@ class NotificationService { return $mail; } public function triggerSessionAnnulee(FormationInstanceInscrit $inscrit) : ?Mail public function triggerSessionAnnulee(FormationInstanceInscrit|InscriptionExterne $inscrit) : ?Mail { $instance = $inscrit->getInstance(); $instance = null; if ($instance instanceof FormationInstanceInscrit) $instance = $inscrit->getInstance(); if ($inscrit instanceof InscriptionExterne) $instance = $inscrit->getSession(); if ($instance === null) throw new RuntimeException("Aucune session d'identifié pour cette inscription"); if (!$instance->isMailActive()) return null; $agent = null; if ($inscrit instanceof FormationInstanceInscrit) $agent = $inscrit->getAgent(); if ($inscrit instanceof InscriptionExterne) $agent = $inscrit->getStagiaire(); if ($agent === null) throw new RuntimeException("Aucune personne d'identifié·e pour cette inscription"); $vars = [ 'session' => $instance, 'agent' => $inscrit->getAgent(), Loading Loading @@ -326,9 +353,8 @@ class NotificationService { /** Mails de rappel ***********************************************************************************************/ public function triggerRappelAgentAvantFormation(FormationInstance $instance) : array public function triggerRappelAgentAvantFormation(FormationInstance $instance) : ?array { if (!$instance->isMailActive()) return []; $vars = [ 'session' => $instance, 'UrlService' => $this->getUrlService(), Loading @@ -344,6 +370,13 @@ class NotificationService { $this->getMailService()->update($mail); $mails[] = $mail; } foreach ($instance->getInscriptionsExternes() as $inscrit) { $agent = $inscrit->getStagiaire(); $mail = $this->getMailService()->sendMail($agent->getEmail(), $rendu->getSujet(), $rendu->getCorps(), 'Formation'); $mail->setMotsClefs([$instance->generateTag(), $rendu->getTemplate()->generateTag(), $agent->generateTag() ]); $this->getMailService()->update($mail); $mails[] = $mail; } return $mails; } Loading