Commit c134e6ac authored by Thomas Hamel's avatar Thomas Hamel
Browse files

Merge branch 'ameliorations_admission' into release_8.6.0

parents 5957b316 ad1fb937

doc/release-notes/8.6.0/01_admission.sql

0 → 100644
+2 −0
Changes for doc/release-notes/8.6.0/01_admission.sql: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line 
ALTER TABLE admission_etudiant

    ALTER COLUMN adresse_cp_ville_etrangere TYPE VARCHAR(38)

module/Admission/src/Admission/Controller/AdmissionController.php

+6 −1
Changes for module/Admission/src/Admission/Controller/AdmissionController.php: 6 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -34,7 +34,9 @@ use Application\Entity\Db\Role; 
use Application\Service\Role\RoleServiceAwareTrait;

use Application\Service\UserContextServiceAwareTrait;

use DateTime;

use Doctorant\Entity\Db\Doctorant;

use Doctrine\ORM\Exception\ORMException;

use Doctrine\ORM\Query\Expr\Join;

use Exception;

use Fichier\Entity\Db\NatureFichier;

use Fichier\Service\Fichier\FichierStorageServiceAwareTrait;
@@ -719,7 +721,10 @@ class AdmissionController extends AdmissionAbstractController { 
        $qb = $this->admissionRechercheService->getQueryBuilder();

        $qb

            ->andWhere($qb->expr()->orX('admission.etat = :etat'))

            ->setParameter('etat', Etat::CODE_VALIDE);

            ->setParameter('etat', Etat::CODE_VALIDE)

            ->leftJoin('admission.individu', 'i')

            ->leftJoin(Doctorant::class, 'd', 'WITH', 'd.individu = i')

            ->andWhere('d.id IS NULL');

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



        //Génération des CSV

module/Admission/src/Admission/Service/Exporter/Admission/AdmissionExporter.php

+4 −1
Changes for module/Admission/src/Admission/Service/Exporter/Admission/AdmissionExporter.php: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -67,8 +67,11 @@ class AdmissionExporter{ 
            $entry = [];

            /** @var Etudiant $etudiant */

            $etudiant = $admission->getEtudiant()->first();

            if($sexe = $etudiant->getSexe()){

                $sexe = rtrim($etudiant->getSexe(), '.') === "M" ? "M" : "F";

            }

            $entry['numero_candidat'] = $etudiant->getNumeroCandidat();

            $entry['sexe'] = rtrim($etudiant->getSexe(), '.');

            $entry['sexe'] = $sexe;

            $entry['nom_famille'] = $etudiant->getNomFamille();

            $entry['nom_usuel'] = $etudiant->getNomUsuel();

            $entry['prenom'] = $etudiant->getPrenom();