Commit 5f5b162b authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Annuaire des thèses/HDR : affichage systématique de l'établissement... 

Annuaire des thèses/HDR : affichage systématique de l'établissement d'inscription et plus seulement si le filtre est vierge.
parent 749d65d6

module/HDR/src/HDR/Controller/HDRRechercheController.php

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ class HDRRechercheController extends AbstractController implements SearchControl 
            'hdrs' => $paginator,

            'text' => $text,

            'roleGarant' => $this->applicationRoleService->getRepository()->findOneBy(['sourceCode' => Role::CODE_HDR_GARANT]),

            'displayEtablissement' => !$etablissement,

            'displayDateSoutenance' => $etatHDR === HDR::ETAT_SOUTENUE || !$etatHDR,

            'etatHDR' => $etatHDR,

            'filtersRoute' => $filtersRoute,

module/HDR/view/hdr/hdr-recherche/index.phtml

+9 −15
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ use UnicaenPrivilege\Provider\Privilege\Privileges; 
 * @var SearchResultPaginator $hdrs

 * @var string      $text

 * @var Role        $roleGarant

 * @var bool        $displayEtablissement

 * @var bool        $displayDateSoutenance

 * @var string      $filtersRoute

 *
@@ -70,14 +69,12 @@ $canAddHDR = $this->isAllowed(Privileges::getResourceId(HDRPrivileges::HDR_MODIF 
                    <?php echo $this->translate("Candidat"); ?>

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

            </th>

            <?php if ($displayEtablissement): ?>

            <th>

                <a href="<?php echo $s = $this->sortable(HDRSorter::NAME_etablissement); ?>"

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

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

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

            </th>

            <?php endif ?>

            <th>

                <a href="<?php echo $s = $this->sortable(HDRSorter::NAME_etatHDR); ?>"

                   title="<?php echo $this->translate("État de l'HDR");?> ">
@@ -111,12 +108,9 @@ $canAddHDR = $this->isAllowed(Privileges::getResourceId(HDRPrivileges::HDR_MODIF 
        foreach ($hdrs as $hdr): ?>

            <tr>

                <td><?php echo $hdr->getCandidat()->getIndividu()->getNomComplet() ?></td>

                <?php

                if ($displayEtablissement) { ?>

                <td>

                    <?php echo $this->structure($hdr->getEtablissement(), false); ?>

                </td>

                <?php } ?>

                <td>

                    <?= $this->etatHelper(["libelle" => $hdr->getEtatHDRToString(), "code" => $hdr->getEtatHDR()], $hdr->getResultat(), $hdr->getResultatToString()) ?>

                </td>

module/These/src/These/Controller/TheseRechercheController.php

+0 −2
Original line number Diff line number Diff line
@@ -42,14 +42,12 @@ class TheseRechercheController extends AbstractController implements SearchContr 
        /** @var SearchResultPaginator $paginator */

        $paginator = $result;



        $etablissement = $this->searchService->getEtablissementInscSearchFilter()->getValue();

        $etatThese = $this->searchService->getFilterValueByName(TheseSearchService::NAME_etatThese);



        return new ViewModel([

            'theses' => $paginator,

            'text' => $text,

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

            'displayEtablissement' => !$etablissement,

            'displayDateSoutenance' => $etatThese === These::ETAT_SOUTENUE || !$etatThese,

            'etatThese' => $etatThese,

            'filtersRoute' => 'these/recherche/filters',

module/These/view/these/these-recherche/index.phtml

+9 −15
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ use UnicaenPrivilege\Provider\Privilege\Privileges; 
 * @var SearchResultPaginator $theses

 * @var string      $text

 * @var Role        $roleDirecteurThese

 * @var bool        $displayEtablissement

 * @var bool        $displayDateSoutenance

 * @var string      $filtersRoute

 *
@@ -84,14 +83,12 @@ $canAddThese = $this->isAllowed(Privileges::getResourceId(ThesePrivileges::THESE 
                    <?php echo $this->translate("Titre"); ?>

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

            </th>

            <?php if ($displayEtablissement): ?>

            <th>

                <a href="<?php echo $s = $this->sortable(TheseSorter::NAME_etablissement); ?>"

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

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

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

            </th>

            <?php endif ?>

            <th>

                <a href="<?php echo $s = $this->sortable(TheseSorter::NAME_etatThese); ?>"

                   title="<?php echo $this->translate("État de la thèse");?> ">
@@ -154,12 +151,9 @@ $canAddThese = $this->isAllowed(Privileges::getResourceId(ThesePrivileges::THESE 
                        </a>

                    </span>

                </td>

                <?php

                if ($displayEtablissement) { ?>

                <td>

                    <?php echo $this->structure($these->getEtablissement(), false); ?>

                </td>

                <?php } ?>

                <td>

                    <?= $this->etatHelper(["libelle" => $these->getEtatTheseToString(), "code" => $these->getEtatThese()], $these->getResultat(), $these->getResultatToString()) ?>

                </td>