Commit c13966f0 authored by Florian Joriot's avatar Florian Joriot
Browse files

Sauvegarde non fonctionnel du formulaire des taux d'etape

parent 641e04ad
Loading
Loading
Loading
Loading
+24 −0
Changes for module/Application/src/Entity/Db/ElementPedagogique.php: 24 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ use Application\Entity\Db\Traits\PeriodeAwareTrait;
use Application\Entity\Db\Traits\SourceAwareTrait;
use Application\Entity\Db\Traits\StructureAwareTrait;
use Doctrine\Persistence\Mapping\ClassMetadata;
use Paiement\Entity\Db\TauxRemu;
use UnicaenApp\Entity\HistoriqueAwareInterface;
use UnicaenApp\Entity\HistoriqueAwareTrait;
use UnicaenApp\Service\EntityManagerAwareInterface;
@@ -141,6 +142,8 @@ class ElementPedagogique implements HistoriqueAwareInterface, ResourceInterface,
     */
    private $centreCoutEp;

    protected            $tauxRemu          = null;

    /**
     * @var \Application\Entity\Db\Effectifs
     */
@@ -259,6 +262,27 @@ class ElementPedagogique implements HistoriqueAwareInterface, ResourceInterface,
        return $this->libelle;
    }

    /**
     * Set un taux de rémunération
     *
     * @param TauxRemu $tauxRemu
     */
    public function setTauxRemu(TauxRemu $tauxRemu)
    {
        $this->tauxRemu = $tauxRemu;
    }



    /**
     * Get centreCout
     *
     * @return TauxRemu|null
     */
    public function getTauxRemu(): ?TauxRemu
    {
        return $this->tauxRemu;
    }


    /**
+3 −0
Changes for module/Application/src/Entity/Db/Mapping/Application.Entity.Db.Structure.dcm.xml: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@
    <many-to-one field="histoDestructeur" target-entity="Application\Entity\Db\Utilisateur">
      <join-column name="HISTO_DESTRUCTEUR_ID" referenced-column-name="ID"/>
    </many-to-one>
    <many-to-one field="tauxRemu" target-entity="Paiement\Entity\Db\TauxRemu">
      <join-column name="TAUX_REMU_ID" referenced-column-name="ID"/>
    </many-to-one>

    <many-to-many field="centreCout" target-entity="Application\Entity\Db\CentreCout" mapped-by="structure" />
    <one-to-many field="elementPedagogique" target-entity="Application\Entity\Db\ElementPedagogique" mapped-by="structure" />
+27 −0
Changes for module/Application/src/Entity/Db/Structure.php: 27 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@
namespace Application\Entity\Db;

use Application\Entity\Traits\AdresseTrait;
use Paiement\Entity\Db\TauxRemu;
use UnicaenImport\Entity\Db\Interfaces\ImportAwareInterface;
use UnicaenImport\Entity\Db\Traits\ImportAwareTrait;
use Laminas\Permissions\Acl\Resource\ResourceInterface;
@@ -38,6 +39,8 @@ class Structure implements HistoriqueAwareInterface, ResourceInterface, ImportAw

    protected            $affAdresseContrat = true;

    protected            $tauxRemu          = null;



    function __construct()
@@ -184,6 +187,30 @@ class Structure implements HistoriqueAwareInterface, ResourceInterface, ImportAw



    /**
     * Set un taux de rémunération
     *
     * @param TauxRemu $tauxRemu
     */
    public function setTauxRemu(TauxRemu $tauxRemu)
    {
        $this->tauxRemu = $tauxRemu;
    }



    /**
     * Get centreCout
     *
     * @return TauxRemu|null
     */
    public function getTauxRemu(): ?TauxRemu
    {
        return $this->tauxRemu;
    }



    /**
     * Get miseEnPaiementIntervenantStructure
     *
+1 −1
Changes for module/Mission/src/Form/MissionTypeForm.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ class MissionTypeForm extends AbstractForm
            ],
        ]);
        $this->build();
        $this->setValueOptions('tauxRemu', $this->getServiceTaux()->getTauxRemus());
        $this->setValueOptions('tauxRemu', $this->getServiceTauxRemu()->getTauxRemus());
        $this->get('tauxRemu')->setEmptyOption("");
        $this->get('tauxRemu')->setLabel('Taux par défaut');

+21 −0
Changes for module/OffreFormation/config/module.config.php: 21 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ use Application\Provider\Privilege\Privileges;
use OffreFormation\Controller\ElementPedagogiqueController;
use OffreFormation\Controller\EtapeCentreCoutController;
use OffreFormation\Controller\EtapeController;
use OffreFormation\Controller\EtapeTauxRemuController;
use OffreFormation\Controller\ModulateurController;
use OffreFormation\Controller\OffreFormationController;
use UnicaenAuth\Guard\PrivilegeController;
@@ -179,6 +180,14 @@ return [
                            'controller'  => EtapeCentreCoutController::class,
                            'action'      => 'saisir',
                        ],
                        'taux-remus'    => [
                            'route'       => '/taux-remus/:etape',
                            'constraints' => [
                                'etape' => '[0-9]*',
                            ],
                            'controller'  => EtapeTauxRemuController::class,
                            'action'      => 'saisir',
                        ],
                        'taux-mixite'   => [
                            'route'       => '/taux-mixite/:etape',
                            'constraints' => [
@@ -272,6 +281,7 @@ return [
            'action'     => ['restaurer', 'saisir', 'supprimer'],
            'privileges' => Privileges::ODF_ETAPE_EDITION,
        ],

        /* Éléments pédagogiques */
        [
            'controller' => ElementPedagogiqueController::class,
@@ -327,6 +337,12 @@ return [
            'action'     => ['saisir'],
            'privileges' => Privileges::ODF_CENTRES_COUT_EDITION,
        ],
        /* Taux de remus */
        [
            'controller' => EtapeTauxRemuController::class,
            'action'     => ['saisir'],
            'privileges' => Privileges::ODF_CENTRES_COUT_EDITION,
        ],
        /* Taux de mixité */
        [
            'controller' => EtapeController::class,
@@ -377,6 +393,7 @@ return [
        Controller\EtapeController::class           => Controller\Factory\EtapeControllerFactory::class,
        Controller\ModulateurController::class      => Controller\Factory\ModulateurControllerFactory::class,
        Controller\EtapeCentreCoutController::class => Controller\Factory\EtapeCentreCoutControllerFactory::class,
        Controller\EtapeTauxRemuController::class   => Controller\Factory\EtapeTauxRemuControllerFactory::class,
        OffreFormationController::class             => Controller\Factory\OffreFormationControllerFactory::class,
        ElementPedagogiqueController::class         => Controller\Factory\ElementPedagogiqueControllerFactory::class,
    ],
@@ -404,7 +421,9 @@ return [
        Form\EtapeModulateursSaisie::class                    => Form\Factory\EtapeModulateursSaisieFactory::class,
        Form\ElementModulateursFieldset::class                => Form\Factory\ElementModulateursFieldsetFactory::class,
        Form\EtapeCentreCout\EtapeCentreCoutForm::class       => Form\EtapeCentreCout\EtapeCentreCoutFormFactory::class,
        Form\EtapeTauxRemu\EtapeTauxRemuForm::class           => Form\EtapeTauxRemu\EtapeTauxRemuFormFactory::class,
        Form\EtapeCentreCout\ElementCentreCoutFieldset::class => Form\EtapeCentreCout\ElementCentreCoutFieldsetFactory::class,
        Form\EtapeTauxRemu\ElementTauxRemuFieldset::class     => Form\EtapeTauxRemu\ElementTauxRemuFieldsetFactory::class,
        Form\TauxMixite\TauxMixiteForm::class                 => Form\TauxMixite\TauxMixiteFormFactory::class,
        Form\TauxMixite\TauxMixiteFieldset::class             => Form\TauxMixite\TauxMixiteFieldsetFactory::class,
    ],
@@ -413,7 +432,9 @@ return [
        'etapeModulateursSaisieForm'          => View\Helper\Factory\EtapeModulateursSaisieFormFactory::class,
        'elementModulateursSaisieFieldset'    => View\Helper\Factory\ElementModulateursSaisieFieldsetFactory::class,
        'etapeCentreCoutForm'                 => View\Helper\Factory\EtapeCentreCoutFormViewHelperFactory::class,
        'etapeTauxRemuForm'                   => View\Helper\Factory\EtapeTauxRemuFormViewHelperFactory::class,
        'elementCentreCoutFieldset'           => View\Helper\Factory\ElementCentreCoutFieldsetViewHelperFactory::class,
        'elementTauxRemuFieldset'             => View\Helper\Factory\ElementTauxRemuFieldsetViewHelperFactory::class,
        'etapeTauxMixiteForm'                 => View\Helper\Factory\EtapeTauxMixiteFormViewHelperFactory::class,
        'elementTauxMixiteFieldset'           => View\Helper\Factory\ElementTauxMixiteFieldsetViewHelperFactory::class,
        'fieldsetElementPedagogiqueRecherche' => View\Helper\Factory\FieldsetElementPedagogiqueRechercheFactory::class,
Loading