Commit 068a2b19 authored by Thomas Hamel's avatar Thomas Hamel
Browse files

modifs suite au gt du 22/02

parent dc60ee1e

module/Admission/Sql/admission.sql

+10 −0
Changes for module/Admission/Sql/admission.sql: 10 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -1529,6 +1529,16 @@ VALUES ('ADMISSION_VALIDATION_SUPPRIMEE', 
        null, 'Admission\Provider\Template');

INSERT INTO public.unicaen_renderer_template (code, description, document_type, document_sujet, document_corps,

                                              document_css, namespace)

VALUES ('ADMISSION_VALIDATION_SUPPRIMEE',

        '<p>Notification lorsque qu''un avis émis est ''Dossier incomplet'' lors du circuit de signatures du dossier d''admission</p>', 'mail',

        'Le dossier d''admission de VAR[Individu#Denomination] est incomplet', e'<p>Bonjour,</p>

<p>Ceci est un mail envoyé automatiquement par l''application ESUP-SyGAL.</p>

<p>Le <strong>dossier d''admission</strong> de <strong>VAR[Individu#Denomination]</strong> a été déclaré comme <strong>incomplet</strong> par VAR[AdmissionAvis#Auteur], le VAR[AdmissionAvis#Date].</p>

<p>Cela a pour conséquence de supprimer l''intégralité des validations préalablement effectuées.</p>

<p>Veuillez prendre connaissance de cette déclaration, en vous connectant sur la plateforme ESUP-SyGAL via le lien suivant : VAR[Url#Admission] </p>',

        null, 'Admission\Provider\Template');

INSERT INTO public.unicaen_renderer_template (code, description, document_type, document_sujet, document_corps,

                                              document_css, namespace)

VALUES ('ADMISSION_CONVENTION_FORMATION_DOCTORALE',

        '<p>Convention de formation doctorale appartenant à un dossier d''admission</p>', 'pdf',

        'Convention de formation doctorale de VAR[Individu#Denomination]', e'<h1 style="text-align: center;">Convention de formation doctorale</h1>

module/Admission/config/module.config.php

+14 −17
Changes for module/Admission/config/module.config.php: 14 added lines, 17 removed lines.
Original line number Diff line number Diff line
@@ -189,7 +189,6 @@ return array( 
                [

                    'controller' => AdmissionController::class,

                    'action' => [

                        'notifier-dossier-complet',

                        'notifier-dossier-incomplet',

                    ],

                    'privileges' => [
@@ -310,7 +309,7 @@ return array( 
                        ],

                    ],

                    'rechercher-individu' => [

                        'type'          => Segment::class,

                        'type'          => Literal::class,

                        'options'       => [

                            'route'       => '/rechercher-individu',

                            'defaults'    => [
@@ -321,7 +320,7 @@ return array( 
                        ],

                    ],

                    'recherche' => [

                        'type' => 'Literal',

                        'type' => Literal::class,

                        'options' => [

                            'route' => '/recherche',

                            'defaults' => [
@@ -332,7 +331,7 @@ return array( 
                        'may_terminate' => true,

                        'child_routes' => [

                            'filters' => [

                                'type' => 'Literal',

                                'type' => Literal::class,

                                'options' => [

                                    'route' => '/filters',

                                    'defaults' => [
@@ -376,22 +375,15 @@ return array( 
                        'pages' => [

                        ],

                    ],



                    /**

                     * Page pour Gest/Resp ED, Gest/Resp UR, Maison du Doctorat.

                     * Page pour Dir, Codir.

                     */

                    // DEPTH = 1

                    ApplicationNavigationFactory::NOS_THESES_PAGE_ID => [

                        'pages' => [

                            // DEPTH = 2

                            'ADMISSIONS' => [

                                'label' => '(Rapports activité Structure)',

                    ApplicationNavigationFactory::NOS_ADMISSIONS_PAGE_ID => [

                        'order' => -200,

                        'label' => 'Nos admissions',

                        'route' => 'admission',

                        'resource' => PrivilegeController::getResourceId(AdmissionRechercheController::class, 'index'),

                                'privilege' => [

                                    AdmissionPrivileges::ADMISSION_LISTER_MES_DOSSIERS_ADMISSION,

                                ],

                            ],

                        'pages' => [

                        ],

                    ],

                ],
@@ -461,9 +453,14 @@ return array( 
        ],

        'stylesheets' => [

            '080_admission' => '/css/admission.css',

            '090_filepond' => "/vendor/filepond/filepond.css",

            '0100_filepond_pdf_preview' => "/vendor/filepond/filepond-plugin-pdf-preview.min.css",

        ],

        'head_scripts' => [

            '080_uploader' => "/js/admission.js",

            '080_admission' => "/js/admission.js",

            '090_filepond' => "vendor/filepond/filepond.min.js",

            '0100_filepond_pdf_preview' => "vendor/filepond/filepond-plugin-pdf-preview.min.js",

            '0110_filepond-plugin-file-validate-type' => "vendor/filepond/filepond-plugin-file-validate-type.js",

        ],

    ],

);

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

+0 −11
Changes for module/Admission/src/Admission/Assertion/Avis/AdmissionAvisAssertion.php: 0 added lines, 11 removed lines.
Original line number Diff line number Diff line
@@ -115,17 +115,6 @@ class AdmissionAvisAssertion extends AdmissionOperationAbstractAssertion 
                    break;

            }



            switch ($privilege) {

                case AdmissionPrivileges::ADMISSION_AJOUTER_AVIS_TOUT:

                case AdmissionPrivileges::ADMISSION_AJOUTER_AVIS_SIEN:

                case AdmissionPrivileges::ADMISSION_MODIFIER_AVIS_TOUT:

                case AdmissionPrivileges::ADMISSION_MODIFIER_AVIS_SIEN:

                case AdmissionPrivileges::ADMISSION_SUPPRIMER_AVIS_TOUT:

                case AdmissionPrivileges::ADMISSION_SUPPRIMER_AVIS_SIEN:

//                    $this->assertAucuneValidation($admission);

//                    break;

            }



            switch ($privilege) {

                case AdmissionPrivileges::ADMISSION_AJOUTER_AVIS_TOUT:

                case AdmissionPrivileges::ADMISSION_AJOUTER_AVIS_SIEN:

module/Admission/src/Admission/Config/ModuleConfig.php

+5 −5
Changes for module/Admission/src/Admission/Config/ModuleConfig.php: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -122,9 +122,9 @@ class ModuleConfig 
                    'validation_convention_formation_doctorale_dir_ur_operation_name' => self::VALIDATION_CONVENTION_FORMATION_DOCTORALE_DIR_UR,

                    'validation_convention_formation_doctorale_dir_ed_operation_name' => self::VALIDATION_CONVENTION_FORMATION_DOCTORALE_DIR_ED,

                    // Si un avis "dossier d'admssion incomplet" est émis, on supprimera toutes les validations précédentes.

                    'validation_etudiant_charte_doctorale' => self::ATTESTATION_HONNEUR_CHARTE_DOCTORALE,

                    'validation_etudiant_operation_name' => self::ATTESTATION_HONNEUR,

                    'validation_gestionnaire_operation_name' => self::VALIDATION_GESTIONNAIRE,

                    'avis_direction_these_operation_name' => self::AVIS_DIR_THESE,

                    'avis_codirection_these_operation_name' => self::AVIS_CODIR_THESE,

                    'avis_direction_ur_operation_name' => self::AVIS_DIR_UR,

                    'avis_direction_ed_operation_name' => self::AVIS_DIR_ED,
@@ -185,10 +185,10 @@ class ModuleConfig 
                    'validation_convention_formation_doctorale_dir_ur_operation_name' => self::VALIDATION_CONVENTION_FORMATION_DOCTORALE_DIR_UR,

                    'validation_convention_formation_doctorale_dir_ed_operation_name' => self::VALIDATION_CONVENTION_FORMATION_DOCTORALE_DIR_ED,

                    // Si un avis "dossier d'admssion incomplet" est émis, on supprimera toutes les validations précédentes.

                    'validation_etudiant_charte_doctorale' => self::ATTESTATION_HONNEUR_CHARTE_DOCTORALE,

                    'validation_etudiant_operation_name' => self::ATTESTATION_HONNEUR,

                    'validation_gestionnaire_operation_name' => self::VALIDATION_GESTIONNAIRE,

                    'avis_direction_these_operation_name' => self::AVIS_DIR_THESE,

                    'avis_codirection_these_operation_name' => self::AVIS_CODIR_THESE,

                    'avis_direction_ur_operation_name' => self::AVIS_DIR_UR,

                    'avis_direction_ed_operation_name' => self::AVIS_DIR_ED,

                    'avis_presidence_operation_name' => self::SIGNATURE_PRESIDENT,
@@ -236,11 +236,11 @@ class ModuleConfig 
                    'validation_convention_formation_doctorale_dir_ur_operation_name' => self::VALIDATION_CONVENTION_FORMATION_DOCTORALE_DIR_UR,

                    'validation_convention_formation_doctorale_dir_ed_operation_name' => self::VALIDATION_CONVENTION_FORMATION_DOCTORALE_DIR_ED,

                    // Si un avis "dossier d'admssion incomplet" est émis, on supprimera toutes les validations précédentes.

                    'validation_etudiant_charte_doctorale' => self::ATTESTATION_HONNEUR_CHARTE_DOCTORALE,

                    'validation_etudiant_operation_name' => self::ATTESTATION_HONNEUR,

                    'validation_gestionnaire_operation_name' => self::VALIDATION_GESTIONNAIRE,

                    'avis_direction_these_operation_name' => self::AVIS_DIR_THESE,

                    'avis_codirection_these_operation_name' => self::AVIS_CODIR_THESE,

                    'avis_direction_ur_operation_name' => self::AVIS_DIR_UR,

                    'avis_direction_ed_operation_name' => self::AVIS_DIR_ED,

                    'avis_presidence_operation_name' => self::SIGNATURE_PRESIDENT,

                ],
@@ -291,12 +291,12 @@ class ModuleConfig 
                    'validation_convention_formation_doctorale_dir_ur_operation_name' => self::VALIDATION_CONVENTION_FORMATION_DOCTORALE_DIR_UR,

                    'validation_convention_formation_doctorale_dir_ed_operation_name' => self::VALIDATION_CONVENTION_FORMATION_DOCTORALE_DIR_ED,

                    // Si un avis "dossier d'admssion incomplet" est émis, on supprimera toutes les validations précédentes.

                    'validation_etudiant_charte_doctorale' => self::ATTESTATION_HONNEUR_CHARTE_DOCTORALE,

                    'validation_etudiant_operation_name' => self::ATTESTATION_HONNEUR,

                    'validation_gestionnaire_operation_name' => self::VALIDATION_GESTIONNAIRE,

                    'avis_direction_these_operation_name' => self::AVIS_DIR_THESE,

                    'avis_codirection_these_operation_name' => self::AVIS_CODIR_THESE,

                    'avis_direction_ur_operation_name' => self::AVIS_DIR_UR,

                    'avis_direction_ed_operation_name' => self::AVIS_DIR_ED,

                    'avis_presidence_operation_name' => self::SIGNATURE_PRESIDENT,

                ],

                //pas de notif, peut-être à enlever si changement d'ordre des validations
@@ -325,13 +325,13 @@ class ModuleConfig 
                    'validation_convention_formation_doctorale_dir_ur_operation_name' => self::VALIDATION_CONVENTION_FORMATION_DOCTORALE_DIR_UR,

                    'validation_convention_formation_doctorale_dir_ed_operation_name' => self::VALIDATION_CONVENTION_FORMATION_DOCTORALE_DIR_ED,

                    // Si un avis "dossier d'admssion incomplet" est émis, on supprimera toutes les validations précédentes.

                    'validation_etudiant_charte_doctorale' => self::ATTESTATION_HONNEUR_CHARTE_DOCTORALE,

                    'validation_etudiant_operation_name' => self::ATTESTATION_HONNEUR,

                    'validation_gestionnaire_operation_name' => self::VALIDATION_GESTIONNAIRE,

                    'avis_direction_these_operation_name' => self::AVIS_DIR_THESE,

                    'avis_codirection_these_operation_name' => self::AVIS_CODIR_THESE,

                    'avis_direction_ur_operation_name' => self::AVIS_DIR_UR,

                    'avis_direction_ed_operation_name' => self::AVIS_DIR_ED,

                    'avis_presidence_operation_name' => self::SIGNATURE_PRESIDENT,

                ],

                'enabled' => null,

                'enabled_as_dql' => null,

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

+104 −103

File changed.

Preview size limit exceeded, changes collapsed.