Commit 35d65761 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

[FIX] Inscriptions administratives importées : refetch de l'IA pour être sûr... 

[FIX] Inscriptions administratives importées : refetch de l'IA pour être sûr d'avoir les jointures correctes.
parent 30b2512e

CHANGELOG.md

+1 −0
Changes for CHANGELOG.md: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ Journal des modifications 
- [FIX] Formations suivies : les inscriptions sans réponse à l'enquête étaient écartées à tort.

- [FIX] Formations suivies : rétablissement de l'accès au dépôt de justificatif d'absence.

- [FIX] Inscriptions administratives importées : les liens historisés avec un doctorant n'étaient pas écartés.

- [FIX] Inscriptions administratives importées : refetch de l'IA pour être sûr d'avoir les jointures correctes.



13.4.0

------

module/InscriptionAdministrative/src/InscriptionAdministrative/Controller/InscriptionAdministrativeController.php

+3 −9
Changes for module/InscriptionAdministrative/src/InscriptionAdministrative/Controller/InscriptionAdministrativeController.php: 3 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 


namespace InscriptionAdministrative\Controller;



use Admission\Entity\Db\Admission;

use Admission\Service\Admission\AdmissionServiceAwareTrait;

use Application\Controller\AbstractController;

use Application\Service\AnneeUniv\AnneeUnivServiceAwareTrait;
@@ -16,7 +15,6 @@ use InscriptionAdministrative\Rule\Reception\ReceptionRulePluginManagerAwareTrai 
use InscriptionAdministrative\Service\InscriptionAdministrativeServiceAwareTrait;

use Laminas\Http\Response;

use Laminas\View\Model\ViewModel;

use RuntimeException;

use These\Service\These\TheseServiceAwareTrait;

use UnicaenApp\Traits\MessageAwareInterface;
@@ -43,9 +41,7 @@ class InscriptionAdministrativeController extends AbstractController 


    public function voirAction(): ViewModel

    {

        $id = $this->params('id');



        $this->inscriptionAdministrative = $this->inscriptionAdministrativeService->getRepository()->findOneById($id);

        $this->inscriptionAdministrative = $this->getRequestedInscriptionAdministrative();

        $inscriptionAdministrativeApprenant = $this->inscriptionAdministrative->getInscriptionAdministrativeApprenant();



        $admissions = $this->admissionService->getRepository()->findByINE($inscriptionAdministrativeApprenant->getINE());
@@ -128,9 +124,7 @@ class InscriptionAdministrativeController extends AbstractController 


    private function getRequestedInscriptionAdministrative(): ?InscriptionAdministrative

    {

        /** @var InscriptionAdministrative $inscriptionAdministrative */

        $inscriptionAdministrative = $this->inscriptionAdministrativeService->getRepository()->find($this->params('id'));



        return $inscriptionAdministrative;

        // fetch avec jointures

        return $this->inscriptionAdministrativeService->getRepository()->findOneById($this->params('id'));

    }

}
 
 No newline at end of file

module/InscriptionAdministrative/src/InscriptionAdministrative/Process/Reception/InscriptionAdministrativeReceptionProcess.php

+3 −2
Changes for module/InscriptionAdministrative/src/InscriptionAdministrative/Process/Reception/InscriptionAdministrativeReceptionProcess.php: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ namespace InscriptionAdministrative\Process\Reception; 
use Acteur\Service\ActeurThese\ActeurTheseServiceAwareTrait;

use Admission\Entity\Db\Admission;

use Admission\Service\Etat\EtatServiceAwareTrait;

use Application\Entity\Db\Role;

use Doctorant\Entity\Db\Doctorant;

use Doctorant\Service\DoctorantServiceAwareTrait;

use Doctrine\ORM\Exception\ORMException;
@@ -65,7 +64,9 @@ class InscriptionAdministrativeReceptionProcess extends AbstractProcess 


    public function setInscriptionAdministrative(InscriptionAdministrative $inscriptionAdministrative): void

    {

        $this->inscriptionAdministrative = $inscriptionAdministrative;

        // refetch pour être sûr d'avoir les jointures correctes

        $this->inscriptionAdministrative =

            $this->inscriptionAdministrativeService->getRepository()->findOneById($inscriptionAdministrative->getId());



        /** @var InscriptionAdministrativeApprenant $iaApprenant */

        $iaApprenant = $this->inscriptionAdministrative->getInscriptionAdministrativeApprenant();