Commit 681e3e2e authored by Thomas Hamel's avatar Thomas Hamel
Browse files

rename numero_candidat to numero_candidature

parent a2a28687

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

+3 −3
Changes for doc/release-notes/8.6.0/01_admission.sql: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ VALUES ('Url#AccueilAdmission', '<p>Permet de récupérer l''url de l''accueil d 
alter table admission_financement

    ADD column if not exists financement_compl_id bigint REFERENCES origine_financement (id);



-- déplacement du numero_candidat de admission_etudiant vers admission_admission

-- déplacement du numero_candidature de admission_etudiant vers admission_admission

ALTER TABLE admission_admission

    ADD COLUMN numero_candidat VARCHAR(10);

    ADD COLUMN numero_candidature VARCHAR(10);



UPDATE admission_admission aa

SET numero_candidat = ae.numero_candidat

SET numero_candidature = ae.numero_candidat

    FROM admission_etudiant ae

WHERE aa.id = ae.admission_id;

module/Admission/src/Admission/Controller/Avis/AdmissionAvisController.php

+2 −2
Changes for module/Admission/src/Admission/Controller/Avis/AdmissionAvisController.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ class AdmissionAvisController extends AbstractController 


                if($admission->getEtat()->getCode() === Etat::CODE_VALIDE){

                    //Génération du numéro de candidat

                    $admission->setNumeroCandidat($this->admissionService->generateUniqueNumeroCandidat($admission));

                    $admission->setNumeroCandidature($this->admissionService->generateUniqueNumeroCandidature($admission));

                    $this->admissionService->update($admission);

                }
@@ -113,7 +113,7 @@ class AdmissionAvisController extends AbstractController 


                if($admission->getEtat()->getCode() === Etat::CODE_VALIDE){

                    //Génération du numéro de candidat

                    $admission->setNumeroCandidat($this->admissionService->generateUniqueNumeroCandidat($admission));

                    $admission->setNumeroCandidature($this->admissionService->generateUniqueNumeroCandidature($admission));

                    $this->admissionService->update($admission);

                }

module/Admission/src/Admission/Entity/Db/Admission.php

+8 −8
Changes for module/Admission/src/Admission/Entity/Db/Admission.php: 8 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ class Admission implements HistoriqueAwareInterface, ResourceInterface{ 
    /**

     * @var string|null

     */

    private $numeroCandidat;

    private $numeroCandidature;



    /**

     * @var Collection
@@ -118,27 +118,27 @@ class Admission implements HistoriqueAwareInterface, ResourceInterface{ 
    }



    /**

     * Set numeroCandidat.

     * Set numeroCandidature.

     *

     * @param string|null $numeroCandidat

     * @param string|null $numeroCandidature

     *

     * @return Admission

     */

    public function setNumeroCandidat($numeroCandidat = null)

    public function setNumeroCandidature($numeroCandidature = null)

    {

        $this->numeroCandidat = $numeroCandidat;

        $this->numeroCandidature = $numeroCandidature;



        return $this;

    }



    /**

     * Get numeroCandidat.

     * Get numeroCandidature.

     *

     * @return string|null

     */

    public function getNumeroCandidat()

    public function getNumeroCandidature()

    {

        return $this->numeroCandidat;

        return $this->numeroCandidature;

    }



    /**

module/Admission/src/Admission/Entity/Db/Mapping/Admission.Entity.Db.Admission.dcm.xml

+1 −1
Changes for module/Admission/src/Admission/Entity/Db/Mapping/Admission.Entity.Db.Admission.dcm.xml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
            <generator strategy="SEQUENCE"/>

        </id>



        <field name="numeroCandidat" type="string" column="numero_candidat" length="10" nullable="true"/>

        <field name="numeroCandidature" type="string" column="numero_candidature" length="10" nullable="true"/>



        <field name="histoCreation" type="datetime" column="histo_creation" nullable="false"/>

        <field name="histoDestruction" type="datetime" column="histo_destruction" nullable="true"/>

module/Admission/src/Admission/Service/Admission/AdmissionService.php

+1 −1
Changes for module/Admission/src/Admission/Service/Admission/AdmissionService.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ class AdmissionService extends BaseService 
        return $libelle;

    }



    public function generateUniqueNumeroCandidat(Admission $admission): string

    public function generateUniqueNumeroCandidature(Admission $admission): string

    {

        $currentYear = (new \DateTime())->format('y');

        $id = $admission->getId();