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

Correction centre de cout

parent 509f25c3

module/Application/src/Entity/Db/Mapping/Application.Entity.Db.ElementPedagogique.dcm.xml

+11 −3
Changes for module/Application/src/Entity/Db/Mapping/Application.Entity.Db.ElementPedagogique.dcm.xml: 11 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -37,10 +37,8 @@ 
                <join-column name="DISCIPLINE_ID" referenced-column-name="ID"/>

            </join-columns>

        </many-to-one>

        <many-to-one field="tauxRemuEp" target-entity="Application\Entity\Db\TauxRemu">

            <join-columns>

        <many-to-one field="tauxRemuEp" target-entity="Paiement\Entity\Db\TauxRemu">

            <join-column name="TAUX_REMU_ID" referenced-column-name="ID"/>

            </join-columns>

        </many-to-one>

        <many-to-one field="source" target-entity="UnicaenImport\Entity\Db\Source">

            <join-columns>
@@ -118,6 +116,16 @@ 
                </inverse-join-columns>

            </join-table>

        </many-to-many>

        <many-to-many field="typeHeures" target-entity="Application\Entity\Db\TypeHeures">

            <join-table name="V_ELEMENT_TYPE_HEURES">

                <join-columns>

                    <join-column name="ELEMENT_PEDAGOGIQUE_ID" referenced-column-name="ID" on-delete="NO ACTION"/>

                </join-columns>

                <inverse-join-columns>

                    <join-column name="TYPE_HEURES_ID" referenced-column-name="ID" on-delete="NO ACTION"/>

                </inverse-join-columns>

            </join-table>

        </many-to-many>

        <one-to-many field="centreCoutEp" target-entity="Application\Entity\Db\CentreCoutEp" mapped-by="elementPedagogique"/>

    </entity>

</doctrine-mapping>
 
 No newline at end of file

module/Application/src/Entity/Db/Structure.php

+2 −2
Changes for module/Application/src/Entity/Db/Structure.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -190,9 +190,9 @@ class Structure implements HistoriqueAwareInterface, ResourceInterface, ImportAw 
    /**

     * Set un taux de rémunération

     *

     * @param TauxRemu $tauxRemu

     * @param TauxRemu|null $tauxRemu

     */

    public function setTauxRemu(TauxRemu $tauxRemu)

    public function setTauxRemu(?TauxRemu $tauxRemu)

    {

        $this->tauxRemu = $tauxRemu;

    }

module/OffreFormation/src/Form/EtapeCentreCout/EtapeCentreCoutForm.php

+26 −0
Changes for module/OffreFormation/src/Form/EtapeCentreCout/EtapeCentreCoutForm.php: 26 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -136,6 +136,32 @@ class EtapeCentreCoutForm extends AbstractForm 






    /**

     * Should return an array specification compatible with

     * {@link Laminas\InputFilter\Factory::createInputFilter()}.

     *

     * @return array

     */

    public function getInputFilterSpecification()

    {

        $elements = $this->getEtape()->getElementPedagogique();

        $filters  = [];

        foreach ($this->getTypesHeures() as $th) {

            $filters[$th->getCode()] = [

                'required' => false,

            ];

        }

        foreach ($elements as $element) {

            $filters['EL' . $element->getId()] = [

                'required' => false,

            ];

        }



        return $filters;

    }







    /**

     * Recherche, parmi les éléments de l'étape, des types d'heures distincts éligibles

     *

module/OffreFormation/view/offre-formation/etape-centre-cout/saisir.phtml

+1 −1
Changes for module/OffreFormation/view/offre-formation/etape-centre-cout/saisir.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
<?php $this->headTitle($title); ?>



<?php

echo "test";



echo $this->etapeCentreCoutForm($form);

echo $this->formErrors($form);

if ($errors) {