Commit 6a85e918 authored by Florian Joriot's avatar Florian Joriot
Browse files

Merge branch 'refs/heads/b24' into FJ_Pegase 

# Conflicts:
#	composer.lock
#	module/Administration/config/commands.config.php
parents c43a0efe b5a79be9

.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -13,3 +13,5 @@ composer.phar 
.phpunit.result.cache

.idea

/.php-cs-fixer.cache

deployments/*

Makefile

composer.json

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
        "unicaen/siham"                    : "6.2.0",

        "unicaen/mail"                     : "7.1.2",

        "unicaen/vue"                      : "6.3.3",

        "unicaen/bddadmin"                 : "1.4.3",

        "unicaen/bddadmin"                 : "1.5.0",

        "unicaen/signature"                : "1.0.6",

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

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

data/ddl/index/SERVICE_ETAPE_FK.php

0 → 100644
+14 −0
Original line number Diff line number Diff line 
<?php



//@formatter:off



return [

    'name'    => 'SERVICE_ETAPE_FK',

    'unique'  => FALSE,

    'table'   => 'SERVICE',

    'columns' => [

        'ETAPE_ID',

    ],

];



//@formatter:on

data/ddl/ref-constraint/SERVICE_ETAPE_FK.php

0 → 100644
+16 −0
Original line number Diff line number Diff line 
<?php



//@formatter:off



return [

    'name'        => 'SERVICE_ETAPE_FK',

    'table'       => 'SERVICE',

    'rtable'      => 'ETAPE',

    'delete_rule' => NULL,

    'index'       => NULL,

    'columns'     => [

        'ETAPE_ID' => 'ID',

    ],

];



//@formatter:on

data/ddl/table/SERVICE.php

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

            'commentaire' => NULL,

        ],

        'ETAPE_ID'               => [

            'name'        => 'ETAPE_ID',

            'type'        => 'int',

            'bdd-type'    => 'NUMBER',

            'length'      => 0,

            'scale'       => NULL,

            'precision'   => NULL,

            'nullable'    => TRUE,

            'default'     => NULL,

            'position'    => 14,

            'commentaire' => NULL,

        ],

        'HISTO_CREATEUR_ID'      => [

            'name'        => 'HISTO_CREATEUR_ID',

            'type'        => 'int',