Commit bf9afe5a authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

[FIX] Ajout/modification de structure (établissement, ED, UR) : correction... 

[FIX] Ajout/modification de structure (établissement, ED, UR) : correction plantage, ajout de l'article indéfini et améliorations visuelles dans le formulaire.
parent 8c8fbaa7

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 
- [FIX] Annuaire de thèses : réparation des tris Etab, ED et UR.

- [FIX] Jury de soutenance de thèse : rétablissement de la vérification des rapporteurs de rang B sans HDR.

- [FIX] Etablissement/ED/UR : suppression du tooltip Bootstrap gênant sur l'icône de suppression d'un document associé à la structure.

- [FIX] Ajout/modification de structure (établissement, ED, UR) : correction plantage, ajout de l'article indéfini et améliorations visuelles dans le formulaire.



10.3.0

------

module/Structure/src/Structure/Entity/Db/Etablissement.php

+1 −1
Changes for module/Structure/src/Structure/Entity/Db/Etablissement.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ class Etablissement implements 
    /**

     * Retourne le "source code" de cet établissement, ex : 'UCN', 'INSA'.

     */

    public function getSourceCode(): string

    public function getSourceCode(): ?string

    {

        return $this->sourceCode;

    }

module/Structure/src/Structure/Entity/Db/Structure.php

+2 −2
Changes for module/Structure/src/Structure/Entity/Db/Structure.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ class Structure implements 
        return $articleDefini . $this->libelle;

    }



    public function getLibelle(): string

    public function getLibelle(): ?string

    {

        return $this->libelle;

    }
@@ -238,7 +238,7 @@ class Structure implements 
        return $this;

    }



    public function getArticleDefini(): string

    public function getArticleDefini(): ?string

    {

        return $this->articleDefini;

    }

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

+4 −0
Changes for module/Structure/src/Structure/Form/EtablissementForm.php: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ class EtablissementForm extends StructureForm 


        $this->setObject(new Etablissement());



        $this->get('libelle')

            ->setAttribute('placeholder', "Ex : Université de Caen Normandie");



        $this->add((new Text('sourceCode'))

            ->setLabel("Source Code")

        );
@@ -69,6 +72,7 @@ class EtablissementForm extends StructureForm 


        $this->add((new Text('siteWeb'))

            ->setLabel("Site internet")

            ->setAttribute('placeholder', "Ex : http://www.unicaen.fr")

        );



        $this->add((new Checkbox('estAssocie'))

module/Structure/src/Structure/Form/StructureForm.php

+11 −3
Changes for module/Structure/src/Structure/Form/StructureForm.php: 11 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ abstract class StructureForm extends Form 
        $this->add(new Hidden('id'));



        $this->add((new Text('sigle'))

            ->setLabel("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])

        );



        $this->add((new Text('libelle'))
@@ -28,12 +29,19 @@ abstract class StructureForm extends Form 
            ->setLabelOptions(['disable_html_escape' => true])

        );



        $this->add((new Text('articleDefini'))

            ->setAttribute('placeholder', 'Ex : Le, La, L\'')

            ->setLabel("Article défini")

        );



        $this->add((new Text('code'))

            ->setLabel("Code")

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

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

        );



        $this->add((new Text('id_ref'))

            ->setLabel("IdRef")

            ->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])

        );



        $this->add((new Text('id_hal'))