Commit 364fa41b authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'master' of git.unicaen.fr:dsi/sygal

parents 3640a7e0 fa6b85a0

.gitlab-ci.yml

+4 −6
Original line number Diff line number Diff line
@@ -5,19 +5,17 @@ stages: 


test:

  stage: test

  script: echo "Running tests"

  script: echo "Running tests"; cat /etc/apt/sources.list*; apt update; apt -y install git



build:

  stage: build

  script: echo "Building the app"



deploy_staging:

deploy_preprod:

  stage: deploy

  script:

    - echo "Deploy to staging server"

  environment:

    name: staging

    url: https://staging.example.com

    - git push "$DEPLOY_USER:$DEPLOY_PASSWORD"@sygal-pp.unicaen.fr:/var/www/sygal.git master

  when: manual

  only:

  - master

module/Application/src/Application/Controller/TheseController.php

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ class TheseController extends AbstractController 
            'text'   => $text,

            'roleDirecteurThese' => $this->roleService->getRepository()->findOneBy(['sourceCode' => Role::CODE_DIRECTEUR_THESE]),

            'etablissements' => $this->etablissementService->getEtablissementsBySource("COMUE::SYGAL"),

            'filtreEtablissement' => $etablissement,

        ]);

    }

module/Application/src/Application/Controller/UtilisateurController.php

+3 −2
Original line number Diff line number Diff line
@@ -245,12 +245,13 @@ class UtilisateurController extends \UnicaenAuth\Controller\UtilisateurControlle 
     *

     * Recherche d'un Individu.

     *

     * @param string $type => permet de spécifier un type d'acteur ...

     * @return JsonModel

     */

    public function rechercherIndividuAction()

    public function rechercherIndividuAction($type = null)

    {

        if (($term = $this->params()->fromQuery('term'))) {

            $rows = $this->individuService->getRepository()->findByText($term, 'doctorant');

            $rows = $this->individuService->getRepository()->findByText($term, $type);

            $result = [];

            foreach ($rows as $row) {

                $prenoms = implode(' ', array_filter([$row['PRENOM1'], $row['PRENOM2'], $row['PRENOM3']]));

module/Application/src/Application/Entity/Db/Doctorant.php

+5 −1
Original line number Diff line number Diff line
@@ -87,8 +87,12 @@ class Doctorant implements DoctorantInterface, HistoriqueAwareInterface, Resourc 
     *

     * @return string

     */

    public function getSourceCode()

    public function getSourceCode($no_prefix = false)

    {

        if ($no_prefix) {

            $res = explode("::", $this->sourceCode);

            return end($res);

        }

        return $this->sourceCode;

    }

module/Application/view/application/these/index.phtml

+24 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ use Zend\Paginator\Paginator; 
 * @var Paginator   $theses

 * @var string      $text

 * @var Role        $roleDirecteurThese

 * @var string      $filtreEtablissement

 */



$canExport = $this->isAllowed(Privileges::getResourceId(ThesePrivileges::THESE_EXPORT_CSV));
@@ -31,6 +32,8 @@ $acteursFormatter->asSeparated() 
<h1 class="page-header">

    <?php echo $this->translate("Thèses"); ?>

</h1>





<!-- Formulaire de filtrage -->

<div class="pull-left">

    <?php echo $this->partial('partial/form-filtrage', ['etablissements' => $etablissements]) ?>
@@ -58,11 +61,19 @@ $acteursFormatter->asSeparated() 
                    <?php echo $this->translate("Titre"); ?>

            </a> <?php echo $s->icon() ?>

        </th>

        <?php if ($filtreEtablissement === '') { ?>

        <th>

            <a href="<?php echo $s = $this->sortable('t.etablissement'); ?>"

               title="<?php echo $this->translate("Établissement");?> ">

                <?php echo $this->translate("Étab."); ?>

            </a> <?php echo $s->icon() ?>

        </th>

        <?php  } ?>

        <th>

            <a href="<?php echo $s = $this->sortable('t.etatThese'); ?>"

               title="<?php echo $this->translate("État de la thèse");?> ">

                <?php echo $this->translate("État"); ?>

            </a>

            </a> <?php echo $s->icon() ?>

        </th>

        <th>

            <a href="<?php echo $s = $this->sortable('th.sourceCode'); ?>"
@@ -112,8 +123,19 @@ $acteursFormatter->asSeparated() 
                    </a>

                </span>

            </td>

            <?php

                if ($filtreEtablissement === '') {

                    echo "<td>";

                    echo "<abbr title='";

                    echo $these->getEtablissement()->getLibelle();

                    echo "'>";

                    echo $these->getEtablissement()->getCode();

                    echo "</abbr>";

                    echo "</td>";

                }

            ?>

            <td><?php echo $these->getEtatThese() ?></td>

            <td><?php echo $these->getDoctorant()->getSourceCode() ?></td>

            <td><?php echo $these->getDoctorant()->getSourceCode(true) ?></td>

            <td><?php echo $these->getDoctorant()->getIndividu()->getNomComplet() ?></td>

            <td class="acteurs">