Commit 428a1720 authored by Thomas Hamel's avatar Thomas Hamel
Browse files

améliorations diverses

parent 29d7d3e2
Loading
Loading
Loading
Loading
+3 −3
Changes for module/Admission/Module.php: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ class Module
//        $admissionListener = $container->get(AdmissionEventListener::class);
//        $admissionListener->attach($eventManager);
        
//        /** @var AdmissionValidationEventListener $admissionValidationListener */
//        $admissionValidationListener = $container->get(AdmissionValidationEventListener::class);
//        $admissionValidationListener->attach($eventManager);
        /** @var AdmissionValidationEventListener $admissionValidationListener */
        $admissionValidationListener = $container->get(AdmissionValidationEventListener::class);
        $admissionValidationListener->attach($eventManager);
    }
    public function getConfig()
    {
+93 −17
Changes for module/Admission/Sql/admission.sql: 93 added lines, 17 removed lines.
Original line number Diff line number Diff line
DROP TABLE IF EXISTS admission_etat;
DROP TABLE IF EXISTS admission_admission;
DROP TABLE IF EXISTS admission_validation;
DROP TABLE IF EXISTS admission_type_validation;
DROP TABLE IF EXISTS admission_verification;
DROP TABLE IF EXISTS admission_etudiant;
DROP TABLE IF EXISTS admission_inscription;
DROP TABLE IF EXISTS admission_financement;
DROP TABLE IF EXISTS admission_document;
DROP TABLE IF EXISTS admission_validation;
DROP TABLE IF EXISTS admission_type_validation;
DROP TABLE IF EXISTS admission_admission;

create table IF NOT EXISTS admission_etat
(
@@ -250,7 +251,7 @@ with d(ordre, code, lib) as (select 1,
                             select 4, 'admission-modifier-tous-dossiers-admission', 'Modifier un dossier d''admission'
                             union
                             select 4,
                                    'admission-modifier-modifier-son-dossier-admission',
                                    'admission-modifier-son-dossier-admission',
                                    'Modifier son dossier d''admission'
                             union
                             select 5, 'admission-historiser', 'Historiser un dossier d''admission'
@@ -269,7 +270,39 @@ with d(ordre, code, lib) as (select 1,
                             union
                             select 10, 'admission-devalider-tout', 'Dévalider son dossier d''admission'
                             union
                             select 11, 'admission-devalider-sien', 'Dévalider un dossier d''admission')
                             select 11, 'admission-devalider-sien', 'Dévalider un dossier d''admission'
                             union
                             select 12,
                                    'admission-televerser-tout-document',
                                    'Téléverser un document dans un dossier d''admission'
                             union
                             select 13,
                                    'admission-televerser-son-document',
                                    'Téléverser un document dans son d''admission'
                             union
                             select 14,
                                    'admission-supprimer-tout-document',
                                    'Supprimer un document dans un dossier d''admission'
                             union
                             select 15,
                                    'admission-supprimer-son-document',
                                    'Supprimer un document dans son dossier d''admission'
                             union
                             select 16,
                                    'admission-telecharger-tout-document',
                                    'Télécharger un document dans un dossier d''admission'
                             union
                             select 17,
                                    'admission-telecharger-son-document',
                                    'Télécharger un document dans son dossier d''admission'
                             union
                             select 18,
                                    'admission-notifier-gestionnaires',
                                    'Notifier ses gestionnaires de la fin de saisie de son dossier d''admission'
                             union
                             select 19,
                                    'admission-commentaires-ajoutes',
                                    'Notifier l''étudiant des commentaires ajoutés sur son dossier d''admission')
select nextval('privilege_id_seq'), cp.id, d.code, d.lib, d.ordre
from d
         join CATEGORIE_PRIVILEGE cp on cp.CODE = 'admission'
@@ -291,7 +324,7 @@ with data(categ, priv) as (select 'admission', 'admission-lister-tous-dossiers-a
                           union
                           select 'admission', 'admission-modifier-tous-dossiers-admission'
                           union
                           select 'admission', 'admission-modifier-modifier-son-dossier-admission'
                           select 'admission', 'admission-modifier-son-dossier-admission'
                           union
                           select 'admission', 'admission-historiser'
                           union
@@ -307,17 +340,27 @@ with data(categ, priv) as (select 'admission', 'admission-lister-tous-dossiers-a
                           union
                           select 'admission', 'admission-devalider-sien'
                           union
                           select 'admission', 'admission-verifier')
                           select 'admission', 'admission-verifier'
                           union
                           select 'admission', 'admission-televerser-tout-document'
                           union
                           select 'admission', 'admission-televerser-son-document'
                           union
                           select 'admission', 'admission-supprimer-tout-document'
                           union
                           select 'admission', 'admission-supprimer-son-document'
                           union
                           select 'admission', 'admission-telecharger-tout-document'
                           union
                           select 'admission', 'admission-telecharger-son-document'
                           union
                           select 'admission', 'admission-notifier-gestionnaires'
                           union
                           select 'admission', 'admission-commentaires-ajoutes')
select p.id as PRIVILEGE_ID, profil.id as PROFIL_ID
from data
         join PROFIL on profil.ROLE_ID in (
                                           'ADMIN_TECH',
                                           'GEST_ED',
                                           'GEST_UR',
                                           'RESP_UR',
                                           'RESP_ED',
                                           'D',
                                           'K'
    'ADMIN_TECH'
    )
         join CATEGORIE_PRIVILEGE cp on cp.CODE = data.categ
         join PRIVILEGE p on p.CATEGORIE_ID = cp.id and p.code = data.priv
@@ -328,22 +371,55 @@ with data(categ, priv) as (select 'admission', 'admission-lister-son-dossier-adm
                           union
                           select 'admission', 'admission-afficher-son-dossier-admission'
                           union
                           select 'admission', 'admission-modifier-modifier-son-dossier-admission'
                           select 'admission', 'admission-modifier-son-dossier-admission'
                           union
                           select 'admission', 'admission-supprimer-son-dossier-admission'
                           union
                           select 'admission', 'admission-valider-sien'
                           union
                           select 'admission', 'admission-devalider-sien')
                           select 'admission', 'admission-devalider-sien'
                           union
                           select 'admission', 'admission-televerser-son-document'
                           union
                           select 'admission', 'admission-supprimer-son-document'
                           union
                           select 'admission', 'admission-telecharger-son-document')
select p.id as PRIVILEGE_ID, profil.id as PROFIL_ID
from data
         join PROFIL on profil.ROLE_ID in (
    'DOCTORANT'
                                           'DOCTORANT',
                                           'GEST_ED',
                                           'GEST_UR',
                                           'RESP_UR',
                                           'RESP_ED',
                                           'D',
                                           'K'
    )
         join CATEGORIE_PRIVILEGE cp on cp.CODE = data.categ
         join PRIVILEGE p on p.CATEGORIE_ID = cp.id and p.code = data.priv
where not exists (select * from PROFIL_PRIVILEGE where PRIVILEGE_ID = p.id and PROFIL_ID = profil.id);

INSERT INTO PROFIL_PRIVILEGE (PRIVILEGE_ID, PROFIL_ID)
with data(categ, priv) as (select 'admission', 'admission-notifier-gestionnaires')
select p.id as PRIVILEGE_ID, profil.id as PROFIL_ID
from data
         join PROFIL on profil.ROLE_ID in (
    'DOCTORANT')
         join CATEGORIE_PRIVILEGE cp on cp.CODE = data.categ
         join PRIVILEGE p on p.CATEGORIE_ID = cp.id and p.code = data.priv
where not exists (select * from PROFIL_PRIVILEGE where PRIVILEGE_ID = p.id and PROFIL_ID = profil.id);

INSERT INTO PROFIL_PRIVILEGE (PRIVILEGE_ID, PROFIL_ID)
with data(categ, priv) as (select 'admission', 'admission-commentaires-ajoutes')
select p.id as PRIVILEGE_ID, profil.id as PROFIL_ID
from data
         join PROFIL on profil.ROLE_ID in (
                                           'GEST_ED',
                                           'GEST_UR')
         join CATEGORIE_PRIVILEGE cp on cp.CODE = data.categ
         join PRIVILEGE p on p.CATEGORIE_ID = cp.id and p.code = data.priv
where not exists (select * from PROFIL_PRIVILEGE where PRIVILEGE_ID = p.id and PROFIL_ID = profil.id);

insert into ROLE_PRIVILEGE (ROLE_ID, PRIVILEGE_ID)
select p2r.ROLE_ID, pp.PRIVILEGE_ID
from PROFIL_TO_ROLE p2r
+35 −103
Changes for module/Admission/config/module.config.php: 35 added lines, 103 removed lines.
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ use Admission\Form\Fieldset\Financement\FinancementFieldset;
use Admission\Form\Fieldset\Financement\FinancementFieldsetFactory;
use Admission\Form\Fieldset\Inscription\InscriptionFieldset;
use Admission\Form\Fieldset\Inscription\InscriptionFieldsetFactory;
use Admission\Form\Fieldset\Validation\AdmissionValidationFieldset;
use Admission\Form\Fieldset\Validation\AdmissionValidationFieldsetFactory;
use Admission\Form\Fieldset\Verification\VerificationFieldset;
use Admission\Form\Fieldset\Verification\VerificationFieldsetFactory;
use Admission\Hydrator\Admission\AdmissionHydrator;
@@ -64,6 +62,8 @@ use Admission\Service\Operation\AdmissionOperationService;
use Admission\Service\Operation\AdmissionOperationServiceFactory;
use Admission\Service\TypeValidation\TypeValidationService;
use Admission\Service\TypeValidation\TypeValidationServiceFactory;
use Admission\Service\Url\UrlService;
use Admission\Service\Url\UrlServiceFactory;
use Admission\Service\Validation\AdmissionValidationService;
use Admission\Service\Validation\AdmissionValidationServiceFactory;
use Admission\Service\Verification\VerificationService;
@@ -97,7 +97,6 @@ return array(
        'resource_providers' => [
            'BjyAuthorize\Provider\Resource\Config' => [
                'Admission' => [],
                'AdmissionValidation' => []
            ],
        ],
        'rule_providers'     => [
@@ -115,20 +114,12 @@ return array(
                            AdmissionPrivileges::ADMISSION_SUPPRIMER_SON_DOSSIER_ADMISSION,
                            AdmissionPrivileges::ADMISSION_HISTORISER,
                            AdmissionPrivileges::ADMISSION_VERIFIER,
                            AdmissionPrivileges::ADMISSION_NOTIFIER_COMMENTAIRES_AJOUTES,
                            AdmissionPrivileges::ADMISSION_NOTIFIER_GESTIONNAIRES
                        ],
                        'resources'  => ['Admission'],
                        'assertion'  => AdmissionAssertion::class,
                    ],
                    [
                        'privileges' => [
                            AdmissionPrivileges::ADMISSION_VALIDER_SIEN,
                            AdmissionPrivileges::ADMISSION_VALIDER_TOUT,
                            AdmissionPrivileges::ADMISSION_DEVALIDER_SIEN,
                            AdmissionPrivileges::ADMISSION_DEVALIDER_TOUT
                        ],
                        'resources'  => ['AdmissionValidation'],
                        'assertion'  => AdmissionValidationAssertion::class,
                    ],
                ],
            ],
        ],
@@ -138,12 +129,7 @@ return array(
                    'controller' => AdmissionController::class,
                    'action' => [
                        'index',
                        'confirmer',
                        'enregistrer',
                        'rechercher-individu',
                        'enregistrer-document',
                        'supprimer-document',
                        'telecharger-document'
                        'rechercher-individu'
                    ],
                    'privileges' => [
                        AdmissionPrivileges::ADMISSION_LISTER_SON_DOSSIER_ADMISSION,
@@ -151,15 +137,6 @@ return array(
                    ],
                    'assertion' => AdmissionAssertion::class,
                ],
                [
                    'controller' => AdmissionController::class,
                    'action' => [
                        'ajouter',
                    ],
                    'privileges' => [
                        AdmissionPrivileges::ADMISSION_LISTER_TOUS_DOSSIERS_ADMISSION,
                    ],
                ],
                [
                    'controller' => AdmissionController::class,
                    'action' => [
@@ -167,10 +144,13 @@ return array(
                        'inscription',
                        'financement',
                        'document',
                        'enregistrer',
                    ],
                    'privileges' => [
                        AdmissionPrivileges::ADMISSION_AFFICHER_SON_DOSSIER_ADMISSION,
                        AdmissionPrivileges::ADMISSION_AFFICHER_TOUS_DOSSIERS_ADMISSION,
                        AdmissionPrivileges::ADMISSION_MODIFIER_TOUS_DOSSIERS_ADMISSION,
                        AdmissionPrivileges::ADMISSION_MODIFIER_SON_DOSSIER_ADMISSION,
                    ],
                    'assertion' => AdmissionAssertion::class,
                ],
@@ -178,34 +158,34 @@ return array(
                    'controller' => AdmissionController::class,
                    'action' => [
                        'annuler',
                        'supprimer',
                    ],
                    'privileges' => [
                        AdmissionPrivileges::ADMISSION_SUPPRIMER_SON_DOSSIER_ADMISSION,
                        AdmissionPrivileges::ADMISSION_SUPPRIMER_TOUS_DOSSIERS_ADMISSION,
                    ],
                    'assertion' => AdmissionAssertion::class,
                ],
                [
                    'controller' => AdmissionValidationController::class,
                    'controller' => AdmissionController::class,
                    'action' => [
                        'valider',
                        'notifier-gestionnaire',
                    ],
                    'privileges' => [
                        AdmissionPrivileges::ADMISSION_VALIDER_TOUT,
                        AdmissionPrivileges::ADMISSION_VALIDER_SIEN,
                        AdmissionPrivileges::ADMISSION_NOTIFIER_GESTIONNAIRES,
                    ],
                    'assertion' => AdmissionValidationAssertion::class,
                    'assertion' => AdmissionAssertion::class,
                ],
                [
                    'controller' => AdmissionValidationController::class,
                    'controller' => AdmissionController::class,
                    'action' => [
                        'devalider',
                        'notifier-commentaires-ajoutes',
                    ],
                    'privileges' => [
                        AdmissionPrivileges::ADMISSION_DEVALIDER_TOUT,
                        AdmissionPrivileges::ADMISSION_DEVALIDER_SIEN,
                    ],
                    'assertion' => AdmissionValidationAssertion::class,
                        AdmissionPrivileges::ADMISSION_NOTIFIER_COMMENTAIRES_AJOUTES,
                    ],
                    'assertion' => AdmissionAssertion::class,
                ]
            ]
        ],
    ],
@@ -232,99 +212,59 @@ return array(
                                 * @see AdmissionController::inscriptionAction()
                                 * @see AdmissionController::financementAction()
                                 * @see AdmissionController::documentAction()
                                 * @see AdmissionController::supprimerAction()
                                 */
                                'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
                                'admission' => '[0-9]*'
                            ],
                        ],
                    ],
                    'valider' => [
                    'notifier-commentaires-ajoutes' => [
                        'type' => Segment::class,
                        'options' => [
                            'route' => '/valider/:admission/type/:typeValidation',
                            'route' => '/notifier-commentaires-ajoutes/:admission',
                            'constraints' => [
                                'admission' => '\d+',
                                'typeValidation' => '\d+',
                                'admission' => '[0-9]*'
                            ],
                            'defaults' => [
                                'controller' => AdmissionValidationController::class,
                                'action' => 'valider',
                                /* @see AdmissionValidationController::validerAction() */
                                'controller' => AdmissionController::class,
                                'action' => 'notifier-commentaires-ajoutes',
                                /* @see AdmissionController::notifierCommentairesAjoutesAction() */
                            ],
                        ],
                    ],
                    'devalider' => [
                    'notifier-gestionnaire' => [
                        'type' => Segment::class,
                        'options' => [
                            'route' => '/devalider/:admissionValidation',
                            'route' => '/notifier-gestionnaire/:admission',
                            'constraints' => [
                                'admissionValidation' => '\d+',
                                'admission' => '[0-9]*'
                            ],
                            'defaults' => [
                                'controller' => AdmissionValidationController::class,
                                'action' => 'devalider',
                                /* @see AdmissionValidationController::devaliderAction() */
                                'controller' => AdmissionController::class,
                                'action' => 'notifier-gestionnaire',
                                /* @see AdmissionController::notifierGestionnaireAction() */
                            ],
                        ],
                    ],
                    /**
                     * @see AdmissionController::rechercherIndividuAction()
                     */
                    'rechercher-individu' => [
                        'type'          => Segment::class,
                        'options'       => [
                            'route'       => '/rechercher-individu',
                            'defaults'    => [
                                'action' => 'rechercher-individu',
                                /* @see AdmissionController::rechercherIndividuAction() */
                            ],
                        ],
                    ],
                    /**
                     * @see AdmissionController::enregistrerDocumentAction()
                     */
                    'enregistrer-document' => [
                        'type'          => Literal::class,
                        'options'       => [
                            'route'       => '/enregistrer-document',
                            'defaults'    => [
                                'action' => 'enregistrer-document',
                            ],
                        ],
                    ],
                    /**
                     * @see AdmissionController::supprimerDocumentAction()
                     */
                    'supprimer-document' => [
                        'type'          => Literal::class,
                        'options'       => [
                            'route'       => '/supprimer-document',
                            'defaults'    => [
                                'action' => 'supprimer-document',
                            ],
                        ],
                    ],
                    /**
                     * @see AdmissionController::telechargerDocumentAction()
                     */
                    'telecharger-document' => [
                        'type'          => Literal::class,
                        'options'       => [
                            'route'       => '/telecharger-document',
                            'defaults'    => [
                                'action' => 'telecharger-document',
                            ],
                ],
            ],
        ],
    ],

        ],
    ],

    'controllers' => [
        'factories' => [
            AdmissionController::class => AdmissionControllerFactory::class,
            AdmissionValidationController::class => AdmissionValidationControllerFactory::class,
        ],
    ],

@@ -334,7 +274,6 @@ return array(
            EtudiantFieldset::class => EtudiantFieldsetFactory::class,
            InscriptionFieldset::class => InscriptionFieldsetFactory::class,
            FinancementFieldset::class => FinancementFieldsetFactory::class,
            AdmissionValidationFieldset::class => AdmissionValidationFieldsetFactory::class,
            VerificationFieldset::class => VerificationFieldsetFactory::class,
            DocumentFieldset::class => DocumentFieldsetFactory::class
        ],
@@ -354,8 +293,6 @@ return array(

    'service_manager' => [
        'factories' => [
            ModuleConfig::class => ModuleConfigFactory::class,

            AdmissionService::class => AdmissionServiceFactory::class,
            FinancementService::class => FinancementServiceFactory::class,
            EtudiantService::class => EtudiantServiceFactory::class,
@@ -363,17 +300,12 @@ return array(
            TypeValidationService::class => TypeValidationServiceFactory::class,
            DocumentService::class => DocumentServiceFactory::class,
            VerificationService::class => VerificationServiceFactory::class,
            AdmissionValidationService::class => AdmissionValidationServiceFactory::class,
            AdmissionOperationService::class => AdmissionOperationServiceFactory::class,

            AdmissionEventListener::class => AdmissionEventListenerFactory::class,
            AdmissionValidationEventListener::class => AdmissionValidationEventListenerFactory::class,

            OperationAttendueNotificationRule::class => OperationAttendueNotificationRuleFactory::class,
            AdmissionOperationRule::class => AdmissionOperationRuleFactory::class,

            AdmissionValidationAssertion::class => AdmissionValidationAssertionFactory::class,
            AdmissionAssertion::class => AdmissionAssertionFactory::class,

            UrlService::class => UrlServiceFactory::class,
        ],
    ],

+0 −82

File deleted.

Preview size limit exceeded, changes collapsed.

+117 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading