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

Merge branch 'master' of git.unicaen.fr:open-source/sygal

parents d9407417 ab4cd6a4

module/Application/config/others/unite-recherche.config.php

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ return [ 
                    'modifier' => [

                        'type'          => Segment::class,

                        'options'       => [

                            'route'       => '/modifier/:structure',

                            'route'       => '/modifier[/:structure]',

                            'defaults'    => [

                                'action' => 'modifier',

                            ],

module/Application/src/Application/Controller/ExportController.php

+8 −0
Original line number Diff line number Diff line
@@ -66,6 +66,14 @@ class ExportController extends AbstractController 
                foreach ($financements as $financement) $origines[] = $financement->getOrigineFinancement()->getLibelleLong();

                return implode(",", $origines);

            },

            //Domaine

            'Domaines scientifiques'                            => function (These $these) {

                $domaines = ($these->getUniteRecherche())?($these->getUniteRecherche())->getDomaines():[];

                $liste = [];

                /** @var Financement $financement */

                foreach ($domaines as $domaine) $liste[] = $domaine->getLibelle();

                return implode(",", $liste);

            },

            //Dates

            'Date de première inscription'          => function (These $these) { return $these->getDatePremiereInscription(); },

            'Date de prévisionnel de soutenance'    => function (These $these) { return $these->getDatePrevisionSoutenance(); },

module/Application/src/Application/Service/These/TheseRechercheService.php

+1 −0
Original line number Diff line number Diff line
@@ -322,6 +322,7 @@ class TheseRechercheService 
            ->addSelect('r')->leftJoin('a.role', 'r')

            ->addSelect('f')->leftJoin('t.financements', 'f')

            ->addSelect('fi')->leftJoin('t.fichiers', 'fi')

//            ->addSelect('ds')->leftJoin('ur.domaines', 'ds')

            ->andWhere('1 = pasHistorise(t)');



        foreach ($this->filters as $filter) {

module/Application/view/application/unite-recherche/modifier.phtml

+10 −2
Original line number Diff line number Diff line
@@ -115,6 +115,9 @@ $form->get('code')->setAttribute('readonly', !$editable); 


<h2> Établissements de rattachement </h2>



<?php if(!$structure): ?>

    <p> Les établissements de rattachement ne peuvent être ajoutés que lors que l'établissement est créé.</p>

<?php else : ?>

    <div class="row">



    <div class="col-md-6">
@@ -183,7 +186,7 @@ $form->get('code')->setAttribute('readonly', !$editable); 
        </a>

    </div>

</div>



<?php endif; ?>



<hr>
@@ -192,6 +195,9 @@ $form->get('code')->setAttribute('readonly', !$editable); 


<h2> Domaines scientifiques</h2>



<?php if(!$structure): ?>

    <p> Les domaines scientifiques ne peuvent être ajoutés que lors que l'établissement est créé.</p>

<?php else : ?>

<div class="row">

    <div class="col-md-6">

        <table class="table table-extra-condensed">
@@ -221,6 +227,7 @@ $form->get('code')->setAttribute('readonly', !$editable); 
        </table>

    </div>





    <div class="col-md-6">

        <?php

        $selectDomaine = new SelectHelper("domaines", $domainesScientifiques, 'Choisissez un domaine scientifique ...');
@@ -259,6 +266,7 @@ $form->get('code')->setAttribute('readonly', !$editable); 
            Ajouter un domaine scientifique

        </a>

    </div>

    <?php endif; ?>

</div>