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

Merge branch 'AmeliorationIndexThese'

parents cf0a7741 830a1d17
Loading
Loading
Loading
Loading
+1 −0
Changes for module/Application/src/Application/Controller/TheseController.php: 1 added line, 0 removed lines.
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,
        ]);
    }

+25 −2
Changes for module/Application/view/application/these/index.phtml: 25 added lines, 2 removed lines.
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,9 @@ $acteursFormatter->asSeparated()
<h1 class="page-header">
    <?php echo $this->translate("Thèses"); ?>
</h1>

<?php var_dump($filtreEtablissement); ?>

<!-- Formulaire de filtrage -->
<div class="pull-left">
    <?php echo $this->partial('partial/form-filtrage', ['etablissements' => $etablissements]) ?>
@@ -58,11 +62,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 +124,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">