Commit 6571308f authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Mise a jour du workflow et des mail

parent 09ef100f

module/Formation/src/Formation/Controller/FormationConsoleController.php

+3 −0
Changes for module/Formation/src/Formation/Controller/FormationConsoleController.php: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ class FormationConsoleController extends AbstractActionController { 
                $this->getFormationInstanceService()->envoyerConvocation($session);

                echo (new DateTime())->format('d/m/y à H:i:s') . "\n";

                echo "Envoi des convocations effectué pour la session de formation " . $session->getFormation()->getLibelle() . " - " . $session->getId() . "\n";

                $this->getFormationInstanceService()->envoyerEmargement($session);

                echo (new DateTime())->format('d/m/y à H:i:s') . "\n";

                echo "Envoi des émargements effectué pour la session de formation " . $session->getFormation()->getLibelle() . " - " . $session->getId() . "\n";

            }



        }

module/Formation/src/Formation/Controller/FormationInstanceController.php

+1 −3
Changes for module/Formation/src/Formation/Controller/FormationInstanceController.php: 1 added line, 3 removed lines.
Original line number Diff line number Diff line
@@ -3,10 +3,7 @@ 
namespace Formation\Controller;



use Autoform\Service\Formulaire\FormulaireInstanceServiceAwareTrait;

use DateInterval;

use DateTime;

use Formation\Entity\Db\FormationInstance;

use Formation\Entity\Db\FormationInstanceFormateur;

use Formation\Form\FormationInstance\FormationInstanceFormAwareTrait;

use Formation\Service\Formation\FormationServiceAwareTrait;

use Formation\Service\FormationInstance\FormationInstanceServiceAwareTrait;
@@ -177,6 +174,7 @@ class FormationInstanceController extends AbstractActionController 
    {

        $instance = $this->getFormationInstanceService()->getRequestedFormationInstance($this);

        $this->getFormationInstanceService()->envoyerConvocation($instance);

        $this->getFormationInstanceService()->envoyerEmargement($instance);

        return $this->redirect()->toRoute('formation-instance/afficher', ['formation-instance' => $instance->getId()], [], true);

    }

module/Formation/src/Formation/Entity/Db/FormationInstance.php

+0 −1
Changes for module/Formation/src/Formation/Entity/Db/FormationInstance.php: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -532,5 +532,4 @@ class FormationInstance implements HistoriqueAwareInterface, HasSourceInterface 
        $text = $heures . " heures " . (($minutes !== 0) ? ($minutes . " minutes") : "");

        return $text;

    }



}
 
 No newline at end of file

module/Formation/src/Formation/Entity/Db/FormationInstanceFormateur.php

+20 −0
Changes for module/Formation/src/Formation/Entity/Db/FormationInstanceFormateur.php: 20 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ class FormationInstanceFormateur implements HistoriqueAwareInterface 
    private $prenom;

    /** @var string */

    private $nom;

    /** @var string|null */

    private $email;

    /** @var string */

    private $attachement;

    /** @var float */
@@ -76,6 +78,24 @@ class FormationInstanceFormateur implements HistoriqueAwareInterface 
        return $this->nom;

    }



    /**

     * @return string|null

     */

    public function getEmail(): ?string

    {

        return $this->email;

    }



    /**

     * @param string|null $email

     * @return FormationInstanceFormateur

     */

    public function setEmail(?string $email): FormationInstanceFormateur

    {

        $this->email = $email;

        return $this;

    }



    /**

     * @param string $nom

     * @return FormationInstanceFormateur

module/Formation/src/Formation/Entity/Db/Mapping/Formation.Entity.Db.FormationInstanceFormateur.dcm.xml

+1 −0
Changes for module/Formation/src/Formation/Entity/Db/Mapping/Formation.Entity.Db.FormationInstanceFormateur.dcm.xml: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


        <field name="prenom"              column="prenom"           type="string"  length="256"    nullable="false"/>

        <field name="nom"                 column="nom"              type="string"  length="256"    nullable="false"/>

        <field name="email"               column="email"            type="string"  length="1024"   nullable="false"/>

        <field name="attachement"         column="attachement"      type="string"  length="1024"   nullable="true"/>

        <field name="volume"              column="volume"           type="float"                   nullable="true"/>

        <field name="montant"             column="montant"          type="float"                   nullable="true"/>