Merge branch 'll-paiement-mission' (d7cb7c56) · Commits · open-source / OSE

module/Application/config/aaa_module.config.php

+0 −1

Changes for module/Application/config/aaa_module.config.php: 0 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ $config = [
		'orm_default' => [
		'string_functions' => [
		'CONVERT' => ORM\Query\Functions\Convert::class,
		'REPLACE' => ORM\Query\Functions\Replace::class,
		],
		'filters' => [
		'historique' => ORM\Filter\HistoriqueFilter::class,

module/Application/config/administration.config.php

+17 −17

Changes for module/Application/config/administration.config.php: 17 added lines, 17 removed lines.
Original line number	Diff line number	Diff line
		@@ -18,42 +18,42 @@ $rubriques = [
		'icon' => 'fas fa-gear',
		'label' => "Configuration",
		'title' => "Paramétrages de base de l'application",
		'resource' => PrivilegeController::getResourceId('Application\Controller\Administration', 'index'),
		'resource' => PrivilegeController::getResourceId(Controller\AdministrationController::class, 'index'),
		'color' => '#f5e79e',
		],
		'nomenclatures' => [
		'icon' => 'fas fa-folder-open',
		'label' => "Nomenclatures",
		'title' => "Diverses nomenclatures en usage",
		'resource' => PrivilegeController::getResourceId('Application\Controller\Administration', 'index'),
		'resource' => PrivilegeController::getResourceId(Controller\AdministrationController::class, 'index'),
		'color' => '#217dd8',
		],
		'intervenants' => [
		'icon' => 'fas fa-user',
		'label' => "Intervenants",
		'title' => "Paramétrages liés aux intervenants",
		'resource' => PrivilegeController::getResourceId('Application\Controller\Administration', 'index'),
		'resource' => PrivilegeController::getResourceId(Controller\AdministrationController::class, 'index'),
		'color' => '#E5272E',
		],
		'odf' => [
		'icon' => 'fas fa-user-graduate',
		'label' => "Offre de formation",
		'title' => "Administration du fonctionnement de l'offre de formation",
		'resource' => PrivilegeController::getResourceId('Application\Controller\Administration', 'index'),
		'resource' => PrivilegeController::getResourceId(Controller\AdministrationController::class, 'index'),
		'color' => '#71dfd7',
		],
		'rh' => [
		'icon' => 'fas fa-paperclip',
		'label' => "RH",
		'title' => "Nomenclatures et paramétrages relatifs aux ressources humaines",
		'resource' => PrivilegeController::getResourceId('Application\Controller\Administration', 'index'),
		'resource' => PrivilegeController::getResourceId(Controller\AdministrationController::class, 'index'),
		'color' => '#9e9e9e',
		],
		'finances' => [
		'icon' => 'fas fa-chart-line',
		'label' => "Finances",
		'title' => "Nomenclatures et paramétrages liés aux aspects financiers",
		'resource' => PrivilegeController::getResourceId('Application\Controller\Administration', 'index'),
		'resource' => PrivilegeController::getResourceId(Controller\AdministrationController::class, 'index'),
		'color' => '#eb4995',
		],
		'synchronisation' => [
		@@ -74,7 +74,7 @@ $config = [
		'options' => [
		'route' => '/administration',
		'defaults' => [
		'controller' => 'Application\Controller\Administration',
		'controller' => Controller\AdministrationController::class,
		'action' => 'index',
		],
		],
		@@ -90,7 +90,7 @@ $config = [
		'options' => [
		'route' => '/administration-type',
		'defaults' => [
		'controller' => 'Application\Controller\Administration',
		'controller' => Controller\AdministrationController::class,
		'action' => 'administration-types',
		],
		],
		@@ -101,7 +101,7 @@ $config = [
		'options' => [
		'route' => '/administration-referentiel-commun',
		'defaults' => [
		'controller' => 'Application\Controller\Administration',
		'controller' => Controller\AdministrationController::class,
		'action' => 'administration-referentiel-commun',
		],
		],
		@@ -112,7 +112,7 @@ $config = [
		'options' => [
		'route' => '/administration-financiere',
		'defaults' => [
		'controller' => 'Application\Controller\Administration',
		'controller' => Controller\AdministrationController::class,
		'action' => 'administration-financiere',
		],
		],
		@@ -123,7 +123,7 @@ $config = [
		'options' => [
		'route' => '/administration-intervenant',
		'defaults' => [
		'controller' => 'Application\Controller\Administration',
		'controller' => Controller\AdministrationController::class,
		'action' => 'administration-intervenant',
		],
		],
		@@ -134,7 +134,7 @@ $config = [
		'options' => [
		'route' => '/administration-nomenclature-rh',
		'defaults' => [
		'controller' => 'Application\Controller\Administration',
		'controller' => Controller\AdministrationController::class,
		'action' => 'administration-nomenclature-rh',
		],
		],
		@@ -150,7 +150,7 @@ $config = [
		'administration' => [
		'label' => "Administration",
		'route' => 'administration',
		'resource' => PrivilegeController::getResourceId('Application\Controller\Administration', 'index'),
		'resource' => PrivilegeController::getResourceId(Controller\AdministrationController::class, 'index'),
		'order' => 7,
		'pages' => [
		// remplies automatiquement
		@@ -165,7 +165,7 @@ $config = [
		'guards' => [
		PrivilegeController::class => [
		[
		'controller' => 'Application\Controller\Administration',
		'controller' => Controller\AdministrationController::class,
		'action' => ['index'],
		'privileges' => [
		Privileges::IMPORT_ECARTS,
		@@ -207,7 +207,7 @@ $config = [
		'assertion' => Assertion\GestionAssertion::class,
		],
		[
		'controller' => 'Application\Controller\Administration',
		'controller' => Controller\AdministrationController::class,
		'action' => ['rubrique'],
		'roles' => 'user',
		],
		@@ -216,7 +216,7 @@ $config = [
		],
		'controllers' => [
		'factories' => [
		'Application\Controller\Administration' => Controller\Factory\AdministrationControllerFactory::class,
		Controller\AdministrationController::class => Controller\Factory\AdministrationControllerFactory::class,
		],
		],
		];
		@@ -237,7 +237,7 @@ foreach ($rubriques as $route => $rubrique) {
		'options' => [
		'route' => '/' . $route,
		'defaults' => [
		'controller' => 'Application\Controller\Administration',
		'controller' => Controller\AdministrationController::class,
		'action' => 'rubrique',
		],
		],

module/Application/config/budget.config.php

deleted100755 → 0

+0 −228

Changes for module/Application/config/budget.config.php: 0 added lines, 228 removed lines.
Original line number	Diff line number	Diff line
		<?php

		namespace Application;

		use Application\Provider\Privilege\Privileges;
		use UnicaenPrivilege\Guard\PrivilegeController;
		use UnicaenPrivilege\Provider\Rule\PrivilegeRuleProvider;

		return [
		'router' => [
		'routes' => [
		'budget' => [
		'type' => 'Literal',
		'may_terminate' => true,
		'options' => [
		'route' => '/budget',
		'defaults' => [
		'controller' => 'Application\Controller\Budget',
		'action' => 'index',
		],
		],
		'child_routes' => [
		'engagements-liquidation' => [
		'type' => 'Segment',
		'may_terminate' => true,
		'options' => [
		'route' => '/engagements-liquidation[/:structure]',
		'defaults' => [
		'action' => 'engagements-liquidation',
		],
		'constraints' => [
		'structure' => '[0-9]*',
		],
		],
		],
		'tableau-de-bord' => [
		'type' => 'Literal',
		'may_terminate' => true,
		'options' => [
		'route' => '/tableau-de-bord',
		'defaults' => [
		'action' => 'tableau-de-bord',
		],
		],
		],
		'export' => [
		'type' => 'Segment',
		'may_terminate' => true,
		'options' => [
		'route' => '/export[/:structure]',
		'defaults' => [
		'action' => 'export',
		],
		'constraints' => [
		'structure' => '[0-9]*',
		],
		],
		],
		'get-json' => [
		'type' => 'Segment',
		'may_terminate' => true,
		'options' => [
		'route' => '/get-json[/:structure]',
		'defaults' => [
		'action' => 'get-json',
		],
		'constraints' => [
		'structure' => '[0-9]*',
		],
		],
		],
		'saisie-dotation' => [
		'type' => 'Segment',
		'may_terminate' => true,
		'options' => [
		'route' => '/saisie-dotation/:annee/:structure/:typeRessource/[:dotation1]/[:dotation2]',
		'defaults' => [
		'action' => 'saisie-dotation',
		],
		'constraints' => [
		'annee' => '[0-9]*',
		'structure' => '[0-9]*',
		'typeRessource' => '[0-9]*',
		//'dotation1' => '[0-9]*',
		//'dotation2' => '[0-9]*',
		],
		],
		],
		],
		],
		],
		],
		'navigation' => [
		'default' => [
		'home' => [
		'pages' => [
		'gestion' => [
		'pages' => [
		'budget' => [
		'label' => 'Budget',
		'title' => 'Budget',
		'icon' => 'fas fa-eur',
		'route' => 'budget',
		'resource' => PrivilegeController::getResourceId('Application\Controller\Budget', 'index'),
		'order' => 30,
		'color' => '#EB4995',
		'pages' => [
		'tableau-de-bord' => [
		'label' => 'Tableau de bord',
		'title' => 'Tableau de bord',
		'route' => 'budget/tableau-de-bord',
		'resource' => PrivilegeController::getResourceId('Application\Controller\Budget', 'tableau-de-bord'),
		],
		'engagements-liquidation' => [
		'label' => 'Engagements & liquidation',
		'title' => 'Engagements & liquidation',
		'route' => 'budget/engagements-liquidation',
		'resource' => PrivilegeController::getResourceId('Application\Controller\Budget', 'engagements-liquidation'),
		],
		'export' => [
		'label' => 'Export des données de paiement (CSV)',
		'title' => 'Export des données de paiement (CSV)',
		'route' => 'budget/export',
		'resource' => PrivilegeController::getResourceId('Application\Controller\Budget', 'export'),
		],
		],
		],
		],
		],
		],
		],
		],
		],
		'bjyauthorize' => [
		'guards' => [
		PrivilegeController::class => [
		[
		'controller' => 'Application\Controller\Budget',
		'action' => ['index'],
		'privileges' => [
		Privileges::BUDGET_VISUALISATION,
		],
		],
		[
		'controller' => 'Application\Controller\Budget',
		'action' => ['tableau-de-bord'],
		'privileges' => [
		Privileges::BUDGET_VISUALISATION,
		],
		'assertion' => Assertion\BudgetAssertion::class,
		],
		[
		'controller' => 'Application\Controller\Budget',
		'action' => ['engagements-liquidation'],
		'privileges' => [
		Privileges::BUDGET_VISUALISATION,
		],
		],
		[
		'controller' => 'Application\Controller\Budget',
		'action' => ['export'],
		'privileges' => [
		Privileges::BUDGET_EXPORT,
		],
		],
		[
		'controller' => 'Application\Controller\Budget',
		'action' => ['get-json'],
		'privileges' => [
		Privileges::BUDGET_VISUALISATION,
		Privileges::MISE_EN_PAIEMENT_DEMANDE,
		],
		],
		[
		'controller' => 'Application\Controller\Budget',
		'action' => ['saisie-dotation'],
		'privileges' => [
		Privileges::BUDGET_EDITION_ENGAGEMENT_COMPOSANTE,
		Privileges::BUDGET_EDITION_ENGAGEMENT_ETABLISSEMENT,
		],
		],
		[
		'controller' => 'Application\Controller\Budget',
		'action' => ['type-dotation'],
		'privileges' => [Privileges::BUDGET_TYPE_DOTATION_VISUALISATION],
		],
		[
		'controller' => 'Application\Controller\Budget',
		'action' => ['type-dotation-saisie', 'type-dotation-delete'],
		'privileges' => [Privileges::BUDGET_TYPE_DOTATION_EDITION],
		],
		],
		],
		'rule_providers' => [
		PrivilegeRuleProvider::class => [
		'allow' => [
		[
		'privileges' => [
		Privileges::BUDGET_EDITION_ENGAGEMENT_COMPOSANTE,
		Privileges::BUDGET_EDITION_ENGAGEMENT_ETABLISSEMENT,
		],
		'resources' => ['Dotation', 'Structure', 'TypeRessource'],
		'assertion' => Assertion\BudgetAssertion::class,
		],
		],
		],
		],
		],
		'form_elements' => [
		'invokables' => [
		Form\Budget\DotationSaisieForm::class => Form\Budget\DotationSaisieForm::class,
		],
		],
		'service_manager' => [
		'invokables' => [
		Service\TypeRessourceService::class => Service\TypeRessourceService::class,
		Service\DotationService::class => Service\DotationService::class,
		],
		'factories' => [
		Assertion\BudgetAssertion::class => \UnicaenPrivilege\Assertion\AssertionFactory::class,
		],
		],
		'controllers' => [
		'invokables' => [
		'Application\Controller\Budget' => Controller\BudgetController::class,
		],
		],
		];
		No newline at end of file

module/Application/config/centre-cout.config.php

deleted100644 → 0

+0 −180

File deleted.

Preview size limit exceeded, changes collapsed.

module/Application/config/intervenant.config.php

+2 −1

Changes for module/Application/config/intervenant.config.php: 2 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@ namespace Application;
		use Application\Entity\Db\WfEtape;
		use Application\Provider\Privilege\Privileges;
		use Contrat\Controller\ContratController;
		use Paiement\Controller\PaiementController;
		use UnicaenPrivilege\Guard\PrivilegeController;
		use UnicaenPrivilege\Provider\Rule\PrivilegeRuleProvider;

		@@ -197,7 +198,7 @@ return [
		'options' => [
		'route' => '/:intervenant/mise-en-paiement',
		'defaults' => [
		'controller' => 'Application\Controller\Paiement',
		'controller' => PaiementController::class,
		],
		],
		'child_routes' => [