Commit 8c88240c authored by Thomas Hamel's avatar Thomas Hamel
Browse files

circuit de validations à priori fonctionnel

parent c51c88d4
Loading
Loading
Loading
Loading
+1 −1
Changes for composer.json: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@
        "webmozart/assert": "^1.3",

        "unicaen/alerte": "^2.0",
        "unicaen/app": "dev-feature_SearchAndSelectFilter as 6.0.7",
        "unicaen/app": "6.0.*",
        "unicaen/auth": "^6.0",
        "unicaen/auth-token": "^6.0",
        "unicaen/console": "^6.0",
+21 −0
Changes for module/Admission/Module.php: 21 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,11 +2,32 @@

namespace Admission;

use Admission\Event\AdmissionEventListener;
use Admission\Event\Validation\AdmissionValidationEventListener;
use Laminas\Config\Factory as ConfigFactory;
use Laminas\Mvc\MvcEvent;
use Laminas\Stdlib\Glob;

class Module
{
    /**
     * @throws \Psr\Container\ContainerExceptionInterface
     * @throws \Psr\Container\NotFoundExceptionInterface
     */
    public function onBootstrap(MvcEvent $e)
    {
        $eventManager = $e->getApplication()->getEventManager();

        $container = $e->getApplication()->getServiceManager();

//        /** @var AdmissionEventListener $admissionListener */
//        $admissionListener = $container->get(AdmissionEventListener::class);
//        $admissionListener->attach($eventManager);
        
//        /** @var AdmissionValidationEventListener $admissionValidationListener */
//        $admissionValidationListener = $container->get(AdmissionValidationEventListener::class);
//        $admissionValidationListener->attach($eventManager);
    }
    public function getConfig()
    {
        $paths = array_merge(
+59 −49
Changes for module/Admission/Sql/admission.sql: 59 added lines, 49 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_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;


-- Nouvelle table
create table IF NOT EXISTS admission_etat
(
    code        varchar(1) not null primary key,
@@ -11,6 +17,12 @@ create table IF NOT EXISTS admission_etat
    ordre       bigint
);

INSERT INTO admission_etat (code, libelle, description, icone, couleur, ordre)
VALUES ('C', 'En cours', 'Dossier d''admission en cours de saisie', '', '', 1),
       ('A', 'Abandonné', 'Dossier d''admission abandonné', '', '', 3),
       ('V', 'Validé', 'Dossier d''admission validé', '', '', 2)
ON CONFLICT DO NOTHING;

create table IF NOT EXISTS admission_admission
(
    id                    bigserial                                                    not null
@@ -125,22 +137,31 @@ create table IF NOT EXISTS admission_type_validation
    id      bigserial   not null
        primary key,
    code    varchar(50) not null,
    libelle               varchar(100),
    histo_createur_id     bigint                                                       not null REFERENCES utilisateur (id),
    histo_creation        timestamp default ('now'::text)::timestamp without time zone not null,
    histo_modificateur_id bigint REFERENCES utilisateur (id),
    histo_modification    timestamp,
    histo_destructeur_id  bigint REFERENCES utilisateur (id),
    histo_destruction     timestamp
    libelle varchar(100)
);

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)
VALUES ('VALIDATION_GESTIONNAIRE', 'Validation effectuée par les gestionnaires');
INSERT INTO admission_type_validation (code, libelle)
VALUES ('VALIDATION_DIRECTION_THESE', 'Validation par la direction de thèse');
INSERT INTO admission_type_validation (code, libelle)
VALUES ('VALIDATION_CO_DIRECTION_THESE', 'Validation par la codirection de thèse');
INSERT INTO admission_type_validation (code, libelle)
VALUES ('VALIDATION_UR', 'Validation par l''unité de recherche');
INSERT INTO admission_type_validation (code, libelle)
VALUES ('VALIDATION_ED', 'Validation par l''école doctorale');
INSERT INTO admission_type_validation (code, libelle)
VALUES ('SIGNATURE_PRESIDENT', 'Signature de la présidence de l''établissement d''inscription');

create table IF NOT EXISTS admission_validation
(
    id                    bigserial                                                    not null
        primary key,
    admission_id          bigint REFERENCES admission_admission (id),
    type_validation_id    bigint                                                       not null REFERENCES admission_type_validation (id),
    individu_id           bigint                                                       not null REFERENCES utilisateur (id),
    individu_id           bigint                                                       not null REFERENCES individu (id),
    histo_createur_id     bigint                                                       not null REFERENCES utilisateur (id),
    histo_creation        timestamp default ('now'::text)::timestamp without time zone not null,
    histo_modificateur_id bigint REFERENCES utilisateur (id),
@@ -149,42 +170,6 @@ create table IF NOT EXISTS admission_validation
    histo_destruction     timestamp
);

INSERT INTO admission_etat (code, libelle, description, icone, couleur, ordre)
VALUES ('C', 'En cours', 'Dossier d''admission en cours de saisie', '', '', 1),
       ('A', 'Abandonné', 'Dossier d''admission abandonné', '', '', 3),
       ('V', 'Validé', 'Dossier d''admission validé', '', '', 2)
ON CONFLICT DO NOTHING;

-- Changement de nom de la colonne etat_id en etat_code
DO
$$
    BEGIN
        IF EXISTS (SELECT 1
                   FROM information_schema.columns
                   WHERE table_name = 'admission_admission'
                     AND column_name = 'etat_id') THEN
            ALTER TABLE admission_admission
                RENAME COLUMN etat_id TO etat_code;
        END IF;
    END
$$;

-- Création de la clé étrangère d'admission_admission(etat_code) vers admission_etat(code)
DO
$$
    BEGIN
        IF NOT EXISTS (SELECT 1
                       FROM information_schema.table_constraints
                       WHERE table_name = 'admission_admission'
                         AND constraint_name = 'fk_admission_etat') THEN
            ALTER TABLE admission_admission
                ADD CONSTRAINT fk_admission_etat
                    FOREIGN KEY (etat_code)
                        REFERENCES admission_etat (code);
        END IF;
    END
$$;

create table IF NOT EXISTS admission_document
(
    id                    bigserial                                                    not null
@@ -276,7 +261,15 @@ with d(ordre, code, lib) as (select 1,
                             union
                             select 6, 'admission-supprimer-son-dossier-admission', 'Supprimer son dossier d''admission'
                             union
                             select 7, 'admission-verifier', 'Ajouter des commentaires au dossier d''admission')
                             select 7, 'admission-verifier', 'Ajouter des commentaires au dossier d''admission'
                             union
                             select 8, 'admission-valider-tout', 'Valider un dossier d''admission'
                             union
                             select 9, 'admission-valider-sien', 'Valider son dossier d''admission'
                             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 nextval('privilege_id_seq'), cp.id, d.code, d.lib, d.ordre
from d
         join CATEGORIE_PRIVILEGE cp on cp.CODE = 'admission'
@@ -306,12 +299,25 @@ with data(categ, priv) as (select 'admission', 'admission-lister-tous-dossiers-a
                           union
                           select 'admission', 'admission-supprimer-son-dossier-admission'
                           union
                           select 'admission', 'admission-valider-tout'
                           union
                           select 'admission', 'admission-valider-sien'
                           union
                           select 'admission', 'admission-devalider-tout'
                           union
                           select 'admission', 'admission-devalider-sien'
                           union
                           select 'admission', 'admission-verifier')
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_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
@@ -324,7 +330,11 @@ with data(categ, priv) as (select 'admission', 'admission-lister-son-dossier-adm
                           union
                           select 'admission', 'admission-modifier-modifier-son-dossier-admission'
                           union
                           select 'admission', 'admission-supprimer-son-dossier-admission')
                           select 'admission', 'admission-supprimer-son-dossier-admission'
                           union
                           select 'admission', 'admission-valider-sien'
                           union
                           select 'admission', 'admission-devalider-sien')
select p.id as PRIVILEGE_ID, profil.id as PROFIL_ID
from data
         join PROFIL on profil.ROLE_ID in (
+104 −12
Changes for module/Admission/config/module.config.php: 104 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -5,9 +5,18 @@ namespace Admission;

use Admission\Assertion\AdmissionAssertion;
use Admission\Assertion\AdmissionAssertionFactory;
use Admission\Assertion\Validation\AdmissionValidationAssertion;
use Admission\Assertion\Validation\AdmissionValidationAssertionFactory;
use Admission\Config\ModuleConfig;
use Admission\Config\ModuleConfigFactory;
use Admission\Controller\AdmissionController;
use Admission\Controller\AdmissionControllerFactory;
use Admission\Entity\Db\Repository\IndividuRepositoryFactory;
use Admission\Controller\Validation\AdmissionValidationController;
use Admission\Controller\Validation\AdmissionValidationControllerFactory;
use Admission\Event\AdmissionEventListener;
use Admission\Event\AdmissionEventListenerFactory;
use Admission\Event\Validation\AdmissionValidationEventListener;
use Admission\Event\Validation\AdmissionValidationEventListenerFactory;
use Admission\Form\Admission\AdmissionForm;
use Admission\Form\Admission\AdmissionFormFactory;
use Admission\Form\Fieldset\Document\DocumentFieldset;
@@ -18,8 +27,8 @@ 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\ValidationFieldset;
use Admission\Form\Fieldset\Validation\ValidationFieldsetFactory;
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;
@@ -32,11 +41,15 @@ use Admission\Hydrator\Financement\FinancementHydrator;
use Admission\Hydrator\Financement\FinancementHydratorFactory;
use Admission\Hydrator\Inscription\InscriptionHydrator;
use Admission\Hydrator\Inscription\InscriptionHydratorFactory;
use Admission\Hydrator\Validation\ValidationHydrator;
use Admission\Hydrator\Validation\ValidationHydratorFactory;
use Admission\Hydrator\Validation\AdmissionValidationHydrator;
use Admission\Hydrator\Validation\AdmissionValidationHydratorFactory;
use Admission\Hydrator\Verification\VerificationHydrator;
use Admission\Hydrator\Verification\VerificationHydratorFactory;
use Admission\Provider\Privilege\AdmissionPrivileges;
use Admission\Rule\Operation\AdmissionOperationRule;
use Admission\Rule\Operation\AdmissionOperationRuleFactory;
use Admission\Rule\Operation\Notification\OperationAttendueNotificationRule;
use Admission\Rule\Operation\Notification\OperationAttendueNotificationRuleFactory;
use Admission\Service\Admission\AdmissionService;
use Admission\Service\Admission\AdmissionServiceFactory;
use Admission\Service\Document\DocumentService;
@@ -47,8 +60,12 @@ use Admission\Service\Financement\FinancementService;
use Admission\Service\Financement\FinancementServiceFactory;
use Admission\Service\Inscription\InscriptionService;
use Admission\Service\Inscription\InscriptionServiceFactory;
use Admission\Service\Validation\ValidationService;
use Admission\Service\Validation\ValidationServiceFactory;
use Admission\Service\Operation\AdmissionOperationService;
use Admission\Service\Operation\AdmissionOperationServiceFactory;
use Admission\Service\TypeValidation\TypeValidationService;
use Admission\Service\TypeValidation\TypeValidationServiceFactory;
use Admission\Service\Validation\AdmissionValidationService;
use Admission\Service\Validation\AdmissionValidationServiceFactory;
use Admission\Service\Verification\VerificationService;
use Admission\Service\Verification\VerificationServiceFactory;
use Doctrine\ORM\Mapping\Driver\XmlDriver;
@@ -80,6 +97,7 @@ return array(
        'resource_providers' => [
            'BjyAuthorize\Provider\Resource\Config' => [
                'Admission' => [],
                'AdmissionValidation' => []
            ],
        ],
        'rule_providers'     => [
@@ -101,6 +119,16 @@ return array(
                        '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,
                    ],
                ],
            ],
        ],
@@ -156,6 +184,28 @@ return array(
                        AdmissionPrivileges::ADMISSION_SUPPRIMER_TOUS_DOSSIERS_ADMISSION,
                    ],
                ],
                [
                    'controller' => AdmissionValidationController::class,
                    'action' => [
                        'valider',
                    ],
                    'privileges' => [
                        AdmissionPrivileges::ADMISSION_VALIDER_TOUT,
                        AdmissionPrivileges::ADMISSION_VALIDER_SIEN,
                    ],
                    'assertion' => AdmissionValidationAssertion::class,
                ],
                [
                    'controller' => AdmissionValidationController::class,
                    'action' => [
                        'devalider',
                    ],
                    'privileges' => [
                        AdmissionPrivileges::ADMISSION_DEVALIDER_TOUT,
                        AdmissionPrivileges::ADMISSION_DEVALIDER_SIEN,
                    ],
                    'assertion' => AdmissionValidationAssertion::class,
                ],
            ]
        ],
    ],
@@ -181,13 +231,42 @@ return array(
                                 * @see AdmissionController::etudiantAction()
                                 * @see AdmissionController::inscriptionAction()
                                 * @see AdmissionController::financementAction()
                                 * @see AdmissionController::validationAction()
                                 * @see AdmissionController::documentAction()
                                 */
                                'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
                                'admission' => '[0-9]*'
                            ],
                        ],
                    ],
                    'valider' => [
                        'type' => Segment::class,
                        'options' => [
                            'route' => '/valider/:admission/type/:typeValidation',
                            'constraints' => [
                                'admission' => '\d+',
                                'typeValidation' => '\d+',
                            ],
                            'defaults' => [
                                'controller' => AdmissionValidationController::class,
                                'action' => 'valider',
                                /* @see AdmissionValidationController::validerAction() */
                            ],
                        ],
                    ],
                    'devalider' => [
                        'type' => Segment::class,
                        'options' => [
                            'route' => '/devalider/:admissionValidation',
                            'constraints' => [
                                'admissionValidation' => '\d+',
                            ],
                            'defaults' => [
                                'controller' => AdmissionValidationController::class,
                                'action' => 'devalider',
                                /* @see AdmissionValidationController::devaliderAction() */
                            ],
                        ],
                    ],
                    /**
                     * @see AdmissionController::rechercherIndividuAction()
                     */
@@ -245,6 +324,7 @@ return array(
    'controllers' => [
        'factories' => [
            AdmissionController::class => AdmissionControllerFactory::class,
            AdmissionValidationController::class => AdmissionValidationControllerFactory::class,
        ],
    ],

@@ -254,7 +334,7 @@ return array(
            EtudiantFieldset::class => EtudiantFieldsetFactory::class,
            InscriptionFieldset::class => InscriptionFieldsetFactory::class,
            FinancementFieldset::class => FinancementFieldsetFactory::class,
            ValidationFieldset::class => ValidationFieldsetFactory::class,
            AdmissionValidationFieldset::class => AdmissionValidationFieldsetFactory::class,
            VerificationFieldset::class => VerificationFieldsetFactory::class,
            DocumentFieldset::class => DocumentFieldsetFactory::class
        ],
@@ -266,7 +346,7 @@ return array(
            EtudiantHydrator::class => EtudiantHydratorFactory::class,
            InscriptionHydrator::class => InscriptionHydratorFactory::class,
            FinancementHydrator::class => FinancementHydratorFactory::class,
            ValidationHydrator::class => ValidationHydratorFactory::class,
            AdmissionValidationHydrator::class => AdmissionValidationHydratorFactory::class,
            VerificationHydrator::class => VerificationHydratorFactory::class,
            DocumentHydrator::class => DocumentHydratorFactory::class
        ],
@@ -274,14 +354,26 @@ return array(

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

            AdmissionService::class => AdmissionServiceFactory::class,
            FinancementService::class => FinancementServiceFactory::class,
            EtudiantService::class => EtudiantServiceFactory::class,
            InscriptionService::class => InscriptionServiceFactory::class,
            ValidationService::class => ValidationServiceFactory::class,
            TypeValidationService::class => TypeValidationServiceFactory::class,
            DocumentService::class => DocumentServiceFactory::class,
            VerificationService::class => VerificationServiceFactory::class,
            AdmissionAssertion::class => AdmissionAssertionFactory::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,
        ],
    ],

+1 −1
Changes for module/Admission/config/others/admission.config.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ return array(
//            EtudiantFieldset::class => InvokableFactory::class,
//            InscriptionFieldset::class => InvokableFactory::class,
//            FinancementFieldset::class => InvokableFactory::class,
//            ValidationFieldset::class => InvokableFactory::class
//            AdmissionValidationFieldset::class => InvokableFactory::class
        ],
    ],

Loading