Merge branch 'ModularisationOF_FJ2' into ModularisationOF_FJ (c9c17fe0) · Commits · open-source / OSE

data/Etats de sortie/export_services_csv.php

+4 −2

Changes for data/Etats de sortie/export_services_csv.php: 4 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -13,6 +13,8 @@

		// initialisation

		use OffreFormation\Entity\Db\TypeIntervention;

		$res = [];
		$shown = [];
		$typesIntervention = [];
		@@ -126,7 +128,7 @@ foreach ($data as $d) {
		if ($d['TYPE_INTERVENTION_ID'] != null) {
		$tid = $d['TYPE_INTERVENTION_ID'];
		if (!isset($typesIntervention[$tid])) {
		$typesIntervention[$tid] = $entityManager->getRepository(\Application\Entity\Db\TypeIntervention::class)->find($tid);
		$typesIntervention[$tid] = $entityManager->getRepository(TypeIntervention::class)->find($tid);
		}
		$typeIntervention = $typesIntervention[$tid];
		$invertTi['type-intervention-' . $typeIntervention->getCode()] = $typeIntervention->getId();
		@@ -210,7 +212,7 @@ uasort($typesIntervention, function ($ti1, $ti2) {
		return $ti1->getOrdre() - $ti2->getOrdre();
		});
		foreach ($typesIntervention as $typeIntervention) {
		/* @var $typeIntervention \Application\Entity\Db\TypeIntervention */
		/* @var \OffreFormation\Entity\Db\TypeIntervention $typeIntervention */
		$head['type-intervention-' . $typeIntervention->getCode()] = $typeIntervention->getCode();
		}
		$head['heures-ref'] = 'Référentiel';

module/Application/config/aaa_module.config.php

+1 −1

Changes for module/Application/config/aaa_module.config.php: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -163,7 +163,7 @@ $config = [
		Service\AnneeService::class => Service\AnneeService::class,
		Service\LocalContextService::class => Service\LocalContextService::class,
		Service\ParametresService::class => Service\ParametresService::class,
		Service\TypeInterventionService::class => Service\TypeInterventionService::class,
		\OffreFormation\Service\TypeInterventionService::class => \OffreFormation\Service\TypeInterventionService::class,
		Service\SourceService::class => Service\SourceService::class,
		Service\AffectationService::class => Service\AffectationService::class,
		Service\RoleService::class => Service\RoleService::class,

module/Application/config/discipline.config.php

deleted100755 → 0

+0 −131

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

		namespace Application;

		use Application\Provider\Privilege\Privileges;
		use UnicaenAuth\Guard\PrivilegeController;

		return [
		'router' => [
		'routes' => [
		'discipline' => [
		'type' => 'Literal',
		'options' => [
		'route' => '/discipline',
		'defaults' => [
		'controller' => 'Application\Controller\Discipline',
		'action' => 'index',
		],
		],
		'may_terminate' => true,
		'child_routes' => [
		'voir' => [
		'type' => 'Segment',
		'options' => [
		'route' => '/voir/:discipline',
		'constraints' => [
		'discipline' => '[0-9]*',
		],
		'defaults' => [
		'action' => 'voir',
		],
		],
		'may_terminate' => true,
		],
		'saisir' => [
		'type' => 'Segment',
		'options' => [
		'route' => '/saisir[/:discipline]',
		'constraints' => [
		'discipline' => '[0-9]*',
		],
		'defaults' => [
		'action' => 'saisir',
		],
		],
		'may_terminate' => true,
		],
		'supprimer' => [
		'type' => 'Segment',
		'options' => [
		'route' => '/supprimer/:discipline',
		'constraints' => [
		'discipline' => '[0-9]*',
		],
		'defaults' => [
		'action' => 'supprimer',
		],
		],
		'may_terminate' => true,
		],
		],
		],
		],
		],
		'navigation' => [
		'default' => [
		'home' => [
		'pages' => [
		'administration' => [
		'pages' => [
		'odf' => [
		'pages' => [
		'discipline' => [
		'color' => '#9F491F',
		'label' => "Types de disciplines",
		'title' => "Gestion des disciplines",
		'route' => 'discipline',
		'resource' => PrivilegeController::getResourceId('Application\Controller\Discipline', 'index'),
		'order' => 50,
		],
		],
		],
		],
		],
		],
		],
		],
		],
		'bjyauthorize' => [
		'guards' => [
		PrivilegeController::class => [
		[
		'controller' => 'Application\Controller\Discipline',
		'action' => ['index'],
		'privileges' => [
		Privileges::DISCIPLINE_GESTION,
		],
		],
		[
		'controller' => 'Application\Controller\Discipline',
		'action' => ['voir'],
		'privileges' => [
		Privileges::DISCIPLINE_VISUALISATION,
		],
		],
		[
		'controller' => 'Application\Controller\Discipline',
		'action' => ['saisir', 'supprimer'],
		'privileges' => [
		Privileges::DISCIPLINE_EDITION,
		],
		],
		],
		],
		],
		'controllers' => [
		'invokables' => [
		'Application\Controller\Discipline' => Controller\DisciplineController::class,
		],
		],
		'service_manager' => [
		'invokables' => [
		Service\DisciplineService::class => Service\DisciplineService::class,
		],
		],
		'form_elements' => [
		'invokables' => [
		Form\DisciplineForm::class => Form\DisciplineForm::class,
		],
		],
		];
		No newline at end of file

module/Application/config/paiement.config.php

+1 −1

Changes for module/Application/config/paiement.config.php: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -268,7 +268,7 @@ return [
		Service\ServiceAPayerService::class => Service\ServiceAPayerService::class,
		Service\MiseEnPaiementService::class => Service\MiseEnPaiementService::class,
		Service\MiseEnPaiementIntervenantStructureService::class => Service\MiseEnPaiementIntervenantStructureService::class,
		Service\TypeHeuresService::class => Service\TypeHeuresService::class,
		\OffreFormation\Service\TypeHeuresService::class => \OffreFormation\Service\TypeHeuresService::class,
		Service\CentreCoutService::class => Service\CentreCoutService::class,
		\OffreFormation\Service\CentreCoutEpService::class => \OffreFormation\Service\CentreCoutEpService::class,
		Service\MotifNonPaiementService::class => Service\MotifNonPaiementService::class,

module/Application/config/type-formation.config.php

deleted100755 → 0

+0 −147

Changes for module/Application/config/type-formation.config.php: 0 added lines, 147 removed lines.
Original line number	Diff line number	Diff line
		<?php
		/*
		* @author JORIOT Florian <florian.joriot at unicaen.fr>
		*/

		namespace Application;


		use Application\Provider\Privilege\Privileges;
		use UnicaenAuth\Guard\PrivilegeController;

		return [
		'router' => [
		'routes' => [
		'type-formation' => [
		'type' => 'Literal',
		'options' => [
		'route' => '/type-formation',
		'defaults' => [
		'controller' => 'Application\Controller\TypeFormation',
		'action' => 'index',
		],
		],
		'may_terminate' => true,
		'child_routes' => [
		'saisie' => [
		'type' => 'Segment',
		'options' => [
		'route' => '/saisie[/:typeFormation][/:groupeTypeFormation]',
		'constraints' => [
		'typeFormation' => '[0-9]*',
		],
		'defaults' => [
		'action' => 'saisie',
		],
		],
		'may_terminate' => true,
		],
		'supprimer' => [
		'type' => 'Segment',
		'options' => [
		'route' => '/supprimer/:typeFormation',
		'constraints' => [
		'typeFormation' => '[0-9]*',
		],
		'defaults' => [
		'action' => 'supprimer',
		],
		],
		'may_terminate' => true,
		],
		'saisie-groupe' => [
		'type' => 'Segment',
		'options' => [
		'route' => '/saisie-groupe[/:groupeTypeFormation]',
		'constraints' => [
		'groupeTypeFormation' => '[0-9]*',
		],
		'defaults' => [
		'action' => 'saisieGroupe',
		],
		],
		'may_terminate' => true,
		],
		'supprimer-groupe' => [
		'type' => 'Segment',
		'options' => [
		'route' => '/supprimer-groupe/:groupeTypeFormation',
		'constraints' => [
		'groupeTypeFormation' => '[0-9]*',
		],
		'defaults' => [
		'action' => 'supprimerGroupe',
		],
		],
		'may_terminate' => true,
		],
		'trier' => [
		'type' => 'Segment',
		'options' => [
		'route' => '/trier/',
		'constraints' => [
		],
		'defaults' => [
		'action' => 'trier',
		],
		],
		'may_terminate' => true,
		],
		],
		],
		],
		],

		'navigation' => [
		'default' => [
		'home' => [
		'pages' => [
		'administration' => [
		'pages' => [
		'odf' => [
		'pages' => [
		'gestion-type-formation' => [
		'label' => 'Types de formations',
		'route' => 'type-formation',
		'resource' => PrivilegeController::getResourceId('Application\Controller\TypeFormation', 'index'),
		'order' => 60,
		'border - color' => '#111',
		],
		],
		],
		],
		],
		],
		],
		],
		],

		'bjyauthorize' => [
		'guards' => [
		PrivilegeController::class => [
		[
		'controller' => 'Application\Controller\TypeFormation',
		'action' => ['index'],
		'privileges' => [Privileges::ODF_TYPE_FORMATION_VISUALISATION],
		],
		[
		'controller' => 'Application\Controller\TypeFormation',
		'action' => ['saisie', 'supprimer', 'saisieGroupe', 'supprimerGroupe', "trier"],
		'privileges' => [Privileges::ODF_TYPE_FORMATION_EDITION],
		],
		],
		],
		],
		'controllers' => [
		'factories' => [
		'Application\Controller\TypeFormation' => Controller\Factory\TypeFormationControllerFactory::class,
		'Application\Controller\GroupeTypeFormation' => Controller\Factory\GroupeTypeFormationControllerFactory::class,
		],
		],
		'form_elements' => [
		'factories' => [
		Form\GroupeTypeFormation\GroupeTypeFormationSaisieForm::class => Form\GroupeTypeFormation\GroupeTypeFormationSaisieFormFactory::class,
		Form\TypeFormation\TypeFormationSaisieForm::class => Form\TypeFormation\TypeFormationSaisieFormFactory::class,
		],
		],
		];