Commit be14d99c authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Ajustement prereunion

parent 764917c9

module/Soutenance/config/module.config.php

+2 −2
Changes for module/Soutenance/config/module.config.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -140,10 +140,10 @@ return array( 


    'public_files' => [

        'inline_scripts' => [

            '114_' => 'vendor/bootstrap-select-1.13.9/dist/js/bootstrap-select.min.js',

            '114_' => 'vendor/bootstrap-select-1.13.2/dist/js/bootstrap-select.min.js',

        ],

        'stylesheets' => [

            '114_' => 'vendor/bootstrap-select-1.13.9/dist/css/bootstrap-select.min.css',

            '114_' => 'vendor/bootstrap-select-1.13.2/dist/css/bootstrap-select.min.css',

        ],

    ],

);

module/Soutenance/src/Soutenance/Service/Justificatif/JustificatifService.php

+1 −1
Changes for module/Soutenance/src/Soutenance/Service/Justificatif/JustificatifService.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ class JustificatifService { 
                    'justificatif' => $proposition->getJustificatif(NatureFichier::CODE_JUSTIFICATIF_HDR, $membre),

                ];

            }

            if ($membre->isExterieur() === 'oui' AND $membre->getQualite()->isEmeritat() === 'O') {

            if ($membre->isExterieur() AND $membre->getQualite()->isEmeritat()) {

                $justificatifs[] = [

                    'type' => NatureFichier::CODE_JUSTIFICATIF_EMERITAT,

                    'membre' => $membre,

module/Soutenance/view/soutenance/proposition/proposition.phtml

+17 −17
Changes for module/Soutenance/view/soutenance/proposition/proposition.phtml: 17 added lines, 17 removed lines.
Original line number Diff line number Diff line
@@ -179,24 +179,24 @@ $this->headTitle("Proposition de soutenance"); 
                // window.scrollTo(0,top);

            },

            "edition-membre" : function (event) {

                event.div.modal('hide');

                $.ajax({

                    type: "POST",

                    url : "<?php echo $this->url('soutenance/proposition/generate-view-jury', ["these" => $these->getId()], [], true); ?>",

                    beforeSend:

                        function () {

                            $("div#BOXDIV_JURY").html("<div class='alert alert-warning'> <span class='glyphicon glyphicon-warning-sign'></span> Rechargement de la vue associée au jury.</div><br/>");

                        },

                    success:

                        function(retour){

                            let texte = "ok";

                            $("div#BOXDIV_JURY").html(retour);

                        }

                });

                //event.div.modal('hide');

                //$.ajax({

                //    type: "POST",

                //    url : "<?php //echo $this->url('soutenance/proposition/generate-view-jury', ["these" => $these->getId()], [], true); ?>//",

                //    beforeSend:

                //        function () {

                //            $("div#BOXDIV_JURY").html("<div class='alert alert-warning'> <span class='glyphicon glyphicon-warning-sign'></span> Rechargement de la vue associée au jury.</div><br/>");

                //        },

                //    success:

                //        function(retour){

                //            let texte = "ok";

                //            $("div#BOXDIV_JURY").html(retour);

                //        }

                //});



                // window.location.reload();

                // let top = $('div#COMPOSITION_JURY').offset().top - navbar;

                // window.scrollTo(0,top);

                window.location.reload();

                let top = $('div#COMPOSITION_JURY').offset().top - navbar;

                window.scrollTo(0,top);

            },

            "edition-informations" : function (event) {

                event.div.modal('hide');