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

[FIX] Accueil doctorant : corrections autour du lien 'Ma thèse' (+ cosmétique).

parent ac824ca5

CHANGELOG.md

+1 −0
Changes for CHANGELOG.md: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Journal des modifications 
-----

- Filtrage des propositions de soutenances par Etab, ED, UR, état.

- Renommage de 'Utilisateurs' en 'Comptes utilisateurs'.

- [FIX] Accueil doctorant : corrections autour du lien 'Ma thèse' (+ cosmétique).

- [FIX] Erreur dans la recherche de doctroants par établissement et ED (plantage impactant les listes de diff).

- [FIX] Recherche de rapports d'activités : restrictions par ED/UR selon le rôle endossé et ses privilèges.

- [FIX] Doublons dans la recherche des établissements de rattachement d'une UR.

module/Application/src/Application/Controller/IndexController.php

+7 −11
Changes for module/Application/src/Application/Controller/IndexController.php: 7 added lines, 11 removed lines.
Original line number Diff line number Diff line
@@ -2,22 +2,20 @@ 


namespace Application\Controller;



use Structure\Entity\Db\Etablissement;

use Application\Entity\Db\Role;

use Application\Entity\Db\Variable;

use Application\Entity\UserWrapper;

use Application\Exception\DomainException;

use Application\Service\Actualite\ActualiteServiceAwareTrait;

use Structure\Service\EcoleDoctorale\EcoleDoctoraleServiceAwareTrait;

use Structure\Service\Etablissement\EtablissementServiceAwareTrait;

use These\Service\These\TheseServiceAwareTrait;

use Application\Service\Variable\VariableServiceAwareTrait;

use Information\Service\InformationServiceAwareTrait;

use UnicaenApp\Exception\RuntimeException;

use Laminas\Authentication\AuthenticationServiceInterface;

use Laminas\Http\Response;

use Laminas\Validator\EmailAddress as EmailAddressValidator;

use Laminas\View\Model\ViewModel;

use Structure\Entity\Db\Etablissement;

use Structure\Service\EcoleDoctorale\EcoleDoctoraleServiceAwareTrait;

use Structure\Service\Etablissement\EtablissementServiceAwareTrait;

use These\Entity\Db\These;

use These\Service\These\TheseServiceAwareTrait;

use UnicaenApp\Exception\RuntimeException;



class IndexController extends AbstractController

{
@@ -117,9 +115,7 @@ EOS 
                    "Anomalie: le rôle '{$role->getRoleId()}' est sélectionné mais les données d'identité associées sont vides");

            }



            $qb = $this->theseService->getRepository()->createQueryBuilder('t')

                ->andWhereDoctorantIs($doctorant);

            $theses = $qb->getQuery()->getResult();

            $theses = $this->theseService->getRepository()->findThesesByDoctorant($doctorant, [These::ETAT_EN_COURS, These::ETAT_SOUTENUE]);



            /**

             * Si aucune thèse n'a été trouvée pour le doctorant connecté, on le déconnecte!

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

+0 −2
Changes for module/Application/view/application/index/index.phtml: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -49,8 +49,6 @@ echo $this->messenger() 
            </div>

        </div>



        <hr>



        <div class="row">



            <div class="col-11 p-2">

module/Application/view/application/index/partial/doctorant.phtml

+2 −1
Changes for module/Application/view/application/index/partial/doctorant.phtml: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ use These\Entity\Db\These; 
$appName = $this->appInfos()->nom;

?>



        <h2><?php echo count($theses) > 1 ? "Vos thèses" : "Votre thèse" ?></h2>

<h2><?php echo count($theses) > 1 ? "Mes thèses" : "Ma thèse" ?></h2>



<?php foreach ($theses as $these): ?>

    <?php echo $this->partial('these/these/partial/panel', ['these' => $these]) ?>

<?php endforeach ?>

module/These/src/These/Entity/Db/Repository/TheseRepository.php

+4 −1
Changes for module/These/src/These/Entity/Db/Repository/TheseRepository.php: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -139,11 +139,14 @@ class TheseRepository extends DefaultEntityRepository 
            ->join('th.individu', 'i')

            ->andWhere('i = :individu')

            ->setParameter('individu', $individu)

            ->andWhereEtatIn($etats)

            ->andWhere('t.histoDestruction is null')

            ->orderBy('t.datePremiereInscription', 'ASC')

        ;



        if ($etats) {

            $qb->andWhereEtatIn($etats);

        }



        return $qb->getQuery()->getResult();

    }