Commit ff762d45 authored by Florian Joriot's avatar Florian Joriot
Browse files

Merge remote-tracking branch 'origin/b24' into b24

parents b8b3ee1b fc7ab177

composer.json

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
        "unicaen/mail": "7.2.8",

        "unicaen/vue"                      : "6.3.3",

        "unicaen/bddadmin"                 : "1.5.0",

        "unicaen/signature"                : "1.0.6",

      "unicaen/signature": "2.0.0",

        "connecteur-ose/actul"             : "dev-master",

        "connecteur-ose/pegase"            : "dev-pegase-webservice"

    },

composer.lock

+116 −133

File changed.

Preview size limit exceeded, changes collapsed.

data/ddl/table/INTERVENANT.php

+12 −0
Original line number Diff line number Diff line
@@ -297,6 +297,18 @@ return [ 
            'position'    => 17,

            'commentaire' => NULL,

        ],

        'DESACTIVER_SIGNATURE'        => [

            'name'        => 'DESACTIVER_SIGNATURE',

            'type'        => 'int',

            'bdd-type'    => 'NUMBER',

            'length'      => 0,

            'scale'       => NULL,

            'precision'   => NULL,

            'nullable'    => FALSE,

            'default'     => '0',

            'position'    => 66,

            'commentaire' => NULL,

        ],

        'DISCIPLINE_ID'               => [

            'name'        => 'DISCIPLINE_ID',

            'type'        => 'int',

data/ddl/table/UNICAEN_SIGNATURE_PROCESS.php

+12 −0
Original line number Diff line number Diff line
@@ -33,6 +33,18 @@ return [ 
            'position'    => 5,

            'commentaire' => NULL,

        ],

        'DESCRIPTION'      => [

            'name'        => 'DESCRIPTION',

            'type'        => 'string',

            'bdd-type'    => 'VARCHAR2',

            'length'      => 4000,

            'scale'       => NULL,

            'precision'   => NULL,

            'nullable'    => TRUE,

            'default'     => NULL,

            'position'    => 9,

            'commentaire' => NULL,

        ],

        'DOCUMENT_NAME'    => [

            'name'        => 'DOCUMENT_NAME',

            'type'        => 'string',

data/ddl_columns_pos.php

+49 −0
Original line number Diff line number Diff line
@@ -873,6 +873,7 @@ return [ 
        'SITUATION_MATRIMONIALE_DATE',

        'SITUATION_MATRIMONIALE_ID',

        'FORMULE_CALCUL_ARRONDISSEUR',

        'DESACTIVER_SIGNATURE',

    ],

    'INTERVENANT_DOSSIER'                 => [

        'ID',
@@ -1120,6 +1121,7 @@ return [ 
        'REQUETE',

        'NUMERO',

        'MESSAGE_ERREUR',

        'OK',

    ],

    'PLAFOND_ETAT'                        => [

        'ID',
@@ -2717,6 +2719,7 @@ return [ 
        'LASTUPDATE',

        'SIGNATUREFLOW_ID',

        'LABEL',

        'DESCRIPTION',

    ],

    'UNICAEN_SIGNATURE_PROCESS_STEP'      => [

        'ID',
@@ -3126,6 +3129,52 @@ return [ 
        'tp',

        'autres',

    ],

    'TBL_SERVICE_DU'                      => [

        'ID',

        'ACTIF',

        'ANNEE_ID',

        'INTERVENANT_ID',

        'STATUT_ID',

        'SERVICE_STATUTAIRE',

        'SERVICE_DU',

        'DEPASSEMENT_SERVICE_DU_SANS_HC',

        'SERVICE_MODIFIE',

    ],

    'WORKFLOW_ETAPE'                      => [

        'ID',

        'CODE',

        'PERIMETRE_ID',

        'ROUTE',

        'ROUTE_INTERVENANT',

        'LIBELLE_INTERVENANT',

        'LIBELLE_AUTRES',

        'DESC_NON_FRANCHIE',

        'DESC_SANS_OBJECTIF',

        'ORDRE',

        'HISTO_CREATION',

        'HISTO_CREATEUR_ID',

        'HISTO_MODIFICATION',

        'HISTO_MODIFICATEUR_ID',

        'HISTO_DESTRUCTION',

        'HISTO_DESTRUCTEUR_ID',

        'ANNEE_ID',

    ],

    'WORKFLOW_ETAPE_DEPENDANCE'           => [

        'ID',

        'ETAPE_SUIVANTE_ID',

        'ETAPE_PRECEDANTE_ID',

        'ACTIVE',

        'TYPE_INTERVENANT_ID',

        'PERIMETRE_ID',

        'AVANCEMENT',

        'HISTO_CREATION',

        'HISTO_CREATEUR_ID',

        'HISTO_MODIFICATION',

        'HISTO_MODIFICATEUR_ID',

        'HISTO_DESTRUCTION',

        'HISTO_DESTRUCTEUR_ID',

        'ANNEE_ID',

    ],

];



//@formatter:on