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

Ajout de l'entity, formulaire et service pour le formateur

parent b7a0bc51
Loading
Loading
Loading
Loading
+65 −0
Changes for module/Application/config/merged/formation.config.php: 65 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -22,6 +22,10 @@ use Application\Form\FormationInstance\FormationInstanceForm;
use Application\Form\FormationInstance\FormationInstanceFormFactory;
use Application\Form\FormationInstance\FormationInstanceHydrator;
use Application\Form\FormationInstance\FormationInstanceHydratorFactory;
use Application\Form\FormationInstanceFormateur\FormationInstanceFormateurForm;
use Application\Form\FormationInstanceFormateur\FormationInstanceFormateurFormFactory;
use Application\Form\FormationInstanceFormateur\FormationInstanceFormateurHydrator;
use Application\Form\FormationInstanceFormateur\FormationInstanceFormateurHydratorFactory;
use Application\Form\FormationInstanceFrais\FormationInstanceFraisForm;
use Application\Form\FormationInstanceFrais\FormationInstanceFraisFormFactory;
use Application\Form\FormationInstanceFrais\FormationInstanceFraisHydrator;
@@ -40,6 +44,8 @@ use Application\Service\Formation\FormationService;
use Application\Service\Formation\FormationServiceFactory;
use Application\Service\Formation\FormationThemeService;
use Application\Service\Formation\FormationThemeServiceFactory;
use Application\Service\FormationInstance\FormationInstanceFormateurService;
use Application\Service\FormationInstance\FormationInstanceFormateurServiceFactory;
use Application\Service\FormationInstance\FormationInstanceFraisService;
use Application\Service\FormationInstance\FormationInstanceFraisServiceFactory;
use Application\Service\FormationInstance\FormationInstanceInscritService;
@@ -162,6 +168,12 @@ return [
                        'restaurer-journee',
                        'supprimer-journee',

                        'ajouter-formateur',
                        'modifier-formateur',
                        'historiser-formateur',
                        'restaurer-formateur',
                        'supprimer-formateur',

                        'ajouter-agent',
                        'historiser-agent',
                        'restaurer-agent',
@@ -400,6 +412,56 @@ return [
                            ],
                        ],
                    ],
                    'ajouter-formateur' => [
                        'type'  => Segment::class,
                        'options' => [
                            'route'    => '/ajouter-formateur/:formation-instance',
                            'defaults' => [
                                'controller' => FormationInstanceController::class,
                                'action'     => 'ajouter-formateur',
                            ],
                        ],
                    ],
                    'modifier-formateur' => [
                        'type'  => Segment::class,
                        'options' => [
                            'route'    => '/modifier-formateur/:formateur',
                            'defaults' => [
                                'controller' => FormationInstanceController::class,
                                'action'     => 'modifier-formateur',
                            ],
                        ],
                    ],
                    'historiser-formateur' => [
                        'type'  => Segment::class,
                        'options' => [
                            'route'    => '/historiser-journee/:formateur',
                            'defaults' => [
                                'controller' => FormationInstanceController::class,
                                'action'     => 'historiser-formateur',
                            ],
                        ],
                    ],
                    'restaurer-formateur' => [
                        'type'  => Segment::class,
                        'options' => [
                            'route'    => '/restaurer-formateur/:formateur',
                            'defaults' => [
                                'controller' => FormationInstanceController::class,
                                'action'     => 'restaurer-formateur',
                            ],
                        ],
                    ],
                    'supprimer-formateur' => [
                        'type'  => Segment::class,
                        'options' => [
                            'route'    => '/supprimer-formateur/:formateur',
                            'defaults' => [
                                'controller' => FormationInstanceController::class,
                                'action'     => 'supprimer-formateur',
                            ],
                        ],
                    ],
                    'export-emargement' => [
                        'type'  => Segment::class,
                        'options' => [
@@ -719,6 +781,7 @@ return [
            FormationInstanceInscritService::class => FormationInstanceInscritServiceFactory::class,
            FormationInstanceJourneeService::class => FormationInstanceJourneeServiceFactory::class,
            FormationInstancePresenceService::class => FormationInstancePresenceServiceFactory::class,
            FormationInstanceFormateurService::class => FormationInstanceFormateurServiceFactory::class,
            FormationInstanceFraisService::class => FormationInstanceFraisServiceFactory::class,
            FormationGroupeService::class => FormationGroupeServiceFactory::class,
            FormationThemeService::class => FormationThemeServiceFactory::class,
@@ -736,6 +799,7 @@ return [
            FormationForm::class => FormationFormFactory::class,
            FormationGroupeForm::class => FormationGroupeFormFactory::class,
            FormationInstanceForm::class => FormationInstanceFormFactory::class,
            FormationInstanceFormateurForm::class => FormationInstanceFormateurFormFactory::class,
            FormationInstanceFraisForm::class => FormationInstanceFraisFormFactory::class,
            FormationJourneeForm::class => FormationJourneeFormFactory::class,
            SelectionFormationForm::class => SelectionFormationFormFactory::class,
@@ -750,6 +814,7 @@ return [
            FormationHydrator::class => FormationHydratorFactory::class,
            FormationGroupeHydrator::class => FormationGroupeHydratorFactory::class,
            FormationInstanceHydrator::class => FormationInstanceHydratorFactory::class,
            FormationInstanceFormateurHydrator::class => FormationInstanceFormateurHydratorFactory::class,
            FormationInstanceFraisHydrator::class => FormationInstanceFraisHydratorFactory::class,
            FormationJourneeHydrator::class => FormationJourneeHydratorFactory::class,
        ],
+13 −0
Changes for module/Application/src/Application/Entity/Db/FormationInstance.php: 13 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ class FormationInstance implements HistoriqueAwareInterface {
    private $journees;
    /** @var ArrayCollection (FormationInstanceInscrit) */
    private $inscrits;
    /** @var ArrayCollection (FormationInstanceFormateur) */
    private $formateurs;

    /**
     * @return int
@@ -153,6 +155,17 @@ class FormationInstance implements HistoriqueAwareInterface {
        return $this;
    }

    /** FORMATEURS ****************************************************************************************************/

    /**
     * @return FormationInstanceFormateur[]|null
     */
    public function getFormateurs() : ?array
    {
        if ($this->formateurs === null) return null;
        return $this->formateurs->toArray();
    }

    /** JOURNEE *******************************************************************************************************/

    public function getJournees()
+141 −0
Changes for module/Application/src/Application/Entity/Db/FormationInstanceFormateur.php: 141 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

namespace Application\Entity\Db;

use UnicaenUtilisateur\Entity\HistoriqueAwareInterface;
use UnicaenUtilisateur\Entity\HistoriqueAwareTrait;

class FormationInstanceFormateur implements HistoriqueAwareInterface {
    use HistoriqueAwareTrait;

    /** @var integer */
    private $id;
    /** @var FormationInstance */
    private $instance;
    /** @var string */
    private $prenom;
    /** @var string */
    private $nom;
    /** @var string */
    private $attachement;
    /** @var float */
    private $volume;
    /** @var float */
    private $montant;

    /**
     * @return int
     */
    public function getId(): int
    {
        return $this->id;
    }

    /**
     * @return FormationInstance
     */
    public function getInstance(): FormationInstance
    {
        return $this->instance;
    }

    /**
     * @param FormationInstance $instance
     * @return FormationInstanceFormateur
     */
    public function setInstance(FormationInstance $instance): FormationInstanceFormateur
    {
        $this->instance = $instance;
        return $this;
    }

    /**
     * @return string|null
     */
    public function getPrenom(): ?string
    {
        return $this->prenom;
    }

    /**
     * @param string $prenom
     * @return FormationInstanceFormateur
     */
    public function setPrenom(string $prenom): FormationInstanceFormateur
    {
        $this->prenom = $prenom;
        return $this;
    }

    /**
     * @return string|null
     */
    public function getNom(): ?string
    {
        return $this->nom;
    }

    /**
     * @param string $nom
     * @return FormationInstanceFormateur
     */
    public function setNom(string $nom): FormationInstanceFormateur
    {
        $this->nom = $nom;
        return $this;
    }

    /**
     * @return string|null
     */
    public function getAttachement(): ?string
    {
        return $this->attachement;
    }

    /**
     * @param string|null $attachement
     * @return FormationInstanceFormateur
     */
    public function setAttachement(?string $attachement): FormationInstanceFormateur
    {
        $this->attachement = $attachement;
        return $this;
    }

    /**
     * @return float|null
     */
    public function getVolume(): ?float
    {
        return $this->volume;
    }

    /**
     * @param float|null $volume
     * @return FormationInstanceFormateur
     */
    public function setVolume(?float $volume): FormationInstanceFormateur
    {
        $this->volume = $volume;
        return $this;
    }

    /**
     * @return float|null
     */
    public function getMontant(): ?float
    {
        return $this->montant;
    }

    /**
     * @param float|null $montant
     * @return FormationInstanceFormateur
     */
    public function setMontant(?float $montant): FormationInstanceFormateur
    {
        $this->montant = $montant;
        return $this;
    }
}
 No newline at end of file
+1 −0
Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.FormationInstance.dcm.xml: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@

        <one-to-many field="journees"   target-entity="Application\Entity\Db\FormationInstanceJournee"    mapped-by="instance"/>
        <one-to-many field="inscrits"   target-entity="Application\Entity\Db\FormationInstanceInscrit"    mapped-by="instance"/>
        <one-to-many field="formateurs" target-entity="Application\Entity\Db\FormationInstanceFormateur"  mapped-by="instance"/>

        <field name="histoCreation"     type="datetime"                 column="histo_creation"     nullable="false"/>
        <field name="histoModification" type="datetime"                 column="histo_modification" nullable="false"/>
+33 −0
Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.FormationInstanceFormateur.dcm.xml: 33 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
    <entity name="Application\Entity\Db\FormationInstanceFormateur" table="formation_instance_formateur">

        <id name="id" type="integer" column="id">
            <generator strategy="IDENTITY"/>
        </id>

        <many-to-one target-entity="Application\Entity\Db\FormationInstance"  field="instance">
            <join-column name="instance_id" referenced-column-name="id"/>
        </many-to-one>

        <field name="prenom"              column="prenom"           type="string"  length="256"    nullable="false"/>
        <field name="nom"                 column="nom"              type="string"  length="256"    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"/>

        <field name="histoCreation"     type="datetime"                 column="histo_creation"     nullable="false"/>
        <field name="histoModification" type="datetime"                 column="histo_modification" nullable="false"/>
        <field name="histoDestruction"  type="datetime"                 column="histo_destruction"  nullable="true"/>
        <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User"  field="histoCreateur">
            <join-column name="histo_createur_id" referenced-column-name="id"/>
        </many-to-one>
        <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User"  field="histoModificateur">
            <join-column name="histo_modificateur_id" referenced-column-name="id"/>
        </many-to-one>
        <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User"  field="histoDestructeur">
            <join-column name="histo_destructeur_id" referenced-column-name="id"/>
        </many-to-one>

    </entity>
</doctrine-mapping>
Loading