From 92c8c2c1d6c10234d36dbc05c81a0b9012eca145 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laurent=20L=C3=A9cluse?= <laurent.lecluse@unicaen.fr>
Date: Tue, 12 May 2020 15:28:20 +0200
Subject: [PATCH] =?UTF-8?q?R=C3=A9organisation=20rapide=20des=20menus=20:?=
 =?UTF-8?q?=20les=20types=20de=20ressourcesfont=20partie=20de=20la=20sph?=
 =?UTF-8?q?=C3=A8re=20financi=C3=A8re?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/administration.config.php          | 37 ++++----
 .../config/type-intervention.config.php       | 84 ++++++++-----------
 .../config/type-ressource.config.php          | 16 +---
 .../Controller/AdministrationController.php   |  9 +-
 ....phtml => administration-financiere.phtml} |  2 +-
 5 files changed, 68 insertions(+), 80 deletions(-)
 rename module/Application/view/application/administration/{administration-centre-cout.phtml => administration-financiere.phtml} (60%)

diff --git a/module/Application/config/administration.config.php b/module/Application/config/administration.config.php
index 7fbe494193..6b51253293 100755
--- a/module/Application/config/administration.config.php
+++ b/module/Application/config/administration.config.php
@@ -8,7 +8,7 @@ use UnicaenAuth\Guard\PrivilegeController;
 return [
     'router' => [
         'routes' => [
-            'administration' => [
+            'administration'             => [
                 'type'          => 'Literal',
                 'options'       => [
                     'route'    => '/administration',
@@ -19,7 +19,7 @@ return [
                 ],
                 'may_terminate' => true,
             ],
-            'administration-type' => [
+            'administration-type'        => [
                 'type'          => 'Literal',
                 'options'       => [
                     'route'    => '/administration-type',
@@ -30,13 +30,13 @@ return [
                 ],
                 'may_terminate' => true,
             ],
-            'administration-centre-cout' => [
+            'administration-financiere'  => [
                 'type'          => 'Literal',
                 'options'       => [
-                    'route'    => '/administration-centre-cout',
+                    'route'    => '/administration-financiere',
                     'defaults' => [
                         'controller' => 'Application\Controller\Administration',
-                        'action'     => 'administration-centre-cout',
+                        'action'     => 'administration-financiere',
                     ],
                 ],
                 'may_terminate' => true,
@@ -55,7 +55,7 @@ return [
         ],
     ],
 
-    'navigation'      => [
+    'navigation'   => [
         'default' => [
             'home' => [
                 'pages' => [
@@ -65,15 +65,15 @@ return [
                         'resource' => PrivilegeController::getResourceId('Application\Controller\Administration', 'index'),
                         'order'    => 7,
                         'pages'    => [
-                            'gestion-intervenant' => [
+                            'gestion-intervenant'       => [
                                 'label'          => 'Gestion intervenants (Status, PJ,  etc...)',
                                 'icon'           => 'glyphicon glyphicon - list-alt',
                                 'route'          => 'administration-intervenant',
-                                'resource'     => PrivilegeController::getResourceId('Application\Controller\Administration', 'administration-intervenant'),
+                                'resource'       => PrivilegeController::getResourceId('Application\Controller\Administration', 'administration-intervenant'),
                                 'order'          => 80,
                                 'border - color' => '#111',
-                                'pages' => [
-                                    'statut-intervenant' => [
+                                'pages'          => [
+                                    'statut-intervenant'                         => [
                                         'label'        => 'Edition des statuts des intervenants',
                                         'icon'         => 'fa fa-graduation-cap',
                                         'route'        => 'statut-intervenant',
@@ -81,7 +81,7 @@ return [
                                         'order'        => 90,
                                         'border-color' => '#BBCF55',
                                     ],
-                                    'type-piece-jointe-statut' => [
+                                    'type-piece-jointe-statut'                   => [
                                         'label'      => "Pièces justificatives attendues par statut d'intervenant",
                                         'title'      => "Permet de personnaliser les pièces justificatives à demander en fonction du statut des intervenants",
                                         'route'      => 'piece-jointe/type-piece-jointe-statut',
@@ -97,15 +97,15 @@ return [
                                     ],
                                 ],
                             ],
-                            'gestion-centre-cout' => [
-                                'label'          => 'Gestion des centres de coûts',
+                            'administration-financiere' => [
+                                'label'          => 'Données financières',
                                 'icon'           => 'glyphicon glyphicon - list-alt',
-                                'route'          => 'administration-centre-cout',
-                                'resource'     => PrivilegeController::getResourceId('Application\Controller\Administration', 'administration-centre-cout'),
+                                'route'          => 'administration-financiere',
+                                'resource'       => PrivilegeController::getResourceId('Application\Controller\Administration', 'administration-financiere'),
                                 'order'          => 80,
                                 'border - color' => '#111',
-                                'pages' => [
-                                    'centre-cout' => [
+                                'pages'          => [
+                                    'centre-cout'          => [
                                         'label'        => 'Edition des centres de coûts',
                                         'icon'         => 'fa fa-graduation-cap',
                                         'route'        => 'centre-cout',
@@ -121,6 +121,7 @@ return [
                                         'order'        => 80,
                                         'border-color' => '#BBCF55',
                                     ],
+
                                 ],
                             ],
                         ],
@@ -134,7 +135,7 @@ return [
             PrivilegeController::class => [
                 [
                     'controller' => 'Application\Controller\Administration',
-                    'action'     => ['index', 'administration-types', 'administration-centre-cout', 'administration-intervenant'],
+                    'action'     => ['index', 'administration-types', 'administration-financiere', 'administration-intervenant'],
                     'privileges' => [
                         Privileges::IMPORT_ECARTS,
                         Privileges::IMPORT_MAJ,
diff --git a/module/Application/config/type-intervention.config.php b/module/Application/config/type-intervention.config.php
index 560d3c5d7f..69aa1d02fe 100755
--- a/module/Application/config/type-intervention.config.php
+++ b/module/Application/config/type-intervention.config.php
@@ -97,33 +97,33 @@ return [
                         ],
                         'may_terminate' => true,
                     ],
-                        'statut-saisie'                             => [
-                            'type'          => 'Segment',
-                            'options'       => [
-                                'route'       => '/statut-saisie/:typeIntervention[/:typeInterventionStatut]',
-                                'constraints' => [
-                                    'typeIntervention' => '[0-9]*',
-                                    'typeInterventionStatut' => '[0-9]*',
-                                ],
-                                'defaults'    => [
-                                    'action' => 'statut-saisie',
-                                ],
-                            ],
-                            'may_terminate' => true,
+                    'statut-saisie'                      => [
+                        'type'          => 'Segment',
+                        'options'       => [
+                            'route'       => '/statut-saisie/:typeIntervention[/:typeInterventionStatut]',
+                            'constraints' => [
+                                'typeIntervention'       => '[0-9]*',
+                                'typeInterventionStatut' => '[0-9]*',
+                            ],
+                            'defaults'    => [
+                                'action' => 'statut-saisie',
+                            ],
                         ],
-                        'statut-delete'                             => [
-                            'type'          => 'Segment',
-                            'options'       => [
-                                'route'       => '/statut-delete/:typeIntervention/:typeInterventionStatut',
-                                'constraints' => [
-                                    'typeInterventionStatut' => '[0-9]*',
-                                ],
-                                'defaults'    => [
-                                    'action' => 'statut-delete',
-                                ],
-                            ],
-                            'may_terminate' => true,
+                        'may_terminate' => true,
+                    ],
+                    'statut-delete'                      => [
+                        'type'          => 'Segment',
+                        'options'       => [
+                            'route'       => '/statut-delete/:typeIntervention/:typeInterventionStatut',
+                            'constraints' => [
+                                'typeInterventionStatut' => '[0-9]*',
+                            ],
+                            'defaults'    => [
+                                'action' => 'statut-delete',
+                            ],
                         ],
+                        'may_terminate' => true,
+                    ],
                 ],
             ],
         ],
@@ -134,23 +134,13 @@ return [
                 'pages' => [
                     'administration' => [
                         'pages' => [
-                            'gestion-types' => [
-                                'label'          => 'Gestion des types (ressources, etc...)',
-                                'icon'           => 'glyphicon glyphicon - list-alt',
-                                'route'          => 'administration-type',
-                                'resource'     => PrivilegeController::getResourceId('Application\Controller\Administration', 'administration-types'),
-                                'order'          => 60,
-                                'border - color' => '#111',
-                                'pages' => [
-                                    'type-intervention' => [
-                                        'label'        => 'Types d\'interventions',
-                                        'icon'         => 'fa  fa-commenting',
-                                        'route'        => 'type-intervention',
-                                        'resource'     => PrivilegeController::getResourceId('Application\Controller\TypeIntervention', 'index'),
-                                        'order'        => 60,
-                                        'border-color' => '#71DFD7',
-                                    ],
-                                ],
+                            'type-intervention' => [
+                                'label'        => 'Types d\'interventions',
+                                'icon'         => 'fa  fa-commenting',
+                                'route'        => 'type-intervention',
+                                'resource'     => PrivilegeController::getResourceId('Application\Controller\TypeIntervention', 'index'),
+                                'order'        => 60,
+                                'border-color' => '#71DFD7',
                             ],
                         ],
                     ],
@@ -168,13 +158,13 @@ return [
             PrivilegeController::class => [
                 [
                     'controller' => 'Application\Controller\TypeIntervention',
-                    'action'     => ['index','statut'],
+                    'action'     => ['index', 'statut'],
                     'privileges' => [Privileges::TYPE_INTERVENTION_VISUALISATION],
                 ],
                 [
                     'controller' => 'Application\Controller\TypeIntervention',
                     'action'     => ['saisie', 'delete', 'type-intervention-structure-saisie', 'type-intervention-structure-delete',
-                                     'type-intervention-trier','statut-saisie','statut-delete'],
+                                     'type-intervention-trier', 'statut-saisie', 'statut-delete'],
                     'privileges' => [Privileges::TYPE_INTERVENTION_EDITION],
                 ],
             ],
@@ -183,7 +173,7 @@ return [
     'service_manager' => [
         'invokables' => [
             Service\TypeInterventionStructureService::class => Service\TypeInterventionStructureService::class,
-            Service\TypeInterventionStatutService::class => Service\TypeInterventionStatutService::class,
+            Service\TypeInterventionStatutService::class    => Service\TypeInterventionStatutService::class,
         ],
     ],
     'controllers'     => [
@@ -195,8 +185,8 @@ return [
         'invokables' => [
             Form\TypeIntervention\TypeInterventionSaisieForm::class          => Form\TypeIntervention\TypeInterventionSaisieForm::class,
             Form\TypeIntervention\TypeInterventionStructureSaisieForm::class => Form\TypeIntervention\TypeInterventionStructureSaisieForm::class,
-            Form\TypeIntervention\TypeInterventionStatutSaisieForm::class => Form\TypeIntervention\TypeInterventionStatutSaisieForm::class,
-            Form\TypeIntervention\TypeInterventionStatutDeleteForm::class => Form\TypeIntervention\TypeInterventionStatutDeleteForm::class,
+            Form\TypeIntervention\TypeInterventionStatutSaisieForm::class    => Form\TypeIntervention\TypeInterventionStatutSaisieForm::class,
+            Form\TypeIntervention\TypeInterventionStatutDeleteForm::class    => Form\TypeIntervention\TypeInterventionStatutDeleteForm::class,
         ],
     ],
     'view_helpers'    => [
diff --git a/module/Application/config/type-ressource.config.php b/module/Application/config/type-ressource.config.php
index ff8b777d24..adc10cd15b 100755
--- a/module/Application/config/type-ressource.config.php
+++ b/module/Application/config/type-ressource.config.php
@@ -19,7 +19,7 @@ return [
                 ],
                 'may_terminate' => true,
                 'child_routes'  => [
-                    'saisie'                             => [
+                    'saisie' => [
                         'type'          => 'Segment',
                         'options'       => [
                             'route'       => '/saisie[/:typeRessource]',
@@ -32,7 +32,7 @@ return [
                         ],
                         'may_terminate' => true,
                     ],
-                    'delete'                             => [
+                    'delete' => [
                         'type'          => 'Segment',
                         'options'       => [
                             'route'       => '/delete[/:typeRessource]',
@@ -55,14 +55,7 @@ return [
                 'pages' => [
                     'administration' => [
                         'pages' => [
-                            'gestion-types' => [
-                                'label'          => 'Gestion des types (ressources, etc...)',
-                                'icon'           => 'glyphicon glyphicon - list-alt',
-                                'route'          => 'administration-type',
-                                'resource'     => PrivilegeController::getResourceId('Application\Controller\Administration', 'administration-types'),
-
-                                'order'          => 60,
-                                'border - color' => '#111',
+                            'administration-financiere' => [
                                 'pages' => [
                                     'type-ressource' => [
                                         'label'        => 'Types de ressources',
@@ -72,7 +65,6 @@ return [
                                         'order'        => 60,
                                         'border-color' => '#71DFD7',
                                     ],
-
                                 ],
                             ],
                         ],
@@ -114,7 +106,7 @@ return [
     ],
     'form_elements'   => [
         'invokables' => [
-            Form\TypeRessource\TypeRessourceSaisieForm::class          => Form\TypeRessource\TypeRessourceSaisieForm::class,
+            Form\TypeRessource\TypeRessourceSaisieForm::class => Form\TypeRessource\TypeRessourceSaisieForm::class,
         ],
     ],
 ];
diff --git a/module/Application/src/Application/Controller/AdministrationController.php b/module/Application/src/Application/Controller/AdministrationController.php
index d1ab3cc81b..9f04d00bcb 100755
--- a/module/Application/src/Application/Controller/AdministrationController.php
+++ b/module/Application/src/Application/Controller/AdministrationController.php
@@ -17,20 +17,25 @@ class AdministrationController extends AbstractController
         return [];
     }
 
+
+
     public function administrationTypesAction()
     {
         return [];
     }
 
-    public function administrationCentreCoutAction()
+
+
+    public function administrationFinanciereAction()
     {
         return [];
     }
 
+
+
     public function administrationIntervenantAction()
     {
         return [];
     }
 
-
 }
\ No newline at end of file
diff --git a/module/Application/view/application/administration/administration-centre-cout.phtml b/module/Application/view/application/administration/administration-financiere.phtml
similarity index 60%
rename from module/Application/view/application/administration/administration-centre-cout.phtml
rename to module/Application/view/application/administration/administration-financiere.phtml
index 9715949c5e..e5c3e8305b 100644
--- a/module/Application/view/application/administration/administration-centre-cout.phtml
+++ b/module/Application/view/application/administration/administration-financiere.phtml
@@ -1,4 +1,4 @@
-<h1 class="page-header">Administration des centres de coûts</h1>
+<h1 class="page-header">Données financières</h1>
 <?php
 
 echo $this->navigation('navigation')->menuContextuel()->setPartial('unicaen-app/menu-dl.phtml');
\ No newline at end of file
-- 
GitLab