Commit 776e6b8b authored by Florian Joriot's avatar Florian Joriot
Browse files

Merge branch 'master' into missions

parents 7efc4d2e a3ac511a

admin/actions/update-employeur.php

+2 −2
Changes for admin/actions/update-employeur.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ foreach ($listFiles as $file) { 
        $nomCommercial = (!empty($data[5])) ? $data[5] : '';

        $nomCommercial .= (!empty($data[6])) ? ' ' . $data[6] : '';

        $nomCommercial .= (!empty($data[7])) ? ' ' . $data[7] : '';

        $nomCommercial = str_replace("'", "''", $nomCommercial);

        $nomCommercial = str_replace("''", "'", $nomCommercial);

        //RAISON_SOCIALE

        $nomJuridique = $data[4];

        //SIREN
@@ -124,7 +124,7 @@ foreach ($listFiles as $file) { 
        } elseif (!empty($nomPropre)) {

            $raisonSociale = $nomPropre;

        }

        $raisonSociale = str_replace("'", "''", $raisonSociale);

        $raisonSociale = str_replace("''", "'", $raisonSociale);

        //Si pas de raison sociale et pas de nom commercial on passe

        if (empty($raisonSociale) && empty($nomCommercial)) {

            continue;

module/Application/config/pilotage.config.php

+10 −3
Changes for module/Application/config/pilotage.config.php: 10 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ return [ 
                    'gestion' => [

                        'pages' => [

                            'pilotage' => [

                                'label'        => 'Pilotage',

                                'title'        => 'Pilotage',

                                'icon'         => 'fas fa-tachometer',

                                'label'    => 'Pilotage et indicateurs',

                                'title'    => 'Pilotage et indicateurs',

                                'icon'     => 'fas fa-chart-line',

                                'route'    => 'pilotage',

                                'resource' => PrivilegeController::getResourceId('Application\Controller\Pilotage', 'index'),

                                'pages'    => [
@@ -53,6 +53,13 @@ return [ 
                                        'route'       => 'pilotage/ecarts-etats',

                                        'resource'    => PrivilegeController::getResourceId('Application\Controller\Pilotage', 'ecartsEtats'),

                                    ],

                                    'indicateurs'  => [

                                        'label'       => 'Liste des indicateurs de suivi',

                                        'title'       => 'Liste des indicateurs de suivi',

                                        'description' => 'Liste des indicateurs de suivi',

                                        'route'       => 'indicateur',

                                        'resource'    => PrivilegeController::getResourceId('Indicateur\Controller\Indicateur', 'index'),

                                    ],

                                ],

                                'order'    => 20,

                                'color'    => '#00A020',

module/Indicateur/config/module.config.php

+0 −15
Changes for module/Indicateur/config/module.config.php: 0 added lines, 15 removed lines.
Original line number Diff line number Diff line
@@ -110,21 +110,6 @@ return [ 
        ],

    ],



    'navigation' => [

        'gestion' => [

            'pages' => [

                'indicateurs' => [

                    'label'        => "Indicateurs",

                    'icon'         => 'fas fa-chart-line',

                    'title'        => "Indicateurs",

                    'route'        => 'indicateur',

                    'resource'     => PrivilegeController::getResourceId('Indicateur\Controller\Indicateur', 'index'),

                    'order'        => 10,

                    'color' => '#217DD8',

                ],

            ],

        ],

    ],



    'guards' => [

        [