Commit 0d782262 authored by Thomas Hamel's avatar Thomas Hamel
Browse files

Merge branch 'sygal_admission' into release_8.0.0

parents 9584db9b 38a11bf3

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

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ create table IF NOT EXISTS admission_type_validation 


INSERT INTO admission_type_validation (code, libelle)

VALUES ('ATTESTATION_HONNEUR_CHARTE_DOCTORALE',

        'Attestation sur l''honneur par l''étudiant de la bonne lecture de sa charte doctorale');

        'Attestation par l''étudiant de la bonne lecture de sa charte doctorale');

INSERT INTO admission_type_validation (code, libelle)

VALUES ('ATTESTATION_HONNEUR', 'Attestation sur l''honneur de la part de l''étudiant');

INSERT INTO admission_type_validation (code, libelle)

module/Admission/Sql/admission.sql

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ create table IF NOT EXISTS admission_type_validation 


INSERT INTO admission_type_validation (code, libelle)

VALUES ('ATTESTATION_HONNEUR_CHARTE_DOCTORALE',

        'Attestation sur l''honneur par l''étudiant de la bonne lecture de sa charte doctorale');

        'Attestation par l''étudiant de la bonne lecture de sa charte doctorale');

INSERT INTO admission_type_validation (code, libelle)

VALUES ('ATTESTATION_HONNEUR', 'Attestation sur l''honneur de la part de l''étudiant');

INSERT INTO admission_type_validation (code, libelle)

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

+7 −3
Original line number Diff line number Diff line
@@ -237,6 +237,8 @@ class AdmissionController extends AdmissionAbstractController { 
            //Récupération des opérations liées à la convention de formation doctorale du dossier d'admission

            $conventionFormationDoctoraleOperations = $this->admissionOperationRule->getOperationsForAdmission($admission, 'conventionFormationDoctorale');

            $operationEnAttente = $this->admissionOperationRule->getOperationEnAttente($admission);

            $role = $this->userContextService->getSelectedIdentityRole();

            $isOperationAllowedByRole = !$operationEnAttente || $this->admissionOperationRule->isOperationAllowedByRole($operationEnAttente, $role);

            //Récupération des documents liés à ce dossier d'admission

            $documents = $this->documentService->getRepository()->findDocumentsByAdmission($admission);

            /** @var Document $document */
@@ -258,6 +260,7 @@ class AdmissionController extends AdmissionAbstractController { 
        $response->setVariable('operationEnAttente', $operationEnAttente ?? null);

        $response->setVariable('conventionFormationDoctorale', $conventionFormationDoctorale ?? null);

        $response->setVariable('conventionFormationDoctoraleOperations', $conventionFormationDoctoraleOperations ?? null);

        $response->setVariable('isOperationAllowedByRole', $isOperationAllowedByRole ?? null);

        $response->setTemplate('admission/ajouter-document');

        return $response;

    }
@@ -656,14 +659,15 @@ class AdmissionController extends AdmissionAbstractController { 
        //Masquage des actions non voulues dans le circuit de signatures -> celles correspondant à la convention de formation doctorale

        $operations = $this->admissionOperationService->hideOperations($operations, TypeValidation::CODE_VALIDATIONS_CONVENTION_FORMATION_DOCTORALE);

        $operationEnAttente = $admission ? $this->admissionOperationRule->getOperationEnAttente($admission) : null;

        $dossierComplet = $admission?->isDossierComplet();

        $role = $this->userContextService->getSelectedIdentityRole();

        $isOperationAllowedByRole = !$operationEnAttente || $this->admissionOperationRule->isOperationAllowedByRole($operationEnAttente, $role);



        return new ViewModel([

            'operations' => $operations,

            'admission' => $admission,

            'operationEnAttente' => $operationEnAttente,

            'dossierComplet' => $dossierComplet,

            'showActionButtons' => false

            'showActionButtons' => false,

            'isOperationAllowedByRole' => $isOperationAllowedByRole

        ]);

    }

module/Admission/src/Admission/Controller/AdmissionRechercheController.php

+3 −7
Original line number Diff line number Diff line
@@ -93,9 +93,8 @@ class AdmissionRechercheController extends AbstractController implements SearchC 
        //Masquage des actions non voulues dans le circuit de signatures -> celles correspondant à la convention de formation doctorale

        $operations = $this->admissionOperationService->hideOperations($operations, TypeValidation::CODE_VALIDATIONS_CONVENTION_FORMATION_DOCTORALE);

        $operationEnAttente = $admission ? $this->admissionOperationRule->getOperationEnAttente($admission) : null;

        $dossierComplet = $admission?->isDossierComplet();



        unset($operations[TypeValidation::CODE_ATTESTATION_HONNEUR_CHARTE_DOCTORALE]);

        $role = $this->userContextService->getSelectedIdentityRole();

        $isOperationAllowedByRole = !$operationEnAttente || $this->admissionOperationRule->isOperationAllowedByRole($operationEnAttente, $role);



        //---------------------------Récupération des dossiers d'admissions correspondant aux filtres spécifiés--------------

        $this->restrictFilters();
@@ -110,19 +109,16 @@ class AdmissionRechercheController extends AbstractController implements SearchC 
        /** @var SearchResultPaginator $paginator */

        $paginator = $result;



        $etatAdmission = $this->searchService->getFilterValueByName(AdmissionRechercheService::NAME_etatAdmission);



        $model = new ViewModel([

            'admissions' => $paginator,

            'text' => $text,

            'etatAdmission' => $etatAdmission,

            'routeName' => $this->routeName,

            'operations' => $operations,

            'individu' => $individu,

            'admission' => $admission,

            'inputIndividu' => $inputIndividu,

            'operationEnAttente' => $operationEnAttente,

            'dossierComplet' => $dossierComplet

            'isOperationAllowedByRole' => $isOperationAllowedByRole

        ]);

        $model->setTemplate($this->indexActionTemplate);

        return $model;

module/Admission/view/admission/admission-recherche/index.phtml

+3 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ use UnicaenApp\Form\Element\SearchAndSelect; 
 * @var Individu $individu

 * @var SearchAndSelect $inputIndividu

 * @var AdmissionOperationInterface $operationEnAttente

 * @var boolean $isOperationAllowedByRole

 *

 * @see \Admission\Controller\AdmissionController::indexAction()

 */
@@ -59,7 +60,8 @@ echo $this->partial('admission/admission/partial/header', []); ?> 
        'returnUrl' => $returnUrl,

        'admission' => $admission,

        'operationEnAttente' => $operationEnAttente,

        'showActionButtons' => true

        'showActionButtons' => false,

        'isOperationAllowedByRole' => $isOperationAllowedByRole

    ]);

} ?>