Commit aad50e88 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Affichage et saisie des heures de formation

parent 23508b04
Loading
Loading
Loading
Loading
+4 −0
Changes for front/Mission/Mission.vue: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@
                                    </button>
                                </div>
                            </div>
                            <div class="col-md-5" v-if="mission.typeMission.besoinFormation">
                                <label class=" form-label">Heures de formation prévues</label>
                                <div class="form-control">{{ mission.heuresFormation }}</div>
                            </div>
                        </div>
                        <div class="row">
                            <div class="col-md-12">
+5 −0
Changes for module/Mission/src/Form/MissionForm.php: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -28,9 +28,11 @@ class MissionForm extends AbstractForm
        $typesMissions = $this->getEntityManager()->createQuery($tmDql)->setParameters($tmDqlParams)->getResult();

        $tmAccEtu = [];
        $besoinFormation = [];
        foreach ($typesMissions as $typeMission)
        {
            $tmAccEtu[$typeMission->getId()] = $typeMission->isAccompagnementEtudiants();
            $besoinFormation[$typeMission->getId()] = $typeMission->isBesoinFormation();
        }

        $this->spec(Mission::class, ['intervenant', 'autoValidation']);
@@ -38,11 +40,13 @@ class MissionForm extends AbstractForm
            'description' => ['type' => 'Textarea'],
            'etudiantsSuivis' => ['type' => 'Textarea'],
            'tauxRemuMajore' => ['input' => ['required' => false]],
            'heuresFormation' => ['input' => ['required' => false]],
        ]);
        $this->build();

        $this->setValueOptions('typeMission', Util::collectionAsOptions($typesMissions));
        $this->get('typeMission')->setAttribute('data-accompagnement-etudiants', json_encode($tmAccEtu));
        $this->get('typeMission')->setAttribute('data-besoin-formation', json_encode($besoinFormation));

        $trDql = "SELECT mtr FROM " . TauxRemu::class . " mtr";
        $this->setValueOptions('tauxRemu', $trDql);
@@ -61,6 +65,7 @@ class MissionForm extends AbstractForm
            'dateFin'         => 'Date de fin',
            'description'     => 'Descriptif de la mission',
            'etudiantsSuivis' => 'Noms des étudiants suivis',
            'heuresFormation' => 'Heures de formation prévues',
        ]);

        $this->addSubmit();
+2 −1
Changes for module/Mission/src/Service/MissionService.php: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -82,12 +82,13 @@ class MissionService extends AbstractEntityService

        $properties = [
            'id',
            ['typeMission', ['libelle', 'accompagnementEtudiants']],
            ['typeMission', ['libelle', 'accompagnementEtudiants','besoinFormation']],
            'dateDebut',
            'dateFin',
            ['structure', ['libelle']],
            ['tauxRemu', ['libelle']],
            ['tauxRemuMajore', ['libelle']],
            'heuresFormation',
            'description',
            'histoCreation',
            'histoCreateur',
+14 −3
Changes for module/Mission/view/mission/saisie/saisie.phtml: 14 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -33,7 +33,9 @@ echo $this->formControlGroup($form->get('tauxRemuMajore'));
echo '</div>';
echo '<div class="col-md-6">';
echo $this->formControlGroup($form->get('heures'));

echo '</div>';
echo '<div class="col-md-6 heures-formation">';
echo $this->formControlGroup($form->get('heuresFormation'));
echo '</div>';
echo '</div>';

@@ -54,7 +56,7 @@ echo $this->form()->closeTag();
        return $('[name=typeMission]');
    }

    function toggleEtudiantsSuivis()
    function toggleViewElements()
    {
        var tmId = typeMissionSelect().val();

@@ -65,10 +67,19 @@ echo $this->form()->closeTag();
        }else{
            $('.etudiants-suivis').hide();
        }

        var tmBF = typeMissionSelect().data('besoin-formation');

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

    }

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