Commit 24ea9245 authored by Thomas Hamel's avatar Thomas Hamel
Browse files

[FIX] Ajout d'un CED impossible

parent d5c933d7

CHANGELOG.md

+1 −0
Changes for CHANGELOG.md: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ Journal des modifications 
- Extraction CSV des inscriptions aux formations : ajout de la colonne 'Liste'.

- [FIX] Module Soutenance : lorsque plusieurs propositions de soutenances étaient enregistrées en BDD, ce n'était pas forcément la bonne qui était récupérée

- [FIX] Rôles HDR affichés à tort sur la fiche d'un établissement

- [FIX] Ajout d'un CED impossible



10.0.1

-----

module/Structure/src/Structure/Form/EtablissementForm.php

+2 −1
Changes for module/Structure/src/Structure/Form/EtablissementForm.php: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ class EtablissementForm extends StructureForm 
        );



        $this->get('code')

            ->setLabel("Code (ex : UAI/RNE, etc.)")

            ->setLabel("Code (ex : UAI/RNE, etc.) <span class='icon icon-obligatoire' style='color: darkred;font-size: 0.8em;' data-bs-toggle='tooltip' title='Obligatoire'></span>")

            ->setLabelOptions(['disable_html_escape' => true])

            ->setAttribute('placeholder', "Ex : 0141408E");



        $this->get('sigle')->setAttribute('placeholder', "Ex : Unicaen");

module/Structure/src/Structure/Form/InputFilter/Etablissement/Ced/EtablissementCedInputFilter.php

+7 −1
Changes for module/Structure/src/Structure/Form/InputFilter/Etablissement/Ced/EtablissementCedInputFilter.php: 7 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ use Doctrine\ORM\EntityManager; 
use Laminas\Form\Form;

use Laminas\Validator\NotEmpty;

use Structure\Form\InputFilter\Etablissement\EtablissementInputFilter;

use Structure\Form\StructureForm;

use Webmozart\Assert\Assert;



class EtablissementCedInputFilter extends EtablissementInputFilter
@@ -51,7 +52,7 @@ class EtablissementCedInputFilter extends EtablissementInputFilter 
        ]);

    }



    public function prepareForm(Form $structureForm): void

    public function prepareForm(StructureForm $structureForm): void

    {

        parent::prepareForm($structureForm);
@@ -61,6 +62,7 @@ class EtablissementCedInputFilter extends EtablissementInputFilter 
        $structureForm->get('code')->setAttribute('disabled', 'disabled');

        $structureForm->get('sigle')->setAttribute('disabled', 'disabled');

        $structureForm->get('sourceCode')->setAttribute('disabled', 'disabled');



        $structureForm->remove('domaine');



        $structureForm->remove('estInscription');
@@ -74,5 +76,9 @@ class EtablissementCedInputFilter extends EtablissementInputFilter 


        $structureForm->remove('id_ref');

        $structureForm->remove('id_hal');



        $structureForm->get('adresse')

            ->setLabel("Adresse postale (sur une ligne) <span class='icon icon-obligatoire' style='color: darkred;font-size: 0.8em;' data-bs-toggle='tooltip' title='Obligatoire'></span>")

            ->setLabelOptions(['disable_html_escape' => true]);

    }

}
 
 No newline at end of file

module/Structure/src/Structure/Form/InputFilter/Etablissement/EtablissementInputFilter.php

+14 −1
Changes for module/Structure/src/Structure/Form/InputFilter/Etablissement/EtablissementInputFilter.php: 14 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -137,6 +137,19 @@ class EtablissementInputFilter extends StructureInputFilter 
        $structureForm->remove('emailBibliotheque');

        $structureForm->remove('emailDoctorat');

        $structureForm->remove('estInscription');

        $structureForm->remove('estCed');

//        $structureForm->remove('estCed');



        $structureForm->get('code')

            ->setLabel("Code (ex : UAI/RNE, etc.)  <span class='icon icon-obligatoire' style='color: darkred;font-size: 0.8em;' data-bs-toggle='tooltip' title='Obligatoire'></span> 

                                <span class='icon icon-information' data-bs-html='true' data-toggle='tooltip' title='Dans le cas dun établissement étranger, veuillez saisir un code unique de votre choix, qui permettra d’identifier ce dernier.

                                    <br>

                                    <br>

                                    Ce code peut contenir des lettres et/ou des chiffres (ex : UNIV01, ECL2024).

                                    <br>

                                    <br>

                                    Il doit être court, explicite, et différent des autres établissements enregistrés.'

                                </span>

        ")

            ->setLabelOptions(['disable_html_escape' => true]);

    }

}
 
 No newline at end of file

module/Structure/src/Structure/Form/InputFilter/Etablissement/Inscription/EtablissementInscriptionInputFilter.php

+31 −0
Changes for module/Structure/src/Structure/Form/InputFilter/Etablissement/Inscription/EtablissementInscriptionInputFilter.php: 31 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -203,5 +203,36 @@ class EtablissementInscriptionInputFilter extends EtablissementInputFilter 
        if ($structureForm->getObject()->getId()) {

            $structureForm->get('sourceCode')->setAttribute('disabled', 'disabled');

        }



        $structureForm->get('code')

            ->setLabel("Code UAI (RNE) <span class='icon icon-obligatoire' style='color: darkred;font-size: 0.8em;' data-bs-toggle='tooltip' title='Obligatoire'></span> ")

            ->setLabelOptions(['disable_html_escape' => true]);

        $structureForm->get('sigle')

            ->setLabel("Sigle <span class='icon icon-obligatoire' style='color: darkred;font-size: 0.8em;' data-bs-toggle='tooltip' title='Obligatoire'></span>")

            ->setLabelOptions(['disable_html_escape' => true]);

        $structureForm->get('sourceCode')

            ->setLabel("Source Code <span class='icon icon-obligatoire' style='color: darkred;font-size: 0.8em;' data-bs-toggle='tooltip' title='Obligatoire'></span>")

            ->setLabelOptions(['disable_html_escape' => true]);

        $structureForm->get('domaine')

            ->setLabel("Domaine <span class='icon icon-obligatoire' style='color: darkred;font-size: 0.8em;' data-bs-toggle='tooltip' title='Obligatoire'></span>")

            ->setLabelOptions(['disable_html_escape' => true]);

        $structureForm->get('adresse')

            ->setLabel("Adresse postale (sur une ligne) <span class='icon icon-obligatoire' style='color: darkred;font-size: 0.8em;' data-bs-toggle='tooltip' title='Obligatoire'></span>")

            ->setLabelOptions(['disable_html_escape' => true]);

        $structureForm->get('emailAssistance')

            ->setLabel("Adresse électronique d'Assistance <span class='icon icon-obligatoire' style='color: darkred;font-size: 0.8em;' data-bs-toggle='tooltip' title='Obligatoire'></span>")

            ->setLabelOptions(['disable_html_escape' => true]);

        $structureForm->get('emailBibliotheque')

            ->setLabel("Adresse électronique pour les aspects Bibliothèque <span class='icon icon-obligatoire' style='color: darkred;font-size: 0.8em;' data-bs-toggle='tooltip' title='Obligatoire'></span>")

            ->setLabelOptions(['disable_html_escape' => true]);

        $structureForm->get('emailDoctorat')

            ->setLabel("Adresse électronique pour les aspects Doctorat <span class='icon icon-obligatoire' style='color: darkred;font-size: 0.8em;' data-bs-toggle='tooltip' title='Obligatoire'></span>")

            ->setLabelOptions(['disable_html_escape' => true]);

        $structureForm->get('id_ref')

            ->setLabel("IdRef <span class='icon icon-obligatoire' style='color: darkred;font-size: 0.8em;' data-bs-toggle='tooltip' title='Obligatoire'></span>")

            ->setLabelOptions(['disable_html_escape' => true]);

        $structureForm->get('cheminLogo')

            ->setLabel("Logo : <span class='icon icon-obligatoire' style='color: darkred;font-size: 0.8em;' data-bs-toggle='tooltip' title='Obligatoire'></span>")

            ->setLabelOptions(['disable_html_escape' => true]);

    }

}
 
 No newline at end of file