Commit 0cec07db authored by Thomas Hamel's avatar Thomas Hamel
Browse files

uniformisation affichage champ obligatoire dans form

parent 2d2d7519

module/Doctorant/src/Doctorant/Form/MissionEnseignement/MissionEnseignementForm.php

+2 −2
Changes for module/Doctorant/src/Doctorant/Form/MissionEnseignement/MissionEnseignementForm.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ class MissionEnseignementForm extends Form 
            'type' => Select::class,

            'name' => 'annee_univ',

            'options' => [

                'label' => "Année universitaire <span class='icon icon-obligatoire' title='Donnée obligatoire'></span> :",

                'label' => "Année universitaire concernée <span class='icon icon-obligatoire' style='color: darkred;font-size: 0.8em;' data-bs-toggle='tooltip' title='Obligatoire'></span> :",

                'label_options' => [ 'disable_html_escape' => true, ],

                'value_options' => $options,

                'empty_option' => "Sélectionner une année universitaire",
@@ -40,7 +40,7 @@ class MissionEnseignementForm extends Form 
            'type' => Button::class,

            'name' => 'bouton',

            'options' => [

                'label' => '<i class="icon icon-save"></i> Enregistrer',

                'label' => '<span class="fas fa-save"></span> Enregistrer',

                'label_options' => [

                    'disable_html_escape' => true,

                ],

module/These/src/These/Fieldset/Direction/DirectionFieldset.php

+12 −5
Changes for module/These/src/These/Fieldset/Direction/DirectionFieldset.php: 12 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -157,7 +157,10 @@ class DirectionFieldset extends Fieldset implements InputFilterProviderInterface 


    private function _addCommuns(string $prefixe)

    {

        $individu = new SearchAndSelect($prefixe . '-individu', ['label' => "Individu * :"]);

        $individu = new SearchAndSelect($prefixe . '-individu', [

            'label' => "Individu <span class='icon icon-obligatoire' style='color: darkred;font-size: 0.8em;' data-bs-toggle='tooltip' title='Obligatoire'></span> :",

            'label_options' => [ 'disable_html_escape' => true, ]

        ]);

        $individu

            ->setAutocompleteSource($this->urlAutocompleteIndividu)

            ->setSelectionRequired()
@@ -171,7 +174,8 @@ class DirectionFieldset extends Fieldset implements InputFilterProviderInterface 
            'type' => ObjectSelect::class,

            'name' => $prefixe . '-etablissement',

            'options' => [

                'label' => 'Établissement * :',

                'label' => "Établissement <span class='icon icon-obligatoire' style='color: darkred;font-size: 0.8em;' data-bs-toggle='tooltip' title='Obligatoire'></span> :",

                'label_options' => [ 'disable_html_escape' => true, ],

                'target_class' => Etablissement::class,

                'value_options' => $this->etablissements,

                'disable_inarray_validator' => true,
@@ -188,7 +192,8 @@ class DirectionFieldset extends Fieldset implements InputFilterProviderInterface 
            'type' => ObjectSelect::class,

            'name' => $prefixe . '-uniteRecherche',

            'options' => [

                'label' => 'Unité de recherche * :',

                'label' => "Unité de recherche <span class='icon icon-obligatoire' style='color: darkred;font-size: 0.8em;' data-bs-toggle='tooltip' title='Obligatoire'></span> :",

                'label_options' => [ 'disable_html_escape' => true, ],

                'target_class' => UniteRecherche::class,

                'value_options' => UniteRecherche::toValueOptions($this->unitesRecherche),

                'disable_inarray_validator' => true,
@@ -205,7 +210,8 @@ class DirectionFieldset extends Fieldset implements InputFilterProviderInterface 
            'type' => ObjectSelect::class,

            'name' => $prefixe . '-ecoleDoctorale',

            'options' => [

                'label' => 'École doctorale * :',

                'label' => "École doctorale <span class='icon icon-obligatoire' style='color: darkred;font-size: 0.8em;' data-bs-toggle='tooltip' title='Obligatoire'></span> :",

                'label_options' => [ 'disable_html_escape' => true, ],

                'target_class' => EcoleDoctorale::class,

                'value_options' => $this->ecolesDoctorales,

                'disable_inarray_validator' => true,
@@ -222,7 +228,8 @@ class DirectionFieldset extends Fieldset implements InputFilterProviderInterface 
            'type' => Select::class,

            'name' => $prefixe . '-qualite',

            'options' => [

                'label' => "Qualité * :",

                'label' => "Qualité <span class='icon icon-obligatoire' style='color: darkred;font-size: 0.8em;' data-bs-toggle='tooltip' title='Obligatoire'></span> :",

                'label_options' => [ 'disable_html_escape' => true, ],

                'value_options' => $this->qualiteService->getQualitesAsGroupOptions(),

                'empty_option' => "Sélectionner une qualité...",

            ],

module/These/src/These/Fieldset/Financement/FinancementFieldset.php

+4 −2
Changes for module/These/src/These/Fieldset/Financement/FinancementFieldset.php: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ class FinancementFieldset extends Fieldset implements InputFilterProviderInterfa 
    {

        $this->add(

            (new Select("annee"))

                ->setLabel("Année : *")

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

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

                ->setValueOptions($this->generateYearOptions())

                ->setEmptyOption("Sélectionner une année")

                ->setAttributes([
@@ -89,7 +90,8 @@ class FinancementFieldset extends Fieldset implements InputFilterProviderInterfa 


        $this->add(

            (new Select("origineFinancement"))

                ->setLabel("Origine de Financement : *")

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

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

                ->setOptions(['emptyOption' => 'Choisissez un élément',])

                ->setDisableInArrayValidator(true)

                ->setAttributes([

module/These/src/These/Fieldset/Generalites/GeneralitesFieldset.php

+12 −5
Changes for module/These/src/These/Fieldset/Generalites/GeneralitesFieldset.php: 12 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -74,11 +74,15 @@ class GeneralitesFieldset extends Fieldset implements InputFilterProviderInterfa 
            'type' => Textarea::class,

            'name' => 'titre',

            'options' => [

                'label' => "Titre de la thèse : *",

                'label' => "Titre de la thèse <span class='icon icon-obligatoire' style='color: darkred;font-size: 0.8em;' data-bs-toggle='tooltip' title='Obligatoire'></span> :",

                'label_options' => [ 'disable_html_escape' => true, ],

            ],

        ]);



        $doctorant = new SearchAndSelect('doctorant', ['label' => "Doctorant·e : *"]);

        $doctorant = new SearchAndSelect('doctorant', [

            'label' => "Doctorant·e <span class='icon icon-obligatoire' style='color: darkred;font-size: 0.8em;' data-bs-toggle='tooltip' title='Obligatoire'></span> :",

            'label_options' => [ 'disable_html_escape' => true, ],

            ]);

        $doctorant

            ->setAutocompleteSource($this->urlAutocompleteIndividu)

            ->setRequired()
@@ -126,7 +130,8 @@ class GeneralitesFieldset extends Fieldset implements InputFilterProviderInterfa 
            'type' => Date::class,

            'name' => 'dateFinConfidentialite',

            'options' => [

                'label' => "Date de fin de confidentialité : ",

                'label' => "Date de fin de confidentialité <span class='icon icon-obligatoire' style='color: darkred;font-size: 0.8em;' data-bs-toggle='tooltip' title='Obligatoire'></span> : ",

                'label_options' => [ 'disable_html_escape' => true, ],

            ],

            'attributes' => [

                'id' => 'fin-confidentialite',
@@ -153,7 +158,8 @@ class GeneralitesFieldset extends Fieldset implements InputFilterProviderInterfa 
            'type' => ObjectSelect::class,

            'name' => 'etablissementCoTutelle',

            'options' => [

                'label' => 'Établissement de cotutelle * :',

                'label' => "Établissement de cotutelle <span class='icon icon-obligatoire' style='color: darkred;font-size: 0.8em;' data-bs-toggle='tooltip' title='Obligatoire'></span> :",

                'label_options' => [ 'disable_html_escape' => true, ],

                'empty_option' => "Sélectionnez une option",

                'target_class' => Etablissement::class,

                'disable_inarray_validator' => true,
@@ -168,7 +174,8 @@ class GeneralitesFieldset extends Fieldset implements InputFilterProviderInterfa 


        $this->add(

            (new Select("paysCoTutelle"))

                ->setLabel("Pays de la cotutelle * : ")

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

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

                ->setOptions(['emptyOption' => 'Choisissez un élément',])

                ->setAttributes([

                    'class' => 'selectpicker show-tick',

module/These/src/These/Fieldset/Structures/StructuresFieldset.php

+6 −3
Changes for module/These/src/These/Fieldset/Structures/StructuresFieldset.php: 6 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -78,7 +78,8 @@ class StructuresFieldset extends Fieldset implements InputFilterProviderInterfac 
            'type' => ObjectSelect::class,

            'name' => 'etablissement',

            'options' => [

                'label' => 'Établissement : *',

                'label' => "Établissement <span class='icon icon-obligatoire' style='color: darkred;font-size: 0.8em;' data-bs-toggle='tooltip' title='Obligatoire'></span> :",

                'label_options' => [ 'disable_html_escape' => true, ],

                'target_class' => Etablissement::class,

                'value_options' => $this->etablissements,

            ],
@@ -94,7 +95,8 @@ class StructuresFieldset extends Fieldset implements InputFilterProviderInterfac 
            'type' => ObjectSelect::class,

            'name' => 'uniteRecherche',

            'options' => [

                'label' => 'Unité de recherche : *',

                'label' => "Unité de recherche <span class='icon icon-obligatoire' style='color: darkred;font-size: 0.8em;' data-bs-toggle='tooltip' title='Obligatoire'></span> :",

                'label_options' => [ 'disable_html_escape' => true, ],

                'target_class' => UniteRecherche::class,

                'value_options' => UniteRecherche::toValueOptions($this->unitesRecherche),

            ],
@@ -110,7 +112,8 @@ class StructuresFieldset extends Fieldset implements InputFilterProviderInterfac 
            'type' => ObjectSelect::class,

            'name' => 'ecoleDoctorale',

            'options' => [

                'label' => 'École doctorale : *',

                'label' => "École doctorale <span class='icon icon-obligatoire' style='color: darkred;font-size: 0.8em;' data-bs-toggle='tooltip' title='Obligatoire'></span> : ",

                'label_options' => [ 'disable_html_escape' => true, ],

                'target_class' => EcoleDoctorale::class,

                'value_options' => $this->ecolesDoctorales,

            ],