Commit e7a731d1 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'feature_flux_diplomation' into test

parents d17fc601 c592d6ae

composer.json

+15 −2
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ 
        {

            "type": "composer",

            "url": "https://packagist.unicaen.fr"

        },

        {

          "type": "git",

          "url": "https://github.com/bertrandgauthier/guzzle-jwt-middleware"

        }

    ],

    "require-dev": {
@@ -37,6 +41,8 @@ 


        "aws/aws-sdk-php": "^3.226",

        "beberlei/assert": "^3.0",

        "eljam/guzzle-jwt-middleware": "dev-main",

        "firebase/php-jwt": "^6.11",

        "doctrine/lexer": "^2.1",

        "guzzlehttp/guzzle": "^6.3 || ^7.0",

        "laminas/laminas-cache": "^3.0 || ^4.0",
@@ -54,6 +60,7 @@ 
        "webmozart/assert": "^1.3",



        "unicaen/alerte": "^3.2",

        "unicaen/api": "dev-master",

        "unicaen/app": "^6.4",

        "unicaen/auth-token": "^7.1",

        "unicaen/authentification": "^6.4",
@@ -62,6 +69,7 @@ 
        "unicaen/db-anonym": "^4.0",

        "unicaen/db-import": "dev-release_8.0.0",

        "unicaen/etat": "^6.0",

        "unicaen/evenement": "dev-release_6.1.0",

        "unicaen/faq": "^7.0",

        "unicaen/idref": "^2.0",

        "unicaen/ldap": "^6.0",
@@ -70,7 +78,8 @@ 
        "unicaen/multipage-form": "^2.1",

        "unicaen/parametre": "^6.0",

        "unicaen/pdf": "^7.0",

        "unicaen/renderer": "^7.2",

        "unicaen/pegase-coc-ext-api": "dev-master",

        "unicaen/renderer": "^8.1",

        "unicaen/search": "^1.1",

        "unicaen/sql": "^2.0",

        "unicaen/sygal-api": "dev-master",
@@ -92,6 +101,8 @@ 
            "Formation\\": "module/Formation/src",

            "HDR\\": "module/HDR/src",

            "Candidat\\": "module/Candidat/src",

            "AutorisationInscriptionThese\\": "module/AutorisationInscriptionThese/src",

            "AutorisationDiplomationThese\\": "module/AutorisationDiplomationThese/src",

            "Import\\": "module/Import/src",

            "Indicateur\\": "module/Indicateur/src",

            "Individu\\": "module/Individu/src",
@@ -107,7 +118,9 @@ 
            "Substitution\\": "module/Substitution/src",

            "SygalApi\\": "vendor/unicaen/sygal-api/src",

            "These\\": "module/These/src",

            "Validation\\": "module/Validation/src"

            "UnicaenAvis\\": "module/UnicaenAvis/src",

            "Validation\\": "module/Validation/src",

            "Tx\\": "module/Tx/src"

        },

        "psr-4": {

            "SygalApiImpl\\": "module/SygalApiImpl/src"

composer.lock

+522 −3

File changed.

Preview size limit exceeded, changes collapsed.

config/application.config.php

+6 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ return [ 
        'UnicaenLdap',

        'UnicaenDbAnonym',

        'UnicaenDbImport',

        'UnicaenEvenement',

        'UnicaenFaq',

        'UnicaenIdref',

        'UnicaenLivelog',
@@ -64,6 +65,8 @@ return [ 
        'UnicaenParametre',

        'UnicaenSearch',

        'UnicaenMultipageForm',

        'UnicaenApi',

        'UnicaenPegaseCocExtApi',

        'Feature',

        'Horodatage',

        'Structure',
@@ -76,6 +79,8 @@ return [ 
        'Retraitement',

        'Soutenance',

        'Depot',

        'AutorisationInscriptionThese',

        'AutorisationDiplomationThese',

        'Formation',

        'ComiteSuiviIndividuel',

        'RapportActivite',
@@ -94,6 +99,7 @@ return [ 
        'Validation',

        'HDR',

        'Candidat',

        'Tx',

        'Portfolio',

        'RNCP'

    ],

doc/release-notes/diplomation/01_unicaen-evenement/001_tables.sql

0 → 100644
+60 −0

File added.

Preview size limit exceeded, changes collapsed.

doc/release-notes/diplomation/01_unicaen-evenement/002_donnees.sql

0 → 100644
+8 −0
Original line number Diff line number Diff line 
-- ETAT



INSERT INTO unicaen_evenement_etat (CODE, LIBELLE, DESCRIPTION) VALUES ('en_attente', 'Événement en attente de traitement', null);

INSERT INTO unicaen_evenement_etat (CODE, LIBELLE, DESCRIPTION) VALUES ('en_cours', 'Événement en cours de traitement', 'L''événement est en cours de traitement et sera mis à jour après celui-ci');

INSERT INTO unicaen_evenement_etat (CODE, LIBELLE, DESCRIPTION) VALUES ('echec', 'Événement dont le traitement a échoué', null);

INSERT INTO unicaen_evenement_etat (CODE, LIBELLE, DESCRIPTION) VALUES ('succes', 'Événement dont le traitement a réussi', null);

INSERT INTO unicaen_evenement_etat (CODE, LIBELLE, DESCRIPTION) VALUES ('annule', 'Événement dont le traitement a été annulé', null);