Commit 6d692eb0 authored by Thomas Hamel's avatar Thomas Hamel
Browse files

déplacement numero_candidat de admission_etudiant vers admission_admission,... 

déplacement numero_candidat de admission_etudiant vers admission_admission, fix ORMException deprecated
parent 99a8ee3b

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

+16 −0
Changes for doc/release-notes/8.6.0/01_admission.sql: 16 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -11,3 +11,19 @@ WHERE code = 'VALIDATION_GESTIONNAIRE'; 
INSERT INTO unicaen_renderer_macro (code, description, variable_name, methode_name)

VALUES ('Url#AccueilAdmission', '<p>Permet de récupérer l''url de l''accueil du module admission</p>', 'Url',

        'getAccueilAdmission');



-- ajout de la colonne pour le financement complémentaire

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

ALTER TABLE admission_admission

    ADD COLUMN numero_candidat VARCHAR(10);



UPDATE admission_admission aa

SET numero_candidat = ae.numero_candidat

    FROM admission_etudiant ae

WHERE aa.id = ae.admission_id;



ALTER TABLE admission_etudiant

DROP COLUMN numero_candidat;
 
 No newline at end of file

module/Admission/src/Admission/Assertion/AdmissionAbstractAssertion.php

+1 −1
Changes for module/Admission/src/Admission/Assertion/AdmissionAbstractAssertion.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ class AdmissionAbstractAssertion extends AbstractAssertion 


        if (empty($admission)) {

            if (($routeMatch = $this->getRouteMatch()) && $id = $routeMatch->getParam('admission')) {

                $admission = $this->admissionService->getRepository()->findOneById($id);

                $admission = $this->admissionService->getRepository()->find($id);

            }

        }

module/Admission/src/Admission/Assertion/Avis/AdmissionAvisAssertion.php

+2 −7
Changes for module/Admission/src/Admission/Assertion/Avis/AdmissionAvisAssertion.php: 2 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ class AdmissionAvisAssertion extends AdmissionOperationAbstractAssertion 
        $admission = $this->getRequestedAdmissionForAvis();

        

        try {



            switch ($action) {

                case 'aviser':

                case 'modifier':
@@ -159,7 +158,7 @@ class AdmissionAvisAssertion extends AdmissionOperationAbstractAssertion 
    {

        switch ($action) {

            case 'aviser':

                $admission = $this->admissionService->getRepository()->findOneById($this->getRouteMatch()->getParam('admission'));

                $admission = $this->admissionService->getRepository()->find($this->getRouteMatch()->getParam('admission'));

                if ($admission === null) {

                    return false;

                }
@@ -197,11 +196,7 @@ class AdmissionAvisAssertion extends AdmissionOperationAbstractAssertion 
        }



        if (($routeMatch = $this->getRouteMatch()) && $id = $routeMatch->getParam('admission') ) {

            try {

                $admission = $this->admissionService->getRepository()->findOneById($id);

            } catch (NoResultException $e) {

                throw new RuntimeException("Aucun avis trouvé avec cet id : $id", 0, $e);

            }

            $admission = $this->admissionService->getRepository()->find($id);

        }



        return $admission;

module/Admission/src/Admission/Assertion/Validation/AdmissionValidationAssertion.php

+1 −1
Changes for module/Admission/src/Admission/Assertion/Validation/AdmissionValidationAssertion.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ class AdmissionValidationAssertion extends AdmissionOperationAbstractAssertion 
    {

        switch ($action) {

            case 'valider':

                $admission = $this->admissionService->getRepository()->findOneById($this->getRouteMatch()->getParam('admission'));

                $admission = $this->admissionService->getRepository()->find($this->getRouteMatch()->getParam('admission'));

                if ($admission === null) {

                    return false;

                }

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

+2 −1
Changes for module/Admission/src/Admission/Controller/AdmissionController.php: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -642,7 +642,8 @@ class AdmissionController extends AdmissionAbstractController { 
            'operationEnAttente' => $operationEnAttente,

            'showActionButtons' => false,

            'isOperationAllowedByRole' => $isOperationAllowedByRole,

            'commentaires' => $commentaires

            'commentaires' => $commentaires,

            'title' => "Statut du dossier d'admission de {$admission->getIndividu()}"

        ]);

    }