Commit 2c6225ff authored by Florian Joriot's avatar Florian Joriot
Browse files

Taux de remu par defaut pour type de mission non obligatoire 

Correction du required false avec un spec
parent e36d2729

module/Mission/src/Form/MissionTauxForm.php

+7 −25
Original line number Diff line number Diff line
@@ -20,6 +20,13 @@ class MissionTauxForm extends AbstractForm 
        $this->setHydrator($hydratorForm);



        $this->spec(MissionTauxRemu::class);

        $this->spec([

            'missionTauxRemu' => [

                'input' => [

                    'required' => false,

                ],

            ],

        ]);

        $this->build();



        $this->setValueOptions('missionTauxRemu', $this->getServiceMissionTaux()->getTauxRemusIndexable());
@@ -44,31 +51,6 @@ class MissionTauxForm extends AbstractForm 


        return $this;

    }



    /**

     * Should return an array specification compatible with

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

     *

     * @return array

     */

    public function getInputFilterSpecification()

    {

        return [

            'missionTauxRemu'     => [

                'required' => false,

            ],

            'libelle'      => [

                'required' => true,

            ],

            'code'  => [

                'required' => true,

            ],

            'date' => [

                'required' => true,

            ],

        ];

    }



}

module/Mission/src/Form/MissionTypeForm.php

+7 −0
Original line number Diff line number Diff line
@@ -17,6 +17,13 @@ class MissionTypeForm extends AbstractForm 
    {

        $ignore = [];

        $this->spec(TypeMission::class, $ignore);

        $this->spec([

            'missionTauxRemu' => [

                'input' => [

                    'required' => false,

                ],

            ],

        ]);

        $this->build();

        $this->setValueOptions('missionTauxRemu', $this->getServiceMissionTaux()->getTauxRemus());

        $this->get('missionTauxRemu')->setEmptyOption("");

module/Mission/view/mission/mission-type/index.phtml

+4 −1
Original line number Diff line number Diff line
@@ -29,7 +29,10 @@ $canSupprimer = $this->isAllowed(Privileges::getResourceId(Privileges::MISSION_S 
        <tr>

            <td style="text-align: center"><?php echo $missionType->getLibelle(); ?></td>

            <td style="text-align: center"><?php echo $missionType->getCode() ?></td>

            <td style="text-align: center"><?php echo $missionType->getMissionTauxRemu()->getLibelle() ?></td>

            <td style="text-align: center">

                <?php if ($missionType->getMissionTauxRemu()):

                    echo $missionType->getMissionTauxRemu()->getLibelle();

                endif; ?></td>

            <?php if ($canSupprimer || $canEdit): ?>

                <td style="text-align: center">

                    <?php if ($canEdit): ?>