Commit 63646039 authored by Thomas Hamel's avatar Thomas Hamel
Browse files

Merge branch 'ameliorations_ergonomie' into release_9.1.0

parents 21c7b62d 147cc7a4

module/Admission/src/Admission/Form/ConventionFormationDoctorale/ConventionFormationDoctoraleForm.php

+2 −8
Changes for module/Admission/src/Admission/Form/ConventionFormationDoctorale/ConventionFormationDoctoraleForm.php: 2 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ 


namespace Admission\Form\ConventionFormationDoctorale;



use Application\Utils\FormUtils;

use Laminas\Form\Element\Csrf;

use Laminas\Form\Element\Hidden;

use Laminas\Form\Element\Submit;

use Laminas\Form\Element\Textarea;

use Laminas\Form\Form;

use Laminas\InputFilter\InputFilterProviderInterface;
@@ -75,13 +75,7 @@ class ConventionFormationDoctoraleForm extends Form implements InputFilterProvid 


        $this->add(new Csrf('security'), ['csrf_options' => ['timeout' => 600]]);



        $this->add([

            'type' => Submit::class,

            'name' => 'submit',

            'attributes' => [

                'value' => 'Enregistrer',

            ],

        ]);

        FormUtils::addSaveButton($this);

    }



    /**

module/Admission/src/Admission/Form/Transmission/TransmissionForm.php

+2 −8
Changes for module/Admission/src/Admission/Form/Transmission/TransmissionForm.php: 2 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ 


namespace Admission\Form\Transmission;



use Application\Utils\FormUtils;

use Laminas\Form\Element\Csrf;

use Laminas\Form\Element\Hidden;

use Laminas\Form\Element\Submit;

use Laminas\Form\Element\Text;

use Laminas\Form\Form;

use Laminas\InputFilter\InputFilterProviderInterface;
@@ -38,13 +38,7 @@ class TransmissionForm extends Form implements InputFilterProviderInterface 


        $this->add(new Csrf('security'), ['csrf_options' => ['timeout' => 60]]);



        $this->add([

            'type' => Submit::class,

            'name' => 'submit',

            'attributes' => [

                'value' => 'Enregistrer',

            ],

        ]);

        FormUtils::addSaveButton($this);

    }



    /**

module/Admission/view/admission/admission/convention-formation-doctorale/modifier.phtml

+1 −1
Changes for module/Admission/view/admission/admission/convention-formation-doctorale/modifier.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ $form->prepare(); 
        <div class="col-md-7">

            <?php

            echo $this->formControlGroup($form->get('security'));

            echo $this->formSubmit($form->get('submit')->setAttributes(['class' => 'btn btn-primary']));

            echo $this->formControlGroup($form->get('submit'));

            ?>

        </div>

    </div>

module/Admission/view/admission/admission/partial/documentInfos.phtml

+4 −1
Changes for module/Admission/view/admission/admission/partial/documentInfos.phtml: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -219,7 +219,10 @@ if ($canVerifierAdmission) { ?> 
    <?php

    if($canNotifierDossierIncomplet && !$admission->isDossierComplet()){

        //Permettre aux gestionnaires de notifier l'étudiant que son dossier est incomplet ?>

        <a class="btn access-notification-dossier-incomplet-btn required" data-operation="NotificationDossierIncomplet">Notifier l'étudiant que son dossier est incomplet</a>

        <a class="btn access-notification-dossier-incomplet-btn required" data-operation="NotificationDossierIncomplet">

            <span class="icon icon-notify"></span>

            Notifier l'étudiant que son dossier est incomplet

        </a>

        <div class="modal fade" id="modalShowConfirmationNotificationDossierIncomplet" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">

            <div class="modal-dialog" role="document">

                <div class="modal-content">

module/Admission/view/admission/admission/transmission/modifier.phtml

+1 −1
Changes for module/Admission/view/admission/admission/transmission/modifier.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ $form->prepare(); ?> 
    <div class="col-md-7">

        <?php

        echo $this->formControlGroup($form->get('security'));

        echo $this->formSubmit($form->get('submit')->setAttributes(['class' => 'btn btn-primary']));

        echo $this->formControlGroup($form->get('submit'));

        ?>

    </div>

</div>