Commit 649a2082 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Visibilité de la case à cocher "formation" uniquement si des heures de formation ont été prévues

parent 3af5ff67
Loading
Loading
Loading
Loading
+7 −0
Changes for module/Mission/src/Entity/Db/Mission.php: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -62,6 +62,13 @@ class Mission implements HistoriqueAwareInterface, ResourceInterface, EntityMana



    public function __toString(): string
    {
        return $this->getLibelleCourt() ?? '';
    }



    public function getResourceId()
    {
        return 'Mission';
+23 −7
Changes for module/Mission/src/Form/MissionSuiviForm.php: 23 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -4,7 +4,9 @@ namespace Mission\Form;

use Application\Entity\Db\Traits\IntervenantAwareTrait;
use Application\Form\AbstractForm;
use Doctrine\Common\Collections\ArrayCollection;
use Laminas\Hydrator\HydratorInterface;
use Mission\Entity\Db\Mission;
use Mission\Entity\Db\VolumeHoraireMission;
use Mission\Service\MissionServiceAwareTrait;
use UnicaenApp\Util;
@@ -32,13 +34,24 @@ class MissionSuiviForm extends AbstractForm
            'type' => 'Hidden',
        ]);



        $missions = $this->getMissions();
        $besoinFormation = [];
        foreach ($missions as $mission)
        {
            $besoinFormation[$mission->getId()] = ($mission->getHeuresFormation() && $mission->getHeuresFormation() > 0);
        }
        $this->add([
            'name'    => 'mission',
            'type'    => 'Select',
            'options' => [
                'label'         => 'Mission',
                'empty_option'  => '- Non renseignée -',
                'value_options' => Util::collectionAsOptions($this->getMissionsOptions()),
                'value_options' => Util::collectionAsOptions($missions),
            ],
            'attributes' => [
                'data-besoin-formation' => json_encode($besoinFormation),
            ],
        ]);

@@ -133,18 +146,21 @@ class MissionSuiviForm extends AbstractForm
    }


    private function getMissionsOptions()

    /**
     * @return array|Mission[]
     */
    private function getMissions(): ArrayCollection
    {
        $missions = $this->getIntervenant()->getMissions();

        $options = [];
        foreach ($missions as $mission) {
            if ($mission->canAddSuivi($this->date)) {
                $options[$mission->getId()] = $mission->getLibelleCourt();
        foreach ($missions as $i => $mission) {
            if (!$mission->canAddSuivi($this->date)) {
                unset($missions[$i]);
            }
        }

        return $options;
        return $missions;
    }

}
+1 −1
Changes for module/Mission/view/mission/saisie/saisie.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ echo $this->form()->closeTag();

    $(function(){
        typeMissionSelect().on('change', toggleViewElements);
        toggleEtudiantsSuivis();
        toggleViewElements();
    });

</script>
 No newline at end of file
+29 −1
Changes for module/Mission/view/mission/suivi/saisie.phtml: 29 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ echo '</div>';

echo '<div class="row">';

echo '<div class="col-md-4"><label>&nbsp;</label>';
echo '<div class="col-md-4 heures-formation"><label>&nbsp;</label>';
echo $this->formControlGroup($form->get('formation'));
echo '</div>';

@@ -50,3 +50,31 @@ echo $this->formControlGroup($form->get('description'));
echo $this->formSubmit($form->get('submit'));

echo $this->form()->closeTag();
?>
<script>

    function missionSelect()
    {
        return $('[name=mission]');
    }

    function toggleViewElements()
    {
        var mId = missionSelect().val();

        var mBF = missionSelect().data('besoin-formation');

        if (mBF[mId]){
            $('.heures-formation').show();
        }else{
            $('.heures-formation').hide();
        }

    }

    $(function(){
        missionSelect().on('change', toggleViewElements);
        toggleViewElements();
    });

</script>