Commit 033caf86 authored by joriot221's avatar joriot221
Browse files

Merge branch 'master' into FJ_Icone 

# Conflicts:
#	module/Intervenant/view/intervenant/statut/index.phtml
#	module/Intervenant/view/intervenant/statut/saisie.phtml
parents 8969bc1f 2c5d0cc2

config/autoload/unicaen-tbl.global.php

deleted100755 → 0
+0 −41
Changes for config/autoload/unicaen-tbl.global.php: 0 added lines, 41 removed lines.
Original line number Diff line number Diff line 
<?php



namespace UnicaenTbl;



use UnicaenAuth\Guard\PrivilegeController;

use UnicaenTbl\Controller\AdminController;



return [

    'unicaen-tbl' => [

    ],



    'navigation' => [

        'default' => [

            'home' => [

                'pages' => [

                    'administration' => [

                        'pages' => [

                            'unicaen-tbl' => [

                                'label'    => 'Tableaux de bord internes de calcul intermédiaire',

                                'order'    => 1,

                                'route'    => 'unicaen-tbl',

                                'resource' => PrivilegeController::getResourceId(AdminController::class, 'index'),

                                /*'pages'    => [

                                    'showDiff'               => [

                                        'label'       => "Écarts entre les données de l'application et ses sources",

                                        'description' => "Affiche, table par table, la liste des données différentes entre l'application et ses sources de données",

                                        'route'       => 'import',

                                        'resource'    => PrivilegeController::getResourceId('Import\Controller\Import', 'show-diff'),

                                        'params'      => [

                                            'action' => 'show-diff',

                                        ],

                                    ],

                                ],*/

                            ],

                        ],

                    ],

                ],

            ],

        ],

    ],

];
 
 No newline at end of file

data/ddl/index/TYPE_INTERVENANT_CODE_UN.php

+0 −1
Changes for data/ddl/index/TYPE_INTERVENANT_CODE_UN.php: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ return [ 
    'table'   => 'TYPE_INTERVENANT',

    'columns' => [

        'CODE',

        'HISTO_DESTRUCTION',

    ],

];

data/ddl/index/TYPE_INTERVENANT_HCFK.php

deleted100644 → 0
+0 −14
Changes for data/ddl/index/TYPE_INTERVENANT_HCFK.php: 0 added lines, 14 removed lines.
Original line number Diff line number Diff line 
<?php



//@formatter:off



return [

    'name'    => 'TYPE_INTERVENANT_HCFK',

    'unique'  => FALSE,

    'table'   => 'TYPE_INTERVENANT',

    'columns' => [

        'HISTO_CREATEUR_ID',

    ],

];



//@formatter:on

data/ddl/index/TYPE_INTERVENANT_HDFK.php

deleted100644 → 0
+0 −14
Changes for data/ddl/index/TYPE_INTERVENANT_HDFK.php: 0 added lines, 14 removed lines.
Original line number Diff line number Diff line 
<?php



//@formatter:off



return [

    'name'    => 'TYPE_INTERVENANT_HDFK',

    'unique'  => FALSE,

    'table'   => 'TYPE_INTERVENANT',

    'columns' => [

        'HISTO_DESTRUCTEUR_ID',

    ],

];



//@formatter:on

data/ddl/index/TYPE_INTERVENANT_HMFK.php

deleted100644 → 0
+0 −14
Changes for data/ddl/index/TYPE_INTERVENANT_HMFK.php: 0 added lines, 14 removed lines.
Original line number Diff line number Diff line 
<?php



//@formatter:off



return [

    'name'    => 'TYPE_INTERVENANT_HMFK',

    'unique'  => FALSE,

    'table'   => 'TYPE_INTERVENANT',

    'columns' => [

        'HISTO_MODIFICATEUR_ID',

    ],

];



//@formatter:on