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

Merge branch 'ameliorations_admission' into release_8.6.1

parents 777c102e f258b3f7

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

+3 −0
Changes for doc/release-notes/8.6.0/02_admission.sql: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ 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);



-- ajout de la colonne pour référencer le futur doctorant de ce dossier

alter table admission_admission add column if not exists doctorant_id bigint REFERENCES doctorant (id);



-- déplacement du numero_candidature de admission_etudiant vers admission_admission

ALTER TABLE admission_admission

    ADD COLUMN numero_candidature VARCHAR(10);

module/Admission/src/Admission/Assertion/AdmissionAssertion.php

+2 −2
Changes for module/Admission/src/Admission/Assertion/AdmissionAssertion.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -270,8 +270,8 @@ class AdmissionAssertion extends AdmissionAbstractAssertion implements UserConte 
                "Le dossier d'admission doit être en cours de validation / être validé / être rejeté"

            );

        }elseif($codeNatureFichier === NatureFichier::CODE_ADMISSION_CHARTE_DOCTORAT_SIGNEE){

            if(!($this->userContextService->getSelectedIdentityRole()->getRoleId() === Role::ROLE_ID_ADMISSION_CANDIDAT)){

                throw new FailedAssertionException("Seul le candidat peut gérer ce document");

            if(!($this->userContextService->getSelectedIdentityRole()->getRoleId() === Role::ROLE_ID_ADMISSION_CANDIDAT || $this->userContextService->getSelectedRoleEcoleDoctorale() || $this->userContextService->getSelectedIdentityRole()->getCode() === Role::CODE_ADMIN_TECH)){

                throw new FailedAssertionException("Seul le candidat et le gestionnaire d'ED peut gérer ce document");

            }

        }else{

            $this->assertTrue(

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

+30 −0
Changes for module/Admission/src/Admission/Entity/Db/Admission.php: 30 added lines, 0 removed lines.
Original line number Diff line number Diff line 
<?php

namespace Admission\Entity\Db;



use Doctorant\Entity\Db\Doctorant;

use Doctrine\Common\Collections\ArrayCollection;

use Doctrine\Common\Collections\Collection;

use Individu\Entity\Db\Individu;
@@ -74,6 +75,11 @@ class Admission implements HistoriqueAwareInterface, ResourceInterface{ 
     */

    private $individu;



    /**

     * @var Doctorant

     */

    private $doctorant;



    /** @var AdmissionAvis | AdmissionValidation|null */

    private $operationPossible = null;
@@ -386,6 +392,30 @@ class Admission implements HistoriqueAwareInterface, ResourceInterface{ 
        return $this->individu;

    }



    /**

     * Set doctorant.

     *

     * @param Doctorant|null $doctorant

     *

     * @return Admission

     */

    public function setDoctorant(Doctorant $doctorant = null)

    {

        $this->doctorant = $doctorant;



        return $this;

    }



    /**

     * Get doctorant.

     *

     * @return Doctorant|null

     */

    public function getDoctorant()

    {

        return $this->doctorant;

    }



    /**

     * Injecte l'opération éventuelle qu'il est possible de réaliser sur ce dossier d'admission.

     */

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

+6 −0
Changes for module/Admission/src/Admission/Entity/Db/Mapping/Admission.Entity.Db.Admission.dcm.xml: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -20,6 +20,12 @@ 
            </join-columns>

        </many-to-one>



        <many-to-one field="doctorant" target-entity="Doctorant\Entity\Db\Doctorant">

            <join-columns>

                <join-column name="doctorant_id" referenced-column-name="id"/>

            </join-columns>

        </many-to-one>



        <many-to-one field="etat" target-entity="Admission\Entity\Db\Etat">

            <join-columns>

                <join-column name="etat_code" referenced-column-name="code"/>

module/Admission/view/admission/admission/partial/document/document.phtml

+0 −1
Changes for module/Admission/view/admission/admission/partial/document/document.phtml: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
 * @var array $documents

 * @var AdmissionValidation $validation_charte_doctorat

 * @var string $returnUrl

 * @var boolean $showActionButtons

 * @var ConventionFormationDoctorale $conventionFormationDoctorale

 * @var Admission $admission

 * @var array $conventionFormationDoctoraleOperations