dicos/25_schedule.xml

@@ -32,6 +32,7 @@
             <variable type='string'   name='schedule_allow_hosts'   description="Hôtes authorisés à utiliser la base de données" multi='True'/>
             <variable type='string'   name='schedule_dbuser'        description='Utilisateur du serveur de base de données'/>
             <variable type='string'   name='schedule_dbpass'        description='Fichier de mot de passe du serveur'/>
+            <variable type='mail'     name='schedule_email_global_notif'        description='Email pour envoie de notifications'/>
         </family>
 	</variables>
 

src/schedule-2.0/.env

@@ -36,6 +36,7 @@ APP_CRON=false
 MAILER_METHOD=sendmail
 MAILER_URL=
 MAILER_NOREPLY=noreply@noreply.fr
+MAILER_DEFAULT_NOTIF=
 
 # BDD
 DATABASE_NAME=

src/schedule-2.0/config/services.yaml

@@ -11,6 +11,7 @@ parameters:
   appCron: '%env(resolve:APP_CRON)%'
   appMailmethod: '%env(resolve:MAILER_METHOD)%'
   appMailnoreply: '%env(resolve:MAILER_NOREPLY)%'
+  appMailnotif: '%env(resolve:MAILER_DEFAULT_NOTIF)%'  
   casHost: '%env(resolve:CAS_HOST)%'
   casPort: '%env(resolve:CAS_PORT)%'
   casPath: '%env(resolve:CAS_PATH)%'

src/schedule-2.0/src/Service/notificationService.php

@@ -19,10 +19,26 @@ class notificationService
     public function sendNotifAttenteValid($subject, $iduser, $idevent, $valid_url)
     {
         $template = $this->twig->load('Notif/attentevalidation.html.twig');
-
-   
         $user=$this->em->getRepository("App:User")->find($iduser);
         $event=$this->em->getRepository("App:Event")->find($idevent);
+        $users=$this->em->getRepository("App:User")->findAll();
+        $tbemails=[];
+        foreach($users as $usr) {
+            if(in_array("ROLE_VALIDATOR",$usr->getRoles())) {
+                array_push($tbemails,$usr->getEmail());
+            }
+            // else{
+            //     if(in_array("ROLE_MASTER",$usr->getRoles())) {
+            //         if ($usr->getService() == $user->getService() ){
+            //             $tmp=[
+            //                 "id"=>$usr->getId(),
+            //                 "email"=>$usr->getEmail()
+            //             ];
+            //         }
+            //         array_push($tbemails,$tmp);
+            //     }
+            // }
+        }
         
         $parameters=[
             'date' => new \DateTime(),
@@ -37,7 +53,8 @@ class notificationService
             $message = (new \Swift_Message())
                     ->setFrom('schedule@cadoles.com')
                     ->setSubject($user->getUsername() . " = " . $subject)
-                    ->setTo('conges@cadoles.com')
+                    //TODO envoyer à tt les users master associé au service de l'utilisateur et l'ensemble des user validator
+                    ->setTo($tbemails)
                     ->setBody($bodyHtml, 'text/html');
             
             $response = $this->mailer->send($message);
@@ -47,11 +64,16 @@ class notificationService
     public function sendNotifValid($subject, $iduser, $idevent)
     {
         $template = $this->twig->load('Notif/validation.html.twig');
-
-   
         $user=$this->em->getRepository("App:User")->find($iduser);
         $event=$this->em->getRepository("App:Event")->find($idevent);
+        $users=$this->em->getRepository("App:User")->findAll();
+        $tbemails=[];
+        foreach($users as $usr) {
+            if(in_array("ROLE_VALIDATOR",$usr->getRoles())) {
+                array_push($tbemails,$usr->getEmail());
+            }
           
+        }
         $parameters=[
             'date' => new \DateTime(),
             'username' => $user->getUsername(),
@@ -64,7 +86,8 @@ class notificationService
             $message = (new \Swift_Message())
                     ->setFrom('schedule@cadoles.com')
                     ->setSubject($user->getUsername() . " = " . $subject)
-                    ->setTo('conges@cadoles.com')
+                    ->setTo($this->container->getParameter('appMailnotif'))
+                    ->setCc($tbemails)
                     ->setBody($bodyHtml, 'text/html');
             
             $response = $this->mailer->send($message);

tmpl/schedule-env.local

@@ -4,6 +4,12 @@ APP_SECRET=%%pwdreader("","/var/www/html/schedule/.key")
 APP_AUTH=CAS
 
 
+# MAIL sendmail / smtp
+MAILER_METHOD=sendmail
+MAILER_URL=
+MAILER_NOREPLY=noreply@noreply.fr
+MAILER_DEFAULT_NOTIF=%%getVar('schedule_email_global_notif', '')
+
 # Bdd = Redefine local
 DATABASE_NAME=schedule
 DATABASE_USER=schedule